diff options
author | NeilBrown <neilb@suse.de> | 2010-02-04 12:02:09 +1100 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2010-02-04 12:02:09 +1100 |
commit | 921d9e164fd3f6203d1b0cf2424b793043afd001 (patch) | |
tree | ad0fa1ec1343bd28676de6907177189ed14a748c | |
parent | cc86f89c855fcfe9820d0621ede1575adc317155 (diff) | |
download | mdadm-921d9e164fd3f6203d1b0cf2424b793043afd001.tar.gz mdadm-921d9e164fd3f6203d1b0cf2424b793043afd001.tar.xz mdadm-921d9e164fd3f6203d1b0cf2424b793043afd001.zip |
Assemble: fix --force assembly of v1.x arrays which are recovering.
1.x metadata allows a device to be a member of the array while it
is still recoverying. So it is a working member, but is not
completely in-sync.
mdadm/assemble does not understand this distinction and assumes that a
work member is fully in-sync for the purpose of determining if there
are enough in-sync devices for the array to be functional.
So collect the 'recovery_start' value from the metadata and use it in
assemble when determining how useful a given device is.
Reported-by: Mikael Abrahamsson <swmike@swm.pp.se>
Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r-- | Assemble.c | 4 | ||||
-rw-r--r-- | super-ddf.c | 2 | ||||
-rw-r--r-- | super-intel.c | 2 | ||||
-rw-r--r-- | super0.c | 1 | ||||
-rw-r--r-- | super1.c | 5 |
5 files changed, 13 insertions, 1 deletions
@@ -800,7 +800,8 @@ int Assemble(struct supertype *st, char *mddev, if (devices[j].i.events+event_margin >= devices[most_recent].i.events) { devices[j].uptodate = 1; - if (i < content->array.raid_disks) { + if (i < content->array.raid_disks && + devices[j].i.recovery_start == MaxSector) { okcnt++; avail[i]=1; } else @@ -822,6 +823,7 @@ int Assemble(struct supertype *st, char *mddev, int j = best[i]; if (j>=0 && !devices[j].uptodate && + devices[j].i.recovery_start == MaxSector && (chosen_drive < 0 || devices[j].i.events > devices[chosen_drive].i.events)) diff --git a/super-ddf.c b/super-ddf.c index 3e30229..870efd8 100644 --- a/super-ddf.c +++ b/super-ddf.c @@ -1369,6 +1369,7 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info) info->disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE); + info->recovery_start = MaxSector; info->reshape_active = 0; info->name[0] = 0; @@ -1427,6 +1428,7 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info) info->container_member = ddf->currentconf->vcnum; + info->recovery_start = MaxSector; info->resync_start = 0; if (!(ddf->virt->entries[info->container_member].state & DDF_state_inconsistent) && diff --git a/super-intel.c b/super-intel.c index 91479a2..bbdcb51 100644 --- a/super-intel.c +++ b/super-intel.c @@ -1452,6 +1452,7 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info) info->data_offset = __le32_to_cpu(map->pba_of_lba0); info->component_size = __le32_to_cpu(map->blocks_per_member); memset(info->uuid, 0, sizeof(info->uuid)); + info->recovery_start = MaxSector; if (map->map_state == IMSM_T_STATE_UNINITIALIZED || dev->vol.dirty) { info->resync_start = 0; @@ -1559,6 +1560,7 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info) info->disk.number = -1; info->disk.state = 0; info->name[0] = 0; + info->recovery_start = MaxSector; if (super->disks) { __u32 reserved = imsm_reserved_sectors(super, super->disks); @@ -372,6 +372,7 @@ static void getinfo_super0(struct supertype *st, struct mdinfo *info) uuid_from_super0(st, info->uuid); + info->recovery_start = MaxSector; if (sb->minor_version > 90 && (sb->reshape_position+1) != 0) { info->reshape_active = 1; info->reshape_progress = sb->reshape_position; @@ -612,6 +612,11 @@ static void getinfo_super1(struct supertype *st, struct mdinfo *info) strncpy(info->name, sb->set_name, 32); info->name[32] = 0; + if (sb->feature_map & __le32_to_cpu(MD_FEATURE_RECOVERY_OFFSET)) + info->recovery_start = __le32_to_cpu(sb->recovery_offset); + else + info->recovery_start = MaxSector; + if (sb->feature_map & __le32_to_cpu(MD_FEATURE_RESHAPE_ACTIVE)) { info->reshape_active = 1; info->reshape_progress = __le64_to_cpu(sb->reshape_position); |