Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

imsm: fill working_disks according to metadata. 

Imsm tracks as "working_disk" each visible drive.
Assemble routine expects that the value will return count
of active member drives recorded in metadata.
As a side effect "--no-degraded" doesn't work correctly for imsm.
Align this field to others.
Added check, if the option --no-degraded is called with --scan.

Signed-off-by: Blazej Kucman <blazej.kucman@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
Blazej Kucman 2020-01-17 15:24:04 +01:00 committed by Jes Sorensen
parent 42e641abeb
commit 1e93d0d159
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mdadm.c
View File

@ -1485,9 +1485,12 @@ int main(int argc, char *argv[])
rv = Manage_stop(devlist->devname, mdfd, c.verbose, 0); rv = Manage_stop(devlist->devname, mdfd, c.verbose, 0);
break; break;
case ASSEMBLE: case ASSEMBLE:
if (devs_found == 1 && ident.uuid_set == 0 && if (!c.scan && c.runstop == -1) {
ident.super_minor == UnSet && ident.name[0] == 0 && pr_err("--no-degraded not meaningful without a --scan assembly.\n");
!c.scan ) { exit(1);
} else if (devs_found == 1 && ident.uuid_set == 0 &&
ident.super_minor == UnSet && ident.name[0] == 0 &&
!c.scan) {
/* Only a device has been given, so get details from config file */ /* Only a device has been given, so get details from config file */
struct mddev_ident *array_ident = conf_get_ident(devlist->devname); struct mddev_ident *array_ident = conf_get_ident(devlist->devname);
if (array_ident == NULL) { if (array_ident == NULL) {

5
super-intel.c
View File

@ -7946,7 +7946,8 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
skip = 1; skip = 1;
if (!skip && (ord & IMSM_ORD_REBUILD)) if (!skip && (ord & IMSM_ORD_REBUILD))
recovery_start = 0; recovery_start = 0;
if (!(ord & IMSM_ORD_REBUILD))
this->array.working_disks++;
/* /*
* if we skip some disks the array will be assmebled degraded; * if we skip some disks the array will be assmebled degraded;
* reset resync start to avoid a dirty-degraded * reset resync start to avoid a dirty-degraded
@ -7988,8 +7989,6 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
else else
this->array.spare_disks++; this->array.spare_disks++;
} }
if (info_d->recovery_start == MaxSector)
this->array.working_disks++;
info_d->events = __le32_to_cpu(mpb->generation_num); info_d->events = __le32_to_cpu(mpb->generation_num);
info_d->data_offset = pba_of_lba0(map); info_d->data_offset = pba_of_lba0(map);