X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Monitor.c;h=b527165b803acc2eb3a9d84132f44a39f64aeba1;hp=77f22aa37a006d2988671674ea450da23ebd2f89;hb=45c43276d02a32876c7e1f9f0d04580595141b3d;hpb=8453f8d0df0111cfd25e984afb7a64153b04bc27 diff --git a/Monitor.c b/Monitor.c index 77f22aa3..b527165b 100644 --- a/Monitor.c +++ b/Monitor.c @@ -30,25 +30,22 @@ #include #include -/* The largest number of disks current arrays can manage is 384 - * This really should be dynamically, but that will have to wait - * At least it isn't MD_SB_DISKS. - */ -#define MaxDisks 384 struct state { char *devname; - int devnum; /* to sync with mdstat info */ - long utime; + char devnm[32]; /* to sync with mdstat info */ + unsigned int utime; int err; char *spare_group; int active, working, failed, spare, raid; + int from_config; + int from_auto; int expected_spares; - int devstate[MaxDisks]; - dev_t devid[MaxDisks]; + int devstate[MAX_DISKS]; + dev_t devid[MAX_DISKS]; int percent; - int parent_dev; /* For subarray, devnum of parent. - * For others, NoMdDev - */ + char parent_devnm[32]; /* For subarray, devnm of parent. + * For others, "" + */ struct supertype *metadata; struct state *subarray;/* for a container it is a link to first subarray * for a subarray it is a link to next subarray @@ -69,7 +66,7 @@ static int check_one_sharer(int scan); static void alert(char *event, char *dev, char *disc, struct alert_info *info); static int check_array(struct state *st, struct mdstat_ent *mdstat, int test, struct alert_info *info, - int increments); + int increments, char *prefer); static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, int test, struct alert_info *info); static void try_spare_migration(struct state *statelist, struct alert_info *info); @@ -77,8 +74,9 @@ static void link_containers_with_subarrays(struct state *list); int Monitor(struct mddev_dev *devlist, char *mailaddr, char *alert_cmd, - int period, int daemonise, int scan, int oneshot, - int dosyslog, int test, char *pidfile, int increments, + struct context *c, + int daemonise, int oneshot, + int dosyslog, char *pidfile, int increments, int share) { /* @@ -127,25 +125,26 @@ int Monitor(struct mddev_dev *devlist, struct state *st2; int finished = 0; struct mdstat_ent *mdstat = NULL; - char *mailfrom = NULL; + char *mailfrom; struct alert_info info; + struct mddev_ident *mdlist; if (!mailaddr) { mailaddr = conf_get_mailaddr(); - if (mailaddr && ! scan) - fprintf(stderr, Name ": Monitor using email address \"%s\" from config file\n", + if (mailaddr && ! c->scan) + pr_err("Monitor using email address \"%s\" from config file\n", mailaddr); } mailfrom = conf_get_mailfrom(); if (!alert_cmd) { alert_cmd = conf_get_program(); - if (alert_cmd && ! scan) - fprintf(stderr, Name ": Monitor using program \"%s\" from config file\n", + if (alert_cmd && !c->scan) + pr_err("Monitor using program \"%s\" from config file\n", alert_cmd); } - if (scan && !mailaddr && !alert_cmd && !dosyslog) { - fprintf(stderr, Name ": No mail address or alert command - not monitoring.\n"); + if (c->scan && !mailaddr && !alert_cmd && !dosyslog) { + pr_err("No mail address or alert command - not monitoring.\n"); return 1; } info.alert_cmd = alert_cmd; @@ -159,74 +158,75 @@ int Monitor(struct mddev_dev *devlist, return rv; } - if (share) - if (check_one_sharer(scan)) + if (share) + if (check_one_sharer(c->scan)) return 1; if (devlist == NULL) { - struct mddev_ident *mdlist = conf_get_ident(NULL); - for (; mdlist; mdlist=mdlist->next) { + mdlist = conf_get_ident(NULL); + for (; mdlist; mdlist = mdlist->next) { struct state *st; + if (mdlist->devname == NULL) continue; if (strcasecmp(mdlist->devname, "") == 0) continue; - st = calloc(1, sizeof *st); - if (st == NULL) - continue; + st = xcalloc(1, sizeof *st); if (mdlist->devname[0] == '/') - st->devname = strdup(mdlist->devname); + st->devname = xstrdup(mdlist->devname); else { - st->devname = malloc(8+strlen(mdlist->devname)+1); + st->devname = xmalloc(8+strlen(mdlist->devname)+1); strcpy(strcpy(st->devname, "/dev/md/"), mdlist->devname); } st->next = statelist; - st->devnum = INT_MAX; - st->percent = -2; + st->devnm[0] = 0; + st->percent = RESYNC_UNKNOWN; + st->from_config = 1; st->expected_spares = mdlist->spare_disks; if (mdlist->spare_group) - st->spare_group = strdup(mdlist->spare_group); + st->spare_group = xstrdup(mdlist->spare_group); statelist = st; } } else { struct mddev_dev *dv; - for (dv=devlist ; dv; dv=dv->next) { - struct mddev_ident *mdlist = conf_get_ident(dv->devname); - struct state *st = calloc(1, sizeof *st); - if (st == NULL) - continue; - st->devname = strdup(dv->devname); + + for (dv = devlist; dv; dv = dv->next) { + struct state *st = xcalloc(1, sizeof *st); + mdlist = conf_get_ident(dv->devname); + st->devname = xstrdup(dv->devname); st->next = statelist; - st->devnum = INT_MAX; - st->percent = -2; + st->devnm[0] = 0; + st->percent = RESYNC_UNKNOWN; st->expected_spares = -1; if (mdlist) { st->expected_spares = mdlist->spare_disks; if (mdlist->spare_group) - st->spare_group = strdup(mdlist->spare_group); + st->spare_group = xstrdup(mdlist->spare_group); } statelist = st; } } - - while (! finished) { + while (!finished) { int new_found = 0; - struct state *st; + struct state *st, **stp; int anydegraded = 0; if (mdstat) free_mdstat(mdstat); - mdstat = mdstat_read(oneshot?0:1, 0); + mdstat = mdstat_read(oneshot ? 0 : 1, 0); + if (!mdstat) + mdstat_close(); - for (st=statelist; st; st=st->next) - if (check_array(st, mdstat, test, &info, increments)) + for (st = statelist; st; st = st->next) + if (check_array(st, mdstat, c->test, &info, + increments, c->prefer)) anydegraded = 1; - + /* now check if there are any new devices found in mdstat */ - if (scan) - new_found = add_new_arrays(mdstat, &statelist, test, + if (c->scan) + new_found = add_new_arrays(mdstat, &statelist, c->test, &info); /* If an array has active < raid && spare == 0 && spare_group != NULL @@ -239,9 +239,19 @@ int Monitor(struct mddev_dev *devlist, if (oneshot) break; else - mdstat_wait(period); + mdstat_wait(c->delay); + } + c->test = 0; + + for (stp = &statelist; (st = *stp) != NULL; ) { + if (st->from_auto && st->err > 5) { + *stp = st->next; + free(st->devname); + free(st->spare_group); + free(st); + } else + stp = &st->next; } - test = 0; } for (st2 = statelist; st2; st2 = statelist) { statelist = st2->next; @@ -283,8 +293,8 @@ static int make_daemon(char *pidfile) } close(0); open("/dev/null", O_RDWR); - dup2(0,1); - dup2(0,2); + dup2(0, 1); + dup2(0, 2); setsid(); return -1; } @@ -294,8 +304,10 @@ static int check_one_sharer(int scan) int pid, rv; FILE *fp; char dir[20]; + char path[100]; struct stat buf; - fp = fopen("/var/run/mdadm/autorebuild.pid", "r"); + sprintf(path, "%s/autorebuild.pid", MDMON_DIR); + fp = fopen(path, "r"); if (fp) { if (fscanf(fp, "%d", &pid) != 1) pid = -1; @@ -303,30 +315,22 @@ static int check_one_sharer(int scan) rv = stat(dir, &buf); if (rv != -1) { if (scan) { - fprintf(stderr, Name ": Only one " - "autorebuild process allowed" - " in scan mode, aborting\n"); + pr_err("Only one autorebuild process allowed in scan mode, aborting\n"); fclose(fp); return 1; } else { - fprintf(stderr, Name ": Warning: One" - " autorebuild process already" - " running.\n"); + pr_err("Warning: One autorebuild process already running.\n"); } } fclose(fp); } if (scan) { - if (mkdir("/var/run/mdadm", S_IRWXU) < 0 && - errno != EEXIST) { - fprintf(stderr, Name ": Can't create " - "autorebuild.pid file\n"); + if (mkdir(MDMON_DIR, S_IRWXU) < 0 && errno != EEXIST) { + pr_err("Can't create autorebuild.pid file\n"); } else { - fp = fopen("/var/run/mdadm/autorebuild.pid", "w"); + fp = fopen(path, "w"); if (!fp) - fprintf(stderr, Name ": Cannot create" - " autorebuild.pid" - "file\n"); + pr_err("Cannot create autorebuild.pidfile\n"); else { pid = getpid(); fprintf(fp, "%d\n", pid); @@ -344,7 +348,8 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) if (!info->alert_cmd && !info->mailaddr && !info->dosyslog) { time_t now = time(0); - printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device"); + printf("%1.15s: %s on %s %s\n", ctime(&now) + 4, + event, dev, disc?disc:"unknown device"); } if (info->alert_cmd) { int pid = fork(); @@ -360,11 +365,10 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) exit(2); } } - if (info->mailaddr && - (strncmp(event, "Fail", 4)==0 || - strncmp(event, "Test", 4)==0 || - strncmp(event, "Spares", 6)==0 || - strncmp(event, "Degrade", 7)==0)) { + if (info->mailaddr && (strncmp(event, "Fail", 4) == 0 || + strncmp(event, "Test", 4) == 0 || + strncmp(event, "Spares", 6) == 0 || + strncmp(event, "Degrade", 7) == 0)) { FILE *mp = popen(Sendmail, "w"); if (mp) { FILE *mdstat; @@ -374,24 +378,22 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) if (info->mailfrom) fprintf(mp, "From: %s\n", info->mailfrom); else - fprintf(mp, "From: " Name " monitoring \n"); + fprintf(mp, "From: %s monitoring \n", + Name); fprintf(mp, "To: %s\n", info->mailaddr); fprintf(mp, "Subject: %s event on %s:%s\n\n", event, dev, hname); fprintf(mp, - "This is an automatically generated" - " mail message from " Name "\n"); + "This is an automatically generated mail message from %s\n", Name); fprintf(mp, "running on %s\n\n", hname); fprintf(mp, - "A %s event had been detected on" - " md device %s.\n\n", event, dev); + "A %s event had been detected on md device %s.\n\n", event, dev); if (disc && disc[0] != ' ') fprintf(mp, - "It could be related to" - " component device %s.\n\n", disc); + "It could be related to component device %s.\n\n", disc); if (disc && disc[0] == ' ') fprintf(mp, "Extra information:%s.\n\n", disc); @@ -402,10 +404,10 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) char buf[8192]; int n; fprintf(mp, - "\nP.S. The /proc/mdstat file" - " currently contains the following:\n\n"); - while ( (n=fread(buf, 1, sizeof(buf), mdstat)) > 0) - n=fwrite(buf, 1, n, mp); + "\nP.S. The /proc/mdstat file currently contains the following:\n\n"); + while ((n = fread(buf, 1, sizeof(buf), + mdstat)) > 0) + n = fwrite(buf, 1, n, mp); fclose(mdstat); } pclose(mp); @@ -417,23 +419,26 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) /* Log at a different severity depending on the event. * * These are the critical events: */ - if (strncmp(event, "Fail", 4)==0 || - strncmp(event, "Degrade", 7)==0 || - strncmp(event, "DeviceDisappeared", 17)==0) + if (strncmp(event, "Fail", 4) == 0 || + strncmp(event, "Degrade", 7) == 0 || + strncmp(event, "DeviceDisappeared", 17) == 0) priority = LOG_CRIT; /* Good to know about, but are not failures: */ - else if (strncmp(event, "Rebuild", 7)==0 || - strncmp(event, "MoveSpare", 9)==0 || + else if (strncmp(event, "Rebuild", 7) == 0 || + strncmp(event, "MoveSpare", 9) == 0 || strncmp(event, "Spares", 6) != 0) priority = LOG_WARNING; /* Everything else: */ else priority = LOG_INFO; - if (disc) + if (disc && disc[0] != ' ') + syslog(priority, + "%s event detected on md device %s, component device %s", event, dev, disc); + else if (disc) syslog(priority, - "%s event detected on md device %s," - " component device %s", event, dev, disc); + "%s event detected on md device %s: %s", + event, dev, disc); else syslog(priority, "%s event detected on md device %s", @@ -443,13 +448,14 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) static int check_array(struct state *st, struct mdstat_ent *mdstat, int test, struct alert_info *ainfo, - int increments) + int increments, char *prefer) { /* Update the state 'st' to reflect any changes shown in mdstat, * or found by directly examining the array, and return * '1' if the array is degraded, or '0' if it is optimal (or dead). */ - struct { int state, major, minor; } info[MaxDisks]; + struct { int state, major, minor; } info[MAX_DISKS]; + struct mdinfo *sra = NULL; mdu_array_info_t array; struct mdstat_ent *mse = NULL, *mse2; char *dev = st->devname; @@ -457,130 +463,136 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, int i; int remaining_disks; int last_disk; + int new_array = 0; + int retval; + int is_container = 0; + unsigned long redundancy_only_flags = 0; if (test) alert("TestMessage", dev, NULL, ainfo); + + retval = 0; + fd = open(dev, O_RDONLY); - if (fd < 0) { - if (!st->err) - alert("DeviceDisappeared", dev, NULL, ainfo); - st->err=1; - return 0; - } - fcntl(fd, F_SETFD, FD_CLOEXEC); - if (ioctl(fd, GET_ARRAY_INFO, &array)<0) { - if (!st->err) - alert("DeviceDisappeared", dev, NULL, ainfo); - st->err=1; - close(fd); - return 0; - } - /* It's much easier to list what array levels can't - * have a device disappear than all of them that can - */ - if (array.level == 0 || array.level == -1) { - if (!st->err) - alert("DeviceDisappeared", dev, "Wrong-Level", ainfo); - st->err = 1; - close(fd); - return 0; - } - if (st->devnum == INT_MAX) { - struct stat stb; - if (fstat(fd, &stb) == 0 && - (S_IFMT&stb.st_mode)==S_IFBLK) { - if (major(stb.st_rdev) == MD_MAJOR) - st->devnum = minor(stb.st_rdev); - else - st->devnum = -1- (minor(stb.st_rdev)>>6); - } - } + if (fd < 0) + goto disappeared; - for (mse2 = mdstat ; mse2 ; mse2=mse2->next) - if (mse2->devnum == st->devnum) { - mse2->devnum = INT_MAX; /* flag it as "used" */ + if (st->devnm[0] == 0) + strcpy(st->devnm, fd2devnm(fd)); + + for (mse2 = mdstat; mse2; mse2 = mse2->next) + if (strcmp(mse2->devnm, st->devnm) == 0) { + mse2->devnm[0] = 0; /* flag it as "used" */ mse = mse2; } if (!mse) { /* duplicated array in statelist - * or re-created after reading mdstat*/ - st->err = 1; - close(fd); - return 0; + * or re-created after reading mdstat + */ + st->err++; + goto out; } + + if (mse->level == NULL) + is_container = 1; + + if (!is_container && !md_array_active(fd)) + goto disappeared; + + fcntl(fd, F_SETFD, FD_CLOEXEC); + if (md_get_array_info(fd, &array) < 0) + goto disappeared; + + if (!is_container && map_name(pers, mse->level) > 0) + redundancy_only_flags |= GET_MISMATCH; + + sra = sysfs_read(-1, st->devnm, GET_LEVEL | GET_DISKS | GET_DEVS | + GET_STATE | redundancy_only_flags); + + if (!sra) + goto disappeared; + + /* It's much easier to list what array levels can't + * have a device disappear than all of them that can + */ + if (sra->array.level == 0 || sra->array.level == -1) { + if (!st->err && !st->from_config) + alert("DeviceDisappeared", dev, " Wrong-Level", ainfo); + st->err++; + goto out; + } + /* this array is in /proc/mdstat */ if (array.utime == 0) /* external arrays don't update utime, so * just make sure it is always different. */ array.utime = st->utime + 1;; - if (st->utime == array.utime && - st->failed == array.failed_disks && - st->working == array.working_disks && - st->spare == array.spare_disks && - (mse == NULL || ( - mse->percent == st->percent - ))) { - close(fd); + if (st->err) { + /* New array appeared where previously had an error */ st->err = 0; + st->percent = RESYNC_NONE; + new_array = 1; + alert("NewArray", st->devname, NULL, ainfo); + } + + if (st->utime == array.utime && st->failed == sra->array.failed_disks && + st->working == sra->array.working_disks && + st->spare == sra->array.spare_disks && + (mse == NULL || (mse->percent == st->percent))) { if ((st->active < st->raid) && st->spare == 0) - return 1; - else - return 0; + retval = 1; + goto out; } if (st->utime == 0 && /* new array */ - mse->pattern && strchr(mse->pattern, '_') /* degraded */ - ) + mse->pattern && strchr(mse->pattern, '_') /* degraded */) alert("DegradedArray", dev, NULL, ainfo); - if (st->utime == 0 && /* new array */ - st->expected_spares > 0 && - array.spare_disks < st->expected_spares) + if (st->utime == 0 && /* new array */ st->expected_spares > 0 && + sra->array.spare_disks < st->expected_spares) alert("SparesMissing", dev, NULL, ainfo); - if (st->percent == -1 && + if (st->percent < 0 && st->percent != RESYNC_UNKNOWN && mse->percent >= 0) alert("RebuildStarted", dev, NULL, ainfo); - if (st->percent >= 0 && - mse->percent >= 0 && + if (st->percent >= 0 && mse->percent >= 0 && (mse->percent / increments) > (st->percent / increments)) { - char percentalert[15]; // "RebuildNN" (10 chars) or "RebuildStarted" (15 chars) + char percentalert[18]; + /* + * "RebuildNN" (10 chars) or "RebuildStarted" (15 chars) + */ if((mse->percent / increments) == 0) - snprintf(percentalert, sizeof(percentalert), "RebuildStarted"); + snprintf(percentalert, sizeof(percentalert), + "RebuildStarted"); else - snprintf(percentalert, sizeof(percentalert), "Rebuild%02d", mse->percent); + snprintf(percentalert, sizeof(percentalert), + "Rebuild%02d", mse->percent); alert(percentalert, dev, NULL, ainfo); } - if (mse->percent == -1 && - st->percent >= 0) { + if (mse->percent == RESYNC_NONE && st->percent >= 0) { /* Rebuild/sync/whatever just finished. * If there is a number in /mismatch_cnt, * we should report that. */ - struct mdinfo *sra = - sysfs_read(-1, st->devnum, GET_MISMATCH); if (sra && sra->mismatch_cnt > 0) { char cnt[80]; snprintf(cnt, sizeof(cnt), " mismatches found: %d (on raid level %d)", - sra->mismatch_cnt, array.level); + sra->mismatch_cnt, sra->array.level); alert("RebuildFinished", dev, cnt, ainfo); } else alert("RebuildFinished", dev, NULL, ainfo); - if (sra) - free(sra); } st->percent = mse->percent; - remaining_disks = array.nr_disks; - for (i=0; i 0; - i++) { + remaining_disks = sra->array.nr_disks; + for (i = 0; i < MAX_DISKS && remaining_disks > 0; i++) { mdu_disk_info_t disc; disc.number = i; - if (ioctl(fd, GET_DISK_INFO, &disc) >= 0) { + if (md_get_disk_info(fd, &disc) >= 0) { info[i].state = disc.state; info[i].major = disc.major; info[i].minor = disc.minor; @@ -593,77 +605,73 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, if (mse->metadata_version && strncmp(mse->metadata_version, "external:", 9) == 0 && - is_subarray(mse->metadata_version+9)) - st->parent_dev = - devname2devnum(mse->metadata_version+10); - else - st->parent_dev = NoMdDev; - if (st->metadata == NULL && - st->parent_dev == NoMdDev) + is_subarray(mse->metadata_version+9)) { + char *sl; + strcpy(st->parent_devnm, mse->metadata_version + 10); + sl = strchr(st->parent_devnm, '/'); + if (sl) + *sl = 0; + } else + st->parent_devnm[0] = 0; + if (st->metadata == NULL && st->parent_devnm[0] == 0) st->metadata = super_by_fd(fd, NULL); - close(fd); - - for (i=0; i= last_disk) { - newstate = 0; - disc.major = disc.minor = 0; - } else if (info[i].major || info[i].minor) { + if (i < last_disk && (info[i].major || info[i].minor)) { newstate = info[i].state; - dv = map_dev(info[i].major, info[i].minor, 1); + dv = map_dev_preferred(info[i].major, info[i].minor, 1, + prefer); disc.state = newstate; disc.major = info[i].major; disc.minor = info[i].minor; - } else if (mse && mse->pattern && i < (int)strlen(mse->pattern)) { - switch(mse->pattern[i]) { - case 'U': newstate = 6 /* ACTIVE/SYNC */; break; - case '_': newstate = 8 /* REMOVED */; break; - } - disc.major = disc.minor = 0; - } + } else + newstate = (1 << MD_DISK_REMOVED); + if (dv == NULL && st->devid[i]) - dv = map_dev(major(st->devid[i]), - minor(st->devid[i]), 1); + dv = map_dev_preferred(major(st->devid[i]), + minor(st->devid[i]), 1, prefer); change = newstate ^ st->devstate[i]; - if (st->utime && change && !st->err) { - if (i < array.raid_disks && - (((newstate&change)&(1<devstate[i]&change)&(1<devstate[i]&change)&(1<utime && change && !st->err && !new_array) { + if ((st->devstate[i]&change) & (1 << MD_DISK_SYNC)) alert("Fail", dev, dv, ainfo); - else if (i >= array.raid_disks && + else if ((newstate & (1 << MD_DISK_FAULTY)) && (disc.major || disc.minor) && - st->devid[i] == makedev(disc.major, disc.minor) && - ((newstate&change)&(1<devid[i] == makedev(disc.major, + disc.minor)) alert("FailSpare", dev, dv, ainfo); - else if (i < array.raid_disks && - ! (newstate & (1<devstate[i]&change)&(1<devstate[i] = newstate; st->devid[i] = makedev(disc.major, disc.minor); } - st->active = array.active_disks; - st->working = array.working_disks; - st->spare = array.spare_disks; - st->failed = array.failed_disks; + st->active = sra->array.active_disks; + st->working = sra->array.working_disks; + st->spare = sra->array.spare_disks; + st->failed = sra->array.failed_disks; st->utime = array.utime; - st->raid = array.raid_disks; + st->raid = sra->array.raid_disks; st->err = 0; if ((st->active < st->raid) && st->spare == 0) - return 1; - return 0; + retval = 1; + + out: + if (sra) + sysfs_free(sra); + if (fd >= 0) + close(fd); + return retval; + + disappeared: + if (!st->err) + alert("DeviceDisappeared", dev, NULL, ainfo); + st->err++; + goto out; } static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, @@ -671,23 +679,28 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, { struct mdstat_ent *mse; int new_found = 0; + char *name; - for (mse=mdstat; mse; mse=mse->next) - if (mse->devnum != INT_MAX && - (!mse->level || /* retrieve containers */ - (strcmp(mse->level, "raid0") != 0 && - strcmp(mse->level, "linear") != 0)) - ) { - struct state *st = calloc(1, sizeof *st); + for (mse = mdstat; mse; mse = mse->next) + if (mse->devnm[0] && (!mse->level || /* retrieve containers */ + (strcmp(mse->level, "raid0") != 0 && + strcmp(mse->level, "linear") != 0))) { + struct state *st = xcalloc(1, sizeof *st); mdu_array_info_t array; int fd; - if (st == NULL) + + name = get_md_name(mse->devnm); + if (!name) { + free(st); continue; - st->devname = strdup(get_md_name(mse->devnum)); + } + + st->devname = xstrdup(name); if ((fd = open(st->devname, O_RDONLY)) < 0 || - ioctl(fd, GET_ARRAY_INFO, &array)< 0) { + md_get_array_info(fd, &array) < 0) { /* no such array */ - if (fd >=0) close(fd); + if (fd >= 0) + close(fd); put_md_name(st->devname); free(st->devname); if (st->metadata) { @@ -700,32 +713,37 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, close(fd); st->next = *statelist; st->err = 1; - st->devnum = mse->devnum; - st->percent = -2; + st->from_auto = 1; + strcpy(st->devnm, mse->devnm); + st->percent = RESYNC_UNKNOWN; st->expected_spares = -1; if (mse->metadata_version && - strncmp(mse->metadata_version, "external:", 9) == 0 && - is_subarray(mse->metadata_version+9)) - st->parent_dev = - devname2devnum(mse->metadata_version+10); - else - st->parent_dev = NoMdDev; + strncmp(mse->metadata_version, + "external:", 9) == 0 && + is_subarray(mse->metadata_version+9)) { + char *sl; + strcpy(st->parent_devnm, + mse->metadata_version+10); + sl = strchr(st->parent_devnm, '/'); + *sl = 0; + } else + st->parent_devnm[0] = 0; *statelist = st; if (test) alert("TestMessage", st->devname, NULL, info); - alert("NewArray", st->devname, NULL, info); new_found = 1; } return new_found; } -static int get_min_spare_size_required(struct state *st, unsigned long long *sizep) +static int get_required_spare_criteria(struct state *st, + struct spare_criteria *sc) { int fd; - if (!st->metadata || - !st->metadata->ss->min_acceptable_spare_size) { - *sizep = 0; + if (!st->metadata || !st->metadata->ss->get_spare_criteria) { + sc->min_size = 0; + sc->sector_size = 0; return 0; } @@ -739,7 +757,8 @@ static int get_min_spare_size_required(struct state *st, unsigned long long *siz close(fd); if (!st->metadata->sb) return 1; - *sizep = st->metadata->ss->min_acceptable_spare_size(st->metadata); + + st->metadata->ss->get_spare_criteria(st->metadata, sc); st->metadata->ss->free_super(st->metadata); return 0; @@ -771,31 +790,38 @@ static int check_donor(struct state *from, struct state *to) } static dev_t choose_spare(struct state *from, struct state *to, - struct domainlist *domlist, unsigned long long min_size) + struct domainlist *domlist, struct spare_criteria *sc) { int d; dev_t dev = 0; - for (d = from->raid; !dev && d < MaxDisks; d++) { - if (from->devid[d] > 0 && - from->devstate[d] == 0) { + for (d = from->raid; !dev && d < MAX_DISKS; d++) { + if (from->devid[d] > 0 && from->devstate[d] == 0) { struct dev_policy *pol; unsigned long long dev_size; + unsigned int dev_sector_size; if (to->metadata->ss->external && test_partition_from_id(from->devid[d])) continue; - if (min_size && + if (sc->min_size && dev_size_from_id(from->devid[d], &dev_size) && - dev_size < min_size) + dev_size < sc->min_size) + continue; + + if (sc->sector_size && + dev_sector_size_from_id(from->devid[d], + &dev_sector_size) && + sc->sector_size != dev_sector_size) continue; - pol = devnum_policy(from->devid[d]); + pol = devid_policy(from->devid[d]); if (from->spare_group) pol_add(&pol, pol_domain, from->spare_group, NULL); - if (domain_test(domlist, pol, to->metadata->ss->name) == 1) + if (domain_test(domlist, pol, + to->metadata->ss->name) == 1) dev = from->devid[d]; dev_policy_free(pol); } @@ -805,7 +831,7 @@ static dev_t choose_spare(struct state *from, struct state *to, static dev_t container_choose_spare(struct state *from, struct state *to, struct domainlist *domlist, - unsigned long long min_size, int active) + struct spare_criteria *sc, int active) { /* This is similar to choose_spare, but we cannot trust devstate, * so we need to read the metadata instead @@ -822,12 +848,12 @@ static dev_t container_choose_spare(struct state *from, struct state *to, close(fd); return 0; } - + err = st->ss->load_container(st, fd, NULL); close(fd); if (err) return 0; - + if (from == to) { /* We must check if number of active disks has not increased * since ioctl in main loop. mdmon may have added spare @@ -842,8 +868,8 @@ static dev_t container_choose_spare(struct state *from, struct state *to, } dp = list->devs; while (dp) { - if (dp->disk.state & (1<disk.state & (1<disk.state & (1 << MD_DISK_SYNC) && + !(dp->disk.state & (1 << MD_DISK_FAULTY))) active_cnt++; dp = dp->next; } @@ -856,7 +882,7 @@ static dev_t container_choose_spare(struct state *from, struct state *to, } /* We only need one spare so full list not needed */ - list = container_choose_spares(st, min_size, domlist, from->spare_group, + list = container_choose_spares(st, sc, domlist, from->spare_group, to->metadata->ss->name, 1); if (list) { struct mdinfo *disks = list->devs; @@ -868,42 +894,40 @@ static dev_t container_choose_spare(struct state *from, struct state *to, return dev; } - static void try_spare_migration(struct state *statelist, struct alert_info *info) { struct state *from; struct state *st; + struct spare_criteria sc; link_containers_with_subarrays(statelist); for (st = statelist; st; st = st->next) - if (st->active < st->raid && - st->spare == 0 && !st->err) { + if (st->active < st->raid && st->spare == 0 && !st->err) { struct domainlist *domlist = NULL; int d; struct state *to = st; - unsigned long long min_size; - if (to->parent_dev != NoMdDev && !to->parent) + if (to->parent_devnm[0] && !to->parent) /* subarray monitored without parent container * we can't move spares here */ continue; - + if (to->parent) /* member of a container */ to = to->parent; - if (get_min_spare_size_required(to, &min_size)) + if (get_required_spare_criteria(to, &sc)) continue; if (to->metadata->ss->external) { /* We must make sure there is * no suitable spare in container already. * If there is we don't add more */ dev_t devid = container_choose_spare( - to, to, NULL, min_size, st->active); + to, to, NULL, &sc, st->active); if (devid > 0) continue; } - for (d = 0; d < MaxDisks; d++) + for (d = 0; d < MAX_DISKS; d++) if (to->devid[d]) domainlist_add_dev(&domlist, to->devid[d], @@ -922,13 +946,15 @@ static void try_spare_migration(struct state *statelist, struct alert_info *info continue; if (from->metadata->ss->external) devid = container_choose_spare( - from, to, domlist, min_size, 0); + from, to, domlist, &sc, 0); else devid = choose_spare(from, to, domlist, - min_size); - if (devid > 0 - && move_spare(from->devname, to->devname, devid)) { - alert("MoveSpare", to->devname, from->devname, info); + &sc); + if (devid > 0 && + move_spare(from->devname, to->devname, + devid)) { + alert("MoveSpare", to->devname, + from->devname, info); break; } } @@ -951,11 +977,10 @@ static void link_containers_with_subarrays(struct state *list) st->subarray = NULL; } for (st = list; st; st = st->next) - if (st->parent_dev != NoMdDev) + if (st->parent_devnm[0]) for (cont = list; cont; cont = cont->next) - if (!cont->err && - cont->parent_dev == NoMdDev && - cont->devnum == st->parent_dev) { + if (!cont->err && cont->parent_devnm[0] == 0 && + strcmp(cont->devnm, st->parent_devnm) == 0) { st->parent = cont; st->subarray = cont->subarray; cont->subarray = st; @@ -966,32 +991,60 @@ static void link_containers_with_subarrays(struct state *list) /* Not really Monitor but ... */ int Wait(char *dev) { - struct stat stb; - int devnum; + char devnm[32]; + dev_t rdev; + char *tmp; int rv = 1; + int frozen_remaining = 3; + + if (!stat_is_blkdev(dev, &rdev)) + return 2; - if (stat(dev, &stb) != 0) { - fprintf(stderr, Name ": Cannot find %s: %s\n", dev, - strerror(errno)); + tmp = devid2devnm(rdev); + if (!tmp) { + pr_err("Cannot get md device name.\n"); return 2; } - devnum = stat2devnum(&stb); + + strcpy(devnm, tmp); while(1) { struct mdstat_ent *ms = mdstat_read(1, 0); struct mdstat_ent *e; - for (e=ms ; e; e=e->next) - if (e->devnum == devnum) + for (e = ms; e; e = e->next) + if (strcmp(e->devnm, devnm) == 0) break; - if (!e || e->percent < 0) { + if (e && e->percent == RESYNC_NONE) { + /* We could be in the brief pause before something + * starts. /proc/mdstat doesn't show that, but + * sync_action does. + */ + struct mdinfo mdi; + char buf[21]; + + if (sysfs_init(&mdi, -1, devnm)) + return 2; + if (sysfs_get_str(&mdi, NULL, "sync_action", + buf, 20) > 0 && + strcmp(buf,"idle\n") != 0) { + e->percent = RESYNC_UNKNOWN; + if (strcmp(buf, "frozen\n") == 0) { + if (frozen_remaining == 0) + e->percent = RESYNC_NONE; + else + frozen_remaining -= 1; + } + } + } + if (!e || e->percent == RESYNC_NONE) { if (e && e->metadata_version && strncmp(e->metadata_version, "external:", 9) == 0) { if (is_subarray(&e->metadata_version[9])) ping_monitor(&e->metadata_version[9]); else - ping_monitor_by_id(devnum); + ping_monitor(devnm); } free_mdstat(ms); return rv; @@ -1002,31 +1055,33 @@ int Wait(char *dev) } } -#ifndef MDASSEMBLE - +/* The state "broken" is used only for RAID0/LINEAR - it's the same as + * "clean", but used in case the array has one or more members missing. + */ static char *clean_states[] = { - "clear", "inactive", "readonly", "read-auto", "clean", NULL }; + "clear", "inactive", "readonly", "read-auto", "clean", "broken", NULL }; -int WaitClean(char *dev, int sock, int verbose) +int WaitClean(char *dev, int verbose) { int fd; struct mdinfo *mdi; int rv = 1; - int devnum; + char devnm[32]; + if (!stat_is_blkdev(dev, NULL)) + return 2; fd = open(dev, O_RDONLY); if (fd < 0) { if (verbose) - fprintf(stderr, Name ": Couldn't open %s: %s\n", dev, strerror(errno)); + pr_err("Couldn't open %s: %s\n", dev, strerror(errno)); return 1; } - devnum = fd2devnum(fd); - mdi = sysfs_read(fd, devnum, GET_VERSION|GET_LEVEL|GET_SAFEMODE); + strcpy(devnm, fd2devnm(fd)); + mdi = sysfs_read(fd, devnm, GET_VERSION|GET_LEVEL|GET_SAFEMODE); if (!mdi) { if (verbose) - fprintf(stderr, Name ": Failed to read sysfs attributes for " - "%s\n", dev); + pr_err("Failed to read sysfs attributes for %s\n", dev); close(fd); return 0; } @@ -1050,47 +1105,42 @@ int WaitClean(char *dev, int sock, int verbose) rv = 0; if (rv) { - int state_fd = sysfs_open(fd2devnum(fd), NULL, "array_state"); + int state_fd = sysfs_open(fd2devnm(fd), NULL, "array_state"); char buf[20]; - fd_set fds; - struct timeval tm; + int delay = 5000; /* minimize the safe_mode_delay and prepare to wait up to 5s * for writes to quiesce */ sysfs_set_safemode(mdi, 1); - tm.tv_sec = 5; - tm.tv_usec = 0; - - FD_ZERO(&fds); /* wait for array_state to be clean */ while (1) { rv = read(state_fd, buf, sizeof(buf)); if (rv < 0) break; - if (sysfs_match_word(buf, clean_states) <= 4) + if (sysfs_match_word(buf, clean_states) < + (int)ARRAY_SIZE(clean_states) - 1) break; - FD_SET(state_fd, &fds); - rv = select(state_fd + 1, NULL, NULL, &fds, &tm); + rv = sysfs_wait(state_fd, &delay); if (rv < 0 && errno != EINTR) break; lseek(state_fd, 0, SEEK_SET); } if (rv < 0) rv = 1; - else if (fping_monitor(sock) == 0 || - ping_monitor(mdi->text_version) == 0) { + else if (ping_monitor(mdi->text_version) == 0) { /* we need to ping to close the window between array * state transitioning to clean and the metadata being * marked clean */ rv = 0; - } else + } else { rv = 1; + pr_err("Error connecting monitor with %s\n", dev); + } if (rv && verbose) - fprintf(stderr, Name ": Error waiting for %s to be clean\n", - dev); + pr_err("Error waiting for %s to be clean\n", dev); /* restore the original safe_mode_delay */ sysfs_set_safemode(mdi, mdi->safe_mode_delay); @@ -1102,4 +1152,3 @@ int WaitClean(char *dev, int sock, int verbose) return rv; } -#endif /* MDASSEMBLE */