struct mdinfo i;
} *devices;
int *best = NULL; /* indexed by raid_disk */
- unsigned int bestcnt = 0;
+ int bestcnt = 0;
int devcnt = 0;
- unsigned int okcnt, sparecnt;
+ unsigned int okcnt, sparecnt, rebuilding_cnt;
unsigned int req_cnt;
- unsigned int i;
+ int i;
int most_recent = 0;
int chosen_drive;
int change = 0;
if (!devlist &&
ident->uuid_set == 0 &&
- ident->super_minor < 0 &&
+ (ident->super_minor < 0 || ident->super_minor == UnSet) &&
ident->name[0] == 0 &&
(ident->container == NULL || ident->member == NULL) &&
ident->devices == NULL) {
fprintf(stderr, Name ": no recogniseable superblock on %s\n",
devname);
tmpdev->used = 2;
+ } else if (tst->ss->load_super(tst,dfd, NULL)) {
+ if (report_missmatch)
+ fprintf(stderr, Name ": no RAID superblock on %s\n",
+ devname);
+ } else if (tst->ss->compare_super == NULL) {
+ if (report_missmatch)
+ fprintf(stderr, Name ": Cannot assemble %s metadata on %s\n",
+ tst->ss->name, devname);
+ tst->ss->free_super(tst);
+ tmpdev->used = 2;
} else if (auto_assem && st == NULL &&
!conf_test_metadata(tst->ss->name,
tst->ss->match_home(tst, homehost) == 1)) {
fprintf(stderr, Name ": %s has metadata type %s for which "
"auto-assembly is disabled\n",
devname, tst->ss->name);
+ tst->ss->free_super(tst);
tmpdev->used = 2;
- } else if (tst->ss->load_super(tst,dfd, NULL)) {
- if (report_missmatch)
- fprintf( stderr, Name ": no RAID superblock on %s\n",
- devname);
} else {
content = &info;
memset(content, 0, sizeof(*content));
}
if (i < 10000) {
if (i >= bestcnt) {
- unsigned int newbestcnt = i+10;
+ int newbestcnt = i+10;
int *newbest = malloc(sizeof(int)*newbestcnt);
- unsigned int c;
+ int c;
for (c=0; c < newbestcnt; c++)
if (c < bestcnt)
newbest[c] = best[c];
memset(avail, 0, content->array.raid_disks);
okcnt = 0;
sparecnt=0;
- for (i=0; i< bestcnt ;i++) {
+ rebuilding_cnt=0;
+ for (i=0; i< bestcnt; i++) {
int j = best[i];
int event_margin = 1; /* always allow a difference of '1'
* like the kernel does
if (devices[j].i.events+event_margin >=
devices[most_recent].i.events) {
devices[j].uptodate = 1;
- if (i < content->array.raid_disks &&
- devices[j].i.recovery_start == MaxSector) {
- okcnt++;
- avail[i]=1;
+ if (i < content->array.raid_disks) {
+ if (devices[j].i.recovery_start == MaxSector) {
+ okcnt++;
+ avail[i]=1;
+ } else
+ rebuilding_cnt++;
} else
sparecnt++;
}
*/
int fd;
struct supertype *tst;
- long long current_events;
+ unsigned long long current_events;
chosen_drive = -1;
- for (i=0; i<content->array.raid_disks && i < bestcnt; i++) {
+ for (i = 0; i < content->array.raid_disks && i < bestcnt; i++) {
int j = best[i];
if (j>=0 &&
!devices[j].uptodate &&
/* If there are any other drives of the same vintage,
* add them in as well. We can't lose and we might gain
*/
- for (i=0; i<content->array.raid_disks && i < bestcnt ; i++) {
+ for (i = 0; i < content->array.raid_disks && i < bestcnt ; i++) {
int j = best[i];
if (j >= 0 &&
!devices[j].uptodate &&
fprintf(stderr, Name ": Container %s has been "
"assembled with %d drive%s",
mddev, okcnt+sparecnt, okcnt+sparecnt==1?"":"s");
- if (okcnt < content->array.raid_disks)
+ if (okcnt < (unsigned)content->array.raid_disks)
fprintf(stderr, " (out of %d)",
content->array.raid_disks);
fprintf(stderr, "\n");
(runstop <= 0 &&
( enough(content->array.level, content->array.raid_disks,
content->array.layout, clean, avail, okcnt) &&
- (okcnt >= req_cnt || start_partial_ok)
+ (okcnt + rebuilding_cnt >= req_cnt || start_partial_ok)
))) {
/* This array is good-to-go.
* If a reshape is in progress then we might need to
if (verbose >= 0) {
fprintf(stderr, Name ": %s has been started with %d drive%s",
mddev, okcnt, okcnt==1?"":"s");
- if (okcnt < content->array.raid_disks)
+ if (okcnt < (unsigned)content->array.raid_disks)
fprintf(stderr, " (out of %d)", content->array.raid_disks);
+ if (rebuilding_cnt)
+ fprintf(stderr, "%s %d rebuilding", sparecnt?",":" and", rebuilding_cnt);
if (sparecnt)
fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
fprintf(stderr, ".\n");
(4 * content->array.chunk_size / 4096) + 1);
}
}
+ if (okcnt < (unsigned)content->array.raid_disks) {
+ /* If any devices did not get added
+ * because the kernel rejected them based
+ * on event count, try adding them
+ * again providing the action policy is
+ * 're-add' or greater. The bitmap
+ * might allow them to be included, or
+ * they will become spares.
+ */
+ for (i = 0; i <= bestcnt; i++) {
+ int j = best[i];
+ if (j >= 0 && !devices[j].uptodate) {
+ if (!disk_action_allows(&devices[j].i, st->ss->name, act_re_add))
+ continue;
+ rv = add_disk(mdfd, st, content,
+ &devices[j].i);
+ if (rv == 0 && verbose >= 0)
+ fprintf(stderr,
+ Name ": %s has been re-added.\n",
+ devices[j].devname);
+ }
+ }
+ }
wait_for(mddev, mdfd);
close(mdfd);
if (auto_assem) {
if (runstop == -1) {
fprintf(stderr, Name ": %s assembled from %d drive%s",
mddev, okcnt, okcnt==1?"":"s");
- if (okcnt != content->array.raid_disks)
+ if (okcnt != (unsigned)content->array.raid_disks)
fprintf(stderr, " (out of %d)", content->array.raid_disks);
fprintf(stderr, ", but not started.\n");
close(mdfd);
}
if (verbose >= -1) {
fprintf(stderr, Name ": %s assembled from %d drive%s", mddev, okcnt, okcnt==1?"":"s");
+ if (rebuilding_cnt)
+ fprintf(stderr, "%s %d rebuilding", sparecnt?", ":" and ", rebuilding_cnt);
if (sparecnt)
fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
if (!enough(content->array.level, content->array.raid_disks,
"array while not clean - consider "
"--force.\n");
else {
- if (req_cnt == content->array.raid_disks)
+ if (req_cnt == (unsigned)content->array.raid_disks)
fprintf(stderr, " - need all %d to start it", req_cnt);
else
fprintf(stderr, " - need %d of %d to start", req_cnt, content->array.raid_disks);
projects / thirdparty / mdadm.git / blobdiff