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

Assemble: provide protection when clustered raid do assemble 

The previous patch provides protection for other modes
such as CREATE, MANAGE, GROW and INCREMENTAL. And for
ASSEMBLE mode, we also need to protect during the process
of assemble clustered raid.

However, we can only know the array is clustered or not
when the metadata is ready, so the lock_cluster is called
after select_devices(). And we could re-read the metadata
when doing auto-assembly, so refresh the locking.

Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
Guoqing Jiang 2018-01-22 17:12:09 +08:00 committed by Jes Sorensen
parent 1b7eb962db
commit 76781701a4
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Assemble.c
View File

@ -1344,6 +1344,9 @@ int Assemble(struct supertype *st, char *mddev,
char chosen_name[1024];
struct map_ent *map = NULL;
struct map_ent *mp;
int locked = 0;
struct mdp_superblock_1 *sb;
bitmap_super_t *bms;
/*
* If any subdevs are listed, then any that don't
@ -1374,6 +1377,12 @@ try_again:
* set of devices failed. Those are now marked as ->used==2 and
* we ignore them and try again
*/
if (locked)
/*
* if come back try_again is called, then need to unlock first,
* and lock again since the metadate is re-read.
*/
cluster_release_dlmlock();
if (!st && ident->st)
st = ident->st;
if (c->verbose>0)
@ -1391,6 +1400,14 @@ try_again:
if (!st || !st->sb || !content)
return 2;
sb = st->sb;
bms = (bitmap_super_t*)(((char*)sb) + 4096);
if (sb && bms->version == BITMAP_MAJOR_CLUSTERED) {
locked = cluster_get_dlmlock();
if (locked != 1)
return 1;
}
/* We have a full set of devices - we now need to find the
* array device.
* However there is a risk that we are racing with "mdadm -I"
@ -1417,6 +1434,8 @@ try_again:
pr_err("Found some drive for an array that is already active: %s\n",
mp->path);
pr_err("giving up.\n");
if (locked == 1)
cluster_release_dlmlock();
return 1;
}
for (dv = pre_exist->devs; dv; dv = dv->next) {
@ -1490,6 +1509,8 @@ try_again:
st->ss->free_super(st);
if (auto_assem)
goto try_again;
if (locked == 1)
cluster_release_dlmlock();
return 1;
}
mddev = chosen_name;
@ -1509,6 +1530,8 @@ try_again:
st->ss->free_super(st);
if (auto_assem)
goto try_again;
if (locked == 1)
cluster_release_dlmlock();
return 1;
}
/* just incase it was started but has no content */
@ -1521,6 +1544,8 @@ try_again:
err = assemble_container_content(st, mdfd, content, c,
chosen_name, NULL);
close(mdfd);
if (locked == 1)
cluster_release_dlmlock();
return err;
}
@ -1530,8 +1555,11 @@ try_again:
devcnt = load_devices(devices, devmap, ident, &st, devlist,
c, content, mdfd, mddev,
&most_recent, &bestcnt, &best, inargv);
if (devcnt < 0)
if (devcnt < 0) {
if (locked == 1)
cluster_release_dlmlock();
return 1;
}
if (devcnt == 0) {
pr_err("no devices found for %s\n",
@ -1878,6 +1906,8 @@ try_again:
close(mdfd);
/* '2' means 'OK, but not started yet' */
if (locked == 1)
cluster_release_dlmlock();
return rv == 2 ? 0 : rv;
}