X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Monitor.c;h=0ab5e0cea5ffdd53d3476f8a3315a39ac6495cc9;hp=021a9677aa5f87ee5de8723e9cdd2cac79dae76a;hb=16c6fa807c1e43a1a12bbeb7668b4166d14b2cc8;hpb=dd0781e50555c32ff2f808ec46f4b03a5693ea47 diff --git a/Monitor.c b/Monitor.c index 021a9677..0ab5e0ce 100644 --- a/Monitor.c +++ b/Monitor.c @@ -33,8 +33,10 @@ #include #include #include +#include -static void alert(char *event, char *dev, char *disc, char *mailaddr, char *cmd); +static void alert(char *event, char *dev, char *disc, char *mailaddr, char *cmd, + int dosyslog); static char *percentalerts[] = { "RebuildStarted", @@ -47,7 +49,7 @@ static char *percentalerts[] = { int Monitor(mddev_dev_t devlist, char *mailaddr, char *alert_cmd, int period, int daemonise, int scan, int oneshot, - char *config, int test) + int dosyslog, char *config, int test, char* pidfile) { /* * Every few seconds, scan every md device looking for changes @@ -127,7 +129,18 @@ int Monitor(mddev_dev_t devlist, if (daemonise) { int pid = fork(); if (pid > 0) { - printf("%d\n", pid); + if (!pidfile) + printf("%d\n", pid); + else { + FILE *pid_file; + pid_file=fopen(pidfile, "w"); + if (!pid_file) + perror("cannot create pid file"); + else { + fprintf(pid_file,"%d\n", pid); + fclose(pid_file); + } + } return 0; } if (pid < 0) { @@ -163,6 +176,7 @@ int Monitor(mddev_dev_t devlist, } else { mddev_dev_t dv; for (dv=devlist ; dv; dv=dv->next) { + mddev_ident_t mdlist = conf_get_ident(config, dv->devname); struct state *st = malloc(sizeof *st); if (st == NULL) continue; @@ -174,6 +188,11 @@ int Monitor(mddev_dev_t devlist, st->percent = -2; st->expected_spares = -1; st->spare_group = NULL; + if (mdlist) { + st->expected_spares = mdlist->spare_disks; + if (mdlist->spare_group) + st->spare_group = strdup(mdlist->spare_group); + } statelist = st; } } @@ -185,7 +204,7 @@ int Monitor(mddev_dev_t devlist, if (mdstat) free_mdstat(mdstat); - mdstat = mdstat_read(oneshot?0:1); + mdstat = mdstat_read(oneshot?0:1, 0); for (st=statelist; st; st=st->next) { mdu_array_info_t array; @@ -195,12 +214,12 @@ int Monitor(mddev_dev_t devlist, unsigned int i; if (test) - alert("TestMessage", dev, NULL, mailaddr, alert_cmd); + alert("TestMessage", dev, NULL, mailaddr, alert_cmd, dosyslog); fd = open(dev, O_RDONLY); if (fd < 0) { if (!st->err) alert("DeviceDisappeared", dev, NULL, - mailaddr, alert_cmd); + mailaddr, alert_cmd, dosyslog); /* fprintf(stderr, Name ": cannot open %s: %s\n", dev, strerror(errno)); */ st->err=1; @@ -209,17 +228,18 @@ int Monitor(mddev_dev_t devlist, if (ioctl(fd, GET_ARRAY_INFO, &array)<0) { if (!st->err) alert("DeviceDisappeared", dev, NULL, - mailaddr, alert_cmd); + mailaddr, alert_cmd, dosyslog); /* fprintf(stderr, Name ": cannot get array info for %s: %s\n", dev, strerror(errno)); */ st->err=1; close(fd); continue; } - if (array.level != 1 && array.level != 5 && array.level != -4) { + if (array.level != 1 && array.level != 5 && array.level != -4 && + array.level != 6 && array.level != 10) { if (!st->err) alert("DeviceDisappeared", dev, "Wrong-Level", - mailaddr, alert_cmd); + mailaddr, alert_cmd, dosyslog); st->err = 1; close(fd); continue; @@ -228,10 +248,10 @@ int Monitor(mddev_dev_t devlist, 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); + if (major(stb.st_rdev) == MD_MAJOR) + st->devnum = minor(stb.st_rdev); else - st->devnum = -1- (MINOR(stb.st_rdev)>>6); + st->devnum = -1- (minor(stb.st_rdev)>>6); } } @@ -256,27 +276,27 @@ int Monitor(mddev_dev_t devlist, mse && /* is in /proc/mdstat */ mse->pattern && strchr(mse->pattern, '_') /* degraded */ ) - alert("DegradedArray", dev, NULL, mailaddr, alert_cmd); + alert("DegradedArray", dev, NULL, mailaddr, alert_cmd, dosyslog); if (st->utime == 0 && /* new array */ st->expected_spares > 0 && array.spare_disks < st->expected_spares) - alert("SparesMissing", dev, NULL, mailaddr, alert_cmd); + alert("SparesMissing", dev, NULL, mailaddr, alert_cmd, dosyslog); if (mse && st->percent == -1 && mse->percent >= 0) - alert("RebuildStarted", dev, NULL, mailaddr, alert_cmd); + alert("RebuildStarted", dev, NULL, mailaddr, alert_cmd, dosyslog); if (mse && st->percent >= 0 && mse->percent >= 0 && (mse->percent / 20) > (st->percent / 20)) alert(percentalerts[mse->percent/20], - dev, NULL, mailaddr, alert_cmd); + dev, NULL, mailaddr, alert_cmd, dosyslog); if (mse && mse->percent == -1 && st->percent >= 0) - alert("RebuildFinished", dev, NULL, mailaddr, alert_cmd); + alert("RebuildFinished", dev, NULL, mailaddr, alert_cmd, dosyslog); if (mse) st->percent = mse->percent; @@ -289,12 +309,15 @@ int Monitor(mddev_dev_t devlist, disc.number = i; if (ioctl(fd, GET_DISK_INFO, &disc)>= 0) { newstate = disc.state; - dv = map_dev(disc.major, disc.minor); + dv = map_dev(disc.major, disc.minor, 1); } else if (mse && mse->pattern && i < strlen(mse->pattern)) switch(mse->pattern[i]) { case 'U': newstate = 6 /* ACTIVE/SYNC */; break; case '_': newstate = 0; break; } + if (dv == NULL && st->devid[i]) + dv = map_dev(major(st->devid[i]), + minor(st->devid[i]), 1); change = newstate ^ st->devstate[i]; if (st->utime && change && !st->err) { if (i < (unsigned)array.raid_disks && @@ -302,22 +325,22 @@ int Monitor(mddev_dev_t devlist, ((st->devstate[i]&change)&(1<devstate[i]&change)&(1<= (unsigned)array.raid_disks && (disc.major || disc.minor) && - st->devid[i] == MKDEV(disc.major, disc.minor) && + st->devid[i] == makedev(disc.major, disc.minor) && ((newstate&change)&(1<devstate[i]&change)&(1<devstate[i] = disc.state; - st->devid[i] = MKDEV(disc.major, disc.minor); + st->devid[i] = makedev(disc.major, disc.minor); } close(fd); st->active = array.active_disks; @@ -360,7 +383,7 @@ int Monitor(mddev_dev_t devlist, st->spare_group = NULL; st->expected_spares = -1; statelist = st; - alert("NewArray", st->devname, NULL, mailaddr, alert_cmd); + alert("NewArray", st->devname, NULL, mailaddr, alert_cmd, dosyslog); new_found = 1; } } @@ -401,7 +424,7 @@ int Monitor(mddev_dev_t devlist, (unsigned long)dev) == 0) { if (ioctl(fd1, HOT_ADD_DISK, (unsigned long)dev) == 0) { - alert("MoveSpare", st->devname, st2->devname, mailaddr, alert_cmd); + alert("MoveSpare", st->devname, st2->devname, mailaddr, alert_cmd, dosyslog); close(fd1); close(fd2); break; @@ -421,12 +444,17 @@ int Monitor(mddev_dev_t devlist, } test = 0; } + if (pidfile) + unlink(pidfile); return 0; } -static void alert(char *event, char *dev, char *disc, char *mailaddr, char *cmd) +static void alert(char *event, char *dev, char *disc, char *mailaddr, char *cmd, + int dosyslog) { + int priority; + if (!cmd && !mailaddr) { time_t now = time(0); @@ -471,5 +499,27 @@ static void alert(char *event, char *dev, char *disc, char *mailaddr, char *cmd) } } - /* FIXME log the event to syslog maybe */ + + /* log the event to syslog maybe */ + if (dosyslog) { + /* 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) + priority = LOG_CRIT; + /* Good to know about, but are not failures: */ + else if (strncmp(event, "Rebuild", 7)==0 || + strncmp(event, "MoveSpare", 9)==0) + priority = LOG_WARNING; + /* Everything else: */ + else + priority = LOG_INFO; + + if (disc) + syslog(priority, "%s event detected on md device %s, component device %s", event, dev, disc); + else + syslog(priority, "%s event detected on md device %s", event, dev); + } }