]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Monitor.c
Replace sysarray with mdinfo
[thirdparty/mdadm.git] / Monitor.c
index 5091c51b3c7d091bd044fa35c7b555288e6d3f65..6b0c760b94e45f5c64dd08c35ffc1aa1732709fc 100644 (file)
--- a/Monitor.c
+++ b/Monitor.c
 #include       "md_p.h"
 #include       "md_u.h"
 #include       <sys/wait.h>
-#include       <sys/signal.h>
-#include       <values.h>
+#include       <signal.h>
+#include       <limits.h>
 #include       <syslog.h>
 
 static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mailfrom,
                  char *cmd, int dosyslog);
 
-static char *percentalerts[] = { 
+static char *percentalerts[] = {
        "RebuildStarted",
        "Rebuild20",
        "Rebuild40",
@@ -172,7 +172,7 @@ int Monitor(mddev_dev_t devlist,
                        st->utime = 0;
                        st->next = statelist;
                        st->err = 0;
-                       st->devnum = MAXINT;
+                       st->devnum = INT_MAX;
                        st->percent = -2;
                        st->expected_spares = mdlist->spare_disks;
                        if (mdlist->spare_group)
@@ -192,7 +192,7 @@ int Monitor(mddev_dev_t devlist,
                        st->utime = 0;
                        st->next = statelist;
                        st->err = 0;
-                       st->devnum = MAXINT;
+                       st->devnum = INT_MAX;
                        st->percent = -2;
                        st->expected_spares = -1;
                        st->spare_group = NULL;
@@ -215,6 +215,7 @@ int Monitor(mddev_dev_t devlist,
                mdstat = mdstat_read(oneshot?0:1, 0);
 
                for (st=statelist; st; st=st->next) {
+                       struct { int state, major, minor; } info[MaxDisks];
                        mdu_array_info_t array;
                        struct mdstat_ent *mse = NULL, *mse2;
                        char *dev = st->devname;
@@ -233,6 +234,7 @@ int Monitor(mddev_dev_t devlist,
 */                             st->err=1;
                                continue;
                        }
+                       fcntl(fd, F_SETFD, FD_CLOEXEC);
                        if (ioctl(fd, GET_ARRAY_INFO, &array)<0) {
                                if (!st->err)
                                        alert("DeviceDisappeared", dev, NULL,
@@ -243,8 +245,10 @@ int Monitor(mddev_dev_t devlist,
                                close(fd);
                                continue;
                        }
-                       if (array.level != 1 && array.level != 5 && array.level != -4 &&
-                               array.level != 6 && array.level != 10) {
+                       /* 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",
                                              mailaddr, mailfrom, alert_cmd, dosyslog);
@@ -252,7 +256,7 @@ int Monitor(mddev_dev_t devlist,
                                close(fd);
                                continue;
                        }
-                       if (st->devnum == MAXINT) {
+                       if (st->devnum == INT_MAX) {
                                struct stat stb;
                                if (fstat(fd, &stb) == 0 &&
                                    (S_IFMT&stb.st_mode)==S_IFBLK) {
@@ -265,7 +269,7 @@ int Monitor(mddev_dev_t devlist,
 
                        for (mse2 = mdstat ; mse2 ; mse2=mse2->next)
                                if (mse2->devnum == st->devnum) {
-                                       mse2->devnum = MAXINT; /* flag it as "used" */
+                                       mse2->devnum = INT_MAX; /* flag it as "used" */
                                        mse = mse2;
                                }
 
@@ -287,11 +291,11 @@ int Monitor(mddev_dev_t devlist,
                                alert("DegradedArray", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
 
                        if (st->utime == 0 && /* new array */
-                           st->expected_spares > 0 && 
-                           array.spare_disks < st->expected_spares) 
+                           st->expected_spares > 0 &&
+                           array.spare_disks < st->expected_spares)
                                alert("SparesMissing", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
                        if (mse &&
-                           st->percent == -1 && 
+                           st->percent == -1 &&
                            mse->percent >= 0)
                                alert("RebuildStarted", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
                        if (mse &&
@@ -303,14 +307,42 @@ int Monitor(mddev_dev_t devlist,
 
                        if (mse &&
                            mse->percent == -1 &&
-                           st->percent >= 0)
-                               alert("RebuildFinished", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
+                           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[40];
+                                       sprintf(cnt, " mismatches found: %d", sra->mismatch_cnt);
+                                       alert("RebuildFinished", dev, cnt, mailaddr, mailfrom, alert_cmd, dosyslog);
+                               } else
+                                       alert("RebuildFinished", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
+                               if (sra)
+                                       free(sra);
+                       }
 
                        if (mse)
                                st->percent = mse->percent;
 
-                       for (i=0; i<MaxDisks; i++) {
+
+                       for (i=0; i<MaxDisks && i <= array.raid_disks + array.nr_disks;
+                            i++) {
                                mdu_disk_info_t disc;
+                               disc.number = i;
+                               if (ioctl(fd, GET_DISK_INFO, &disc) >= 0) {
+                                       info[i].state = disc.state;
+                                       info[i].major = disc.major;
+                                       info[i].minor = disc.minor;
+                               } else
+                                       info[i].major = info[i].minor = 0;
+                       }
+                       close(fd);
+
+                       for (i=0; i<MaxDisks; i++) {
+                               mdu_disk_info_t disc = {0};
                                int newstate=0;
                                int change;
                                char *dv = NULL;
@@ -318,9 +350,12 @@ int Monitor(mddev_dev_t devlist,
                                if (i > array.raid_disks + array.nr_disks) {
                                        newstate = 0;
                                        disc.major = disc.minor = 0;
-                               } else if (ioctl(fd, GET_DISK_INFO, &disc)>= 0) {
-                                       newstate = disc.state;
-                                       dv = map_dev(disc.major, disc.minor, 1);
+                               } else if (info[i].major || info[i].minor) {
+                                       newstate = info[i].state;
+                                       dv = map_dev(info[i].major, info[i].minor, 1);
+                                       disc.state = newstate;
+                                       disc.major = info[i].major;
+                                       disc.minor = info[i].minor;
                                } else if (mse &&  mse->pattern && i < strlen(mse->pattern)) {
                                        switch(mse->pattern[i]) {
                                        case 'U': newstate = 6 /* ACTIVE/SYNC */; break;
@@ -352,10 +387,9 @@ int Monitor(mddev_dev_t devlist,
                                                )
                                                alert("SpareActive", dev, dv, mailaddr, mailfrom, alert_cmd, dosyslog);
                                }
-                               st->devstate[i] = disc.state;
+                               st->devstate[i] = newstate;
                                st->devid[i] = makedev(disc.major, disc.minor);
                        }
-                       close(fd);
                        st->active = array.active_disks;
                        st->working = array.working_disks;
                        st->spare = array.spare_disks;
@@ -367,11 +401,10 @@ int Monitor(mddev_dev_t devlist,
                /* now check if there are any new devices found in mdstat */
                if (scan) {
                        struct mdstat_ent *mse;
-                       for (mse=mdstat; mse; mse=mse->next) 
-                               if (mse->devnum != MAXINT &&
-                                   (strcmp(mse->level, "raid1")==0 ||
-                                    strcmp(mse->level, "raid5")==0 ||
-                                    strcmp(mse->level, "multipath")==0)
+                       for (mse=mdstat; mse; mse=mse->next)
+                               if (mse->devnum != INT_MAX &&
+                                   (strcmp(mse->level, "raid0")!=0 &&
+                                    strcmp(mse->level, "linear")!=0)
                                        ) {
                                        struct state *st = malloc(sizeof *st);
                                        mdu_array_info_t array;
@@ -434,7 +467,7 @@ int Monitor(mddev_dev_t devlist,
                                                        }
                                                }
                                                if (dev > 0) {
-                                                       if (ioctl(fd2, HOT_REMOVE_DISK, 
+                                                       if (ioctl(fd2, HOT_REMOVE_DISK,
                                                                  (unsigned long)dev) == 0) {
                                                                if (ioctl(fd1, HOT_ADD_DISK,
                                                                          (unsigned long)dev) == 0) {
@@ -471,7 +504,7 @@ static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mail
 
        if (!cmd && !mailaddr) {
                time_t now = time(0);
-              
+
                printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");
        }
        if (cmd) {
@@ -487,8 +520,8 @@ static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mail
                        exit(2);
                }
        }
-       if (mailaddr && 
-           (strncmp(event, "Fail", 4)==0 || 
+       if (mailaddr &&
+           (strncmp(event, "Fail", 4)==0 ||
             strncmp(event, "Test", 4)==0 ||
             strncmp(event, "Spares", 6)==0 ||
             strncmp(event, "Degrade", 7)==0)) {
@@ -510,8 +543,10 @@ static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mail
 
                        fprintf(mp, "A %s event had been detected on md device %s.\n\n", event, dev);
 
-                       if (disc)
+                       if (disc && disc[0] != ' ')
                                fprintf(mp, "It could be related to component device %s.\n\n", disc);
+                       if (disc && disc[0] == ' ')
+                               fprintf(mp, "Extra information:%s.\n\n", disc);
 
                        fprintf(mp, "Faithfully yours, etc.\n");
 
@@ -569,7 +604,7 @@ int Wait(char *dev)
        if (major(stb.st_rdev) == MD_MAJOR)
                devnum = minor(stb.st_rdev);
        else
-               devnum = -minor(stb.st_rdev)/16;
+               devnum = -1-(minor(stb.st_rdev)/64);
 
        while(1) {
                struct mdstat_ent *ms = mdstat_read(1, 0);