As spared don't have a position in the raid array with verion-1 superblocks,
we need to handle them a bit differently.
Signed-off-by: Neil Brown <neilb@suse.de>
struct mdinfo info;
struct mddev_ident_s ident2;
char *avail;
struct mdinfo info;
struct mddev_ident_s ident2;
char *avail;
vers = md_get_version(mdfd);
if (vers <= 0) {
vers = md_get_version(mdfd);
if (vers <= 0) {
i = devcnt;
else
i = devices[devcnt].raid_disk;
i = devcnt;
else
i = devices[devcnt].raid_disk;
+ if (i+1 == 0) {
+ if (nextspare < info.array.raid_disks)
+ nextspare = info.array.raid_disks;
+ i = nextspare++;
+ }
if (i < 10000) {
if (i >= bestcnt) {
unsigned int newbestcnt = i+10;
if (i < 10000) {
if (i >= bestcnt) {
unsigned int newbestcnt = i+10;
depending on which devices are present, and so will correctly
handle "--assemble --force" if multiple devices have failed.
- Report raid10 layout in --examine output.
depending on which devices are present, and so will correctly
handle "--assemble --force" if multiple devices have failed.
- Report raid10 layout in --examine output.
+ - Fix assembling of arrays that use the version-1 superblock and
+ have spares. Previously the spares would be ignored.
+ - Fix bug so that multiple drives can be re-added at once.
Changes Prior to 2.0
- Support assembling from byte-swapped superblocks
Changes Prior to 2.0
- Support assembling from byte-swapped superblocks
if (ioctl(fd, ADD_NEW_DISK, &disc) == 0) {
if (verbose >= 0)
fprintf(stderr, Name ": re-added %s\n", dv->devname);
if (ioctl(fd, ADD_NEW_DISK, &disc) == 0) {
if (verbose >= 0)
fprintf(stderr, Name ": re-added %s\n", dv->devname);
}
/* fall back on normal-add */
}
}
/* fall back on normal-add */
}
echo $target/$base does not exist.
exit 1
fi
echo $target/$base does not exist.
exit 1
fi
- ( cd .. ; ln -s mdadm mdadm-$version ; tar chf - --exclude="TAGS" --exclude='*,v' --exclude='*~' --exclude='*.o' --exclude mdadm --exclude=mdadm'.[^ch0-9]' --exclude=RCS mdadm-$version ; rm mdadm-$version ) | gzip --best > /var/tmp/mdadm-new.tgz
+ ( cd .. ; ln -s mdadm.v2 mdadm-$version ; tar chf - --exclude="TAGS" --exclude='*,v' --exclude='*~' --exclude='*.o' --exclude mdadm --exclude=mdadm'.[^ch0-9]' --exclude=RCS mdadm-$version ; rm mdadm-$version ) | gzip --best > /var/tmp/mdadm-new.tgz
mkdir /var/tmp/mdadm-old ; zcat $target/$base | ( cd /var/tmp/mdadm-old ; tar xf - )
mkdir /var/tmp/mdadm-new ; zcat /var/tmp/mdadm-new.tgz | ( cd /var/tmp/mdadm-new ; tar xf - )
diff -ru /var/tmp/mdadm-old /var/tmp/mdadm-new
mkdir /var/tmp/mdadm-old ; zcat $target/$base | ( cd /var/tmp/mdadm-old ; tar xf - )
mkdir /var/tmp/mdadm-new ; zcat /var/tmp/mdadm-new.tgz | ( cd /var/tmp/mdadm-new ; tar xf - )
diff -ru /var/tmp/mdadm-old /var/tmp/mdadm-new
# mdadm always adds --quiet, and we want to see any unexpected messages
mdadm() {
# mdadm always adds --quiet, and we want to see any unexpected messages
mdadm() {
- $mdadm 2>&1 --quiet "$@"
}
# check various things
check() {
case $1 in
}
# check various things
check() {
case $1 in
+ spares )
+ spares=`tr '] ' '\012\012' < /proc/mdstat | grep -c '(S)' || exit 0`
+ if [ $spares -ne $2 ]
+ then
+ echo >&2 "ERROR expected $2 spares, found $spares"; exit 1;
+ fi
+ ;;
raid* | linear )
grep -s "active $1 " /proc/mdstat > /dev/null || {
echo >&2 "ERROR active $1 not found" ; cat /proc/mdstat ; exit 1;}
raid* | linear )
grep -s "active $1 " /proc/mdstat > /dev/null || {
echo >&2 "ERROR active $1 not found" ; cat /proc/mdstat ; exit 1;}
# create a v-1 raid5 array and assemble in various ways
# create a v-1 raid5 array and assemble in various ways
-mdadm -CR -e1 --name one $md1 -l5 -n3 $dev0 $dev1 $dev2
+mdadm -CR -e1 --name one $md1 -l5 -n3 -x2 $dev0 $dev1 $dev2 $dev3 $dev4
tst="check raid5 ;testdev $md1 2 $mdsize1 64 ; mdadm -S $md1"
uuid=`mdadm -Db $md1 | sed 's/.*UUID=//'`
check wait
eval $tst
tst="check raid5 ;testdev $md1 2 $mdsize1 64 ; mdadm -S $md1"
uuid=`mdadm -Db $md1 | sed 's/.*UUID=//'`
check wait
eval $tst
-mdadm -A $md1 $dev0 $dev1 $dev2
+mdadm -A $md1 $dev0 $dev1 $dev2
+mdadm $md1 --add $dev3 $dev4
+check spares 2
-mdadm -A $md1 -u $uuid $devlist
+mdadm -A $md1 -u $uuid $devlist
+check spares 2
-mdadm -A $md1 --name one $devlist
+mdadm -A $md1 --name one $devlist
+check spares 2
eval $tst
conf=$targetdir/mdadm.conf
eval $tst
conf=$targetdir/mdadm.conf
echo DEVICE $devlist
echo array $md1 UUID=$uuid
} > $conf
echo DEVICE $devlist
echo array $md1 UUID=$uuid
} > $conf
echo DEVICE $devlist
echo array $md1 name=one
} > $conf
echo DEVICE $devlist
echo array $md1 name=one
} > $conf
- echo array $md1 devices=$dev0,$dev1,$dev2
+ echo array $md1 devices=$dev0,$dev1,$dev2,$dev3,$dev4
echo "DEVICE $devlist" > $conf
mdadm -Db $md1 >> $conf
eval $tst
echo "DEVICE $devlist" > $conf
mdadm -Db $md1 >> $conf
eval $tst
-mdadm --assemble --scan --config=$conf $md1
+mdadm --assemble --scan --config=$conf $md1
-echo " metadata=1.0 devices=$dev0,$dev1,$dev2" >> $conf
-mdadm --assemble --scan --config=$conf $md1
+echo " metadata=1.0 devices=$dev0,$dev1,$dev2,$dev3,$dev4" >> $conf
+mdadm --assemble --scan --config=$conf $md1
eval $tst
### Now with a missing device
eval $tst
### Now with a missing device
-mdadm -AR $md1 $dev0 $dev2 #
+mdadm -AR $md1 $dev0 $dev2 $dev3 $dev4 #
-mdadm -A $md1 -u $uuid $devlist
+mdadm -A $md1 -u $uuid $devlist
check state U_U
eval $tst
check state U_U
eval $tst
-mdadm -A $md1 --name=one $devlist
+mdadm -A $md1 --name=one $devlist
eval $tst
conf=$targetdir/mdadm.conf
eval $tst
conf=$targetdir/mdadm.conf
echo DEVICE $devlist
echo array $md1 UUID=$uuid
} > $conf
echo DEVICE $devlist
echo array $md1 UUID=$uuid
} > $conf
check state U_U
eval $tst
check state U_U
eval $tst
echo DEVICE $devlist
echo array $md1 name=one
} > $conf
echo DEVICE $devlist
echo array $md1 name=one
} > $conf
check state U_U
eval $tst
check state U_U
eval $tst
echo DEVICE $devlist
echo array $md1 devices=$dev0,$dev1,$dev2
} > $conf
echo DEVICE $devlist
echo array $md1 devices=$dev0,$dev1,$dev2
} > $conf
echo "DEVICE $devlist" > $conf
mdadm -Db $md1 >> $conf
check state U_U
eval $tst
echo "DEVICE $devlist" > $conf
mdadm -Db $md1 >> $conf
check state U_U
eval $tst
-mdadm --assemble --scan --config=$conf $md1
+mdadm --assemble --scan --config=$conf $md1
check state U_U
eval $tst
echo " metadata=1.0 devices=$dev0,$dev1,$dev2" >> $conf
check state U_U
eval $tst
echo " metadata=1.0 devices=$dev0,$dev1,$dev2" >> $conf
-mdadm --assemble --scan --config=$conf $md1
+mdadm --assemble --scan --config=$conf $md1
check state U_U
eval $tst
check state U_U
eval $tst