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

Show DELAYED, PENDING status of resync process in "--detail" 

Initially there is no proper translation mdstat's DELAYED/PENDING processes
to "--detail" output.
For example, if we have recover=DELAYED in mdstat, "--detail"
shows "State: recovering" and "Rebuild Status = 0%".
It was incorrect in case of process waiting on checkpoint different
than 0%. In fact rebuild status is differnt than 0% and user is misled.

The patch fix the problem. Current "--detail" command shows
in the exampe: "State: recovering (DELAYED)" and no information
about precentage.

Signed-off-by: Krzysztof Wojcik <krzysztof.wojcik@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Krzysztof Wojcik 2011-06-23 12:06:47 +10:00 committed by NeilBrown
parent c281a80419
commit 2d3603ba0c
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Detail.c
View File

@ -372,11 +372,13 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
else
st = ", degraded";
printf(" State : %s%s%s%s\n",
(array.state&(1<<MD_SB_CLEAN))?"clean":"active",
st,
(!e || e->percent < 0) ? "" : sync_action[e->resync],
larray_size ? "": ", Not Started");
printf(" State : %s%s%s%s%s%s \n",
(array.state&(1<<MD_SB_CLEAN))?"clean":"active", st,
(!e || (e->percent < 0 && e->percent != PROCESS_PENDING &&
e->percent != PROCESS_DELAYED)) ? "" : sync_action[e->resync],
larray_size ? "": ", Not Started",
e->percent == PROCESS_DELAYED ? " (DELAYED)": "",
e->percent == PROCESS_PENDING ? " (PENDING)": "");
}
if (array.raid_disks)
printf(" Active Devices : %d\n", array.active_disks);
@ -416,10 +418,8 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
}
if (e && e->percent >= 0) {
printf(" Re%s Status : %d%% complete\n",
(st && st->sb && info->reshape_active)?
"shape":"build",
e->percent);
static char *sync_action[] = {"Rebuild", "Resync", "Reshape", "Check"};
printf(" %7s Status : %d%% complete\n", sync_action[e->resync], e->percent);
is_rebuilding = 1;
}
free_mdstat(ms);

2
mdadm.h
View File

@ -1345,3 +1345,5 @@ static inline int xasprintf(char **strp, const char *fmt, ...) {
#define PATH_MAX 4096
#endif
#define PROCESS_DELAYED -2
#define PROCESS_PENDING -3

8
mdstat.c
View File

@ -257,10 +257,10 @@ struct mdstat_ent *mdstat_read(int hold, int start)
if (strncmp(w, "check", 5)==0)
ent->resync = 3;
if (l > 8 && strcmp(w+l-8, "=DELAYED"))
ent->percent = 0;
if (l > 8 && strcmp(w+l-8, "=PENDING"))
ent->percent = 0;
if (l > 8 && strcmp(w+l-8, "=DELAYED") == 0)
ent->percent = PROCESS_DELAYED;
if (l > 8 && strcmp(w+l-8, "=PENDING") == 0)
ent->percent = PROCESS_PENDING;
} else if (ent->percent == -1 &&
w[0] >= '0' &&
w[0] <= '9' &&