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

Extra option for set_array_state: you choose dirty or clean. 

When we first start an array, it might be good to start recovery
straight away.  That requires setting the array to 'dirty', but
only the metadata handler can know if that is required or not.
So have a third possible 'consistent' option to set_array_state.
Either 'no' or 'yes' or 'you choose'.

Return value indicates what was chosen.

'1' (no) should be chosen unless there is a good reason.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2008-08-19 14:54:55 +10:00
parent 9296754385
commit 01f157d74a
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mdadm.h
View File

@ -526,12 +526,16 @@ extern struct superswitch {
/* Tell the metadata handler the current state of the array.
* This covers whether it is known to be consistent (no pending writes)
* when how far along a resync is known to have progressed
* and how far along a resync is known to have progressed
* (in a->resync_start).
* resync status is really irrelevant if the array is not consistent,
* but some metadata (DDF!) have a place to record the distinction.
* If 'consistent' is '2', then the array can mark it dirty if a
* resync/recovery/whatever is required, or leave it clean if not.
* Return value is 0 dirty (not consistent) and 1 if clean.
* it is only really important if consistent is passed in as '2'.
*/
void (*set_array_state)(struct active_array *a, int consistent);
int (*set_array_state)(struct active_array *a, int consistent);
/* When the state of a device might have changed, we call set_disk to
* tell the metadata what the current state is.

14
monitor.c
View File

@ -243,18 +243,10 @@ static int read_and_act(struct active_array *a)
* readonly ???
*/
get_resync_start(a);
if (a->resync_start == ~0ULL) {
if (a->container->ss->set_array_state(a, 2))
a->next_state = read_auto; /* array is clean */
/* give the metadata a chance to force active if
* we have some recovery to do. metadata sets
* resync_start to !MaxSector in this case
*/
a->container->ss->set_array_state(a, 1);
}
if (a->resync_start != ~0ULL) {
a->container->ss->set_array_state(a, 0);
a->next_state = active;
}
else
a->next_state = active; /* Now active for recovery etc */
}
if (!deactivate &&

9
super-ddf.c
View File

@ -2680,11 +2680,17 @@ static int ddf_open_new(struct supertype *c, struct active_array *a, char *inst)
* For DDF, we need to clear the DDF_state_inconsistent bit in the
* !global! virtual_disk.virtual_entry structure.
*/
static void ddf_set_array_state(struct active_array *a, int consistent)
static int ddf_set_array_state(struct active_array *a, int consistent)
{
struct ddf_super *ddf = a->container->sb;
int inst = a->info.container_member;
int old = ddf->virt->entries[inst].state;
if (consistent == 2) {
/* Should check if a recovery should be started FIXME */
consistent = 1;
if (a->resync_start != ~0ULL)
consistent = 0;
}
if (consistent)
ddf->virt->entries[inst].state &= ~DDF_state_inconsistent;
else
@ -2705,6 +2711,7 @@ static void ddf_set_array_state(struct active_array *a, int consistent)
dprintf("ddf mark %d %s %llu\n", inst, consistent?"clean":"dirty",
a->resync_start);
return consistent;
}
/*

5
super-intel.c
View File

@ -2203,7 +2203,7 @@ static int imsm_count_failed(struct intel_super *super, struct imsm_map *map)
return failed;
}
static void imsm_set_array_state(struct active_array *a, int consistent)
static int imsm_set_array_state(struct active_array *a, int consistent)
{
int inst = a->info.container_member;
struct intel_super *super = a->container->sb;
@ -2219,6 +2219,8 @@ static void imsm_set_array_state(struct active_array *a, int consistent)
if (consistent && !dev->vol.dirty &&
(dev->vol.migr_state || map_state != IMSM_T_STATE_NORMAL))
a->resync_start = 0ULL;
if (consistent == 2 && a->resync_start != ~0ULL)
consistent = 0;
if (a->resync_start == ~0ULL) {
/* complete recovery or initial resync */
@ -2253,6 +2255,7 @@ static void imsm_set_array_state(struct active_array *a, int consistent)
dev->vol.dirty = dirty;
super->updates_pending++;
}
return consistent;
}
static void imsm_set_disk(struct active_array *a, int n, int state)