Monitor: reduce default poll interval if mdstat is pollable.

[thirdparty/mdadm.git] / mdadm.c

diff --git a/mdadm.c b/mdadm.c
index 4402eba846762325cc206c330af6e144d257c5ca..fee7fd92fd859361c6870cfb5ee53291734f5555 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -91,6 +91,7 @@ int main(int argc, char *argv[])
 
        char *homehost = NULL;
        char sys_hostname[256];
+       int require_homehost = 1;
        char *mailaddr = NULL;
        char *program = NULL;
        int delay = 0;
@@ -166,7 +167,10 @@ int main(int argc, char *argv[])
                        continue;
 
                case HomeHost:
-                       homehost = optarg;
+                       if (strcasecmp(optarg, "<ignore>") == 0)
+                               require_homehost = 0;
+                       else
+                               homehost = optarg;
                        continue;
 
                case ':':
@@ -339,9 +343,11 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+#if 0
                case O(ASSEMBLE,AutoHomeHost):
                        auto_update_home = 1;
                        continue;
+#endif
                case O(INCREMENTAL, 'e'):
                case O(CREATE,'e'):
                case O(ASSEMBLE,'e'):
@@ -374,7 +380,8 @@ int main(int argc, char *argv[])
 
 
                case O(GROW,'z'):
-               case O(CREATE,'z'): /* size */
+               case O(CREATE,'z'):
+               case O(BUILD,'z'): /* size */
                        if (size >= 0) {
                                fprintf(stderr, Name ": size may only be specified once. "
                                        "Second value is %s.\n", optarg);
@@ -406,7 +413,10 @@ int main(int argc, char *argv[])
                                        optarg);
                                exit(2);
                        }
-                       if (level != 0 && level != -1 && level != 1 && level != -4 && level != -5 && mode == BUILD) {
+                       if (level != 0 && level != LEVEL_LINEAR && level != 1 &&
+                           level != LEVEL_MULTIPATH && level != LEVEL_FAULTY &&
+                           level != 10 &&
+                           mode == BUILD) {
                                fprintf(stderr, Name ": Raid level %s not permitted with --build.\n",
                                        optarg);
                                exit(2);
@@ -1009,7 +1019,7 @@ int main(int argc, char *argv[])
        }
 
        if (homehost == NULL)
-               homehost = conf_get_homehost();
+               homehost = conf_get_homehost(&require_homehost);
        if (homehost == NULL || strcmp(homehost, "<system>")==0) {
                if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) {
                        sys_hostname[sizeof(sys_hostname)-1] = 0;
@@ -1049,12 +1059,16 @@ int main(int argc, char *argv[])
                                        array_ident->autof = autof;
                                rv |= Assemble(ss, devlist->devname, array_ident,
                                               NULL, backup_file,
-                                              readonly, runstop, update, homehost, verbose-quiet, force);
+                                              readonly, runstop, update,
+                                              homehost, require_homehost,
+                                              verbose-quiet, force);
                        }
                } else if (!scan)
                        rv = Assemble(ss, devlist->devname, &ident,
                                      devlist->next, backup_file,
-                                     readonly, runstop, update, homehost, verbose-quiet, force);
+                                     readonly, runstop, update,
+                                     homehost, require_homehost,
+                                     verbose-quiet, force);
                else if (devs_found>0) {
                        if (update && devs_found > 1) {
                                fprintf(stderr, Name ": can only update a single array at a time\n");
@@ -1076,7 +1090,9 @@ int main(int argc, char *argv[])
                                        array_ident->autof = autof;
                                rv |= Assemble(ss, dv->devname, array_ident,
                                               NULL, backup_file,
-                                              readonly, runstop, update, homehost, verbose-quiet, force);
+                                              readonly, runstop, update,
+                                              homehost, require_homehost,
+                                              verbose-quiet, force);
                        }
                } else {
                        mddev_ident_t array_list =  conf_get_ident(NULL);
@@ -1095,13 +1111,18 @@ int main(int argc, char *argv[])
                                exit(1);
                        }
                        for (; array_list; array_list = array_list->next) {
+                               if (array_list->devname &&
+                                   strcasecmp(array_list->devname, "<ignore>") == 0)
+                                       continue;
                                if (array_list->autof == 0)
                                        array_list->autof = autof;
                                
                                rv |= Assemble(ss, array_list->devname,
                                               array_list,
                                               NULL, NULL,
-                                              readonly, runstop, NULL, homehost, verbose-quiet, force);
+                                              readonly, runstop, NULL,
+                                              homehost, require_homehost,
+                                              verbose-quiet, force);
                                cnt++;
                        }
                        if (homehost && cnt == 0) {
@@ -1119,7 +1140,9 @@ int main(int argc, char *argv[])
                                                rv2 = Assemble(ss, NULL,
                                                               &ident,
                                                               devlist, NULL,
-                                                              readonly, runstop, NULL, homehost, verbose-quiet, force);
+                                                              readonly, runstop, NULL,
+                                                              homehost, require_homehost,
+                                                              verbose-quiet, force);
                                                if (rv2==0) {
                                                        cnt++;
                                                        acnt++;
@@ -1132,6 +1155,7 @@ int main(int argc, char *argv[])
                                        } while (rv2!=2);
                                        /* Incase there are stacked devices, we need to go around again */
                                } while (acnt);
+#if 0
                                if (cnt == 0 && auto_update_home && homehost) {
                                        /* Nothing found, maybe we need to bootstrap homehost info */
                                        do {
@@ -1140,7 +1164,9 @@ int main(int argc, char *argv[])
                                                        rv2 = Assemble(ss, NULL,
                                                                       &ident,
                                                                       NULL, NULL,
-                                                                      readonly, runstop, "homehost", homehost, verbose-quiet, force);
+                                                                      readonly, runstop, "homehost",
+                                                                      homehost, require_homehost,
+                                                                      verbose-quiet, force);
                                                        if (rv2==0) {
                                                                cnt++;
                                                                acnt++;
@@ -1149,6 +1175,7 @@ int main(int argc, char *argv[])
                                                /* Incase there are stacked devices, we need to go around again */
                                        } while (acnt);
                                }
+#endif
                                if (cnt == 0 && rv == 0) {
                                        fprintf(stderr, Name ": No arrays found in config file or automatically\n");
                                        rv = 1;
@@ -1183,7 +1210,7 @@ int main(int argc, char *argv[])
                rv = Build(devlist->devname, chunk, level, layout,
                           raiddisks, devlist->next, assume_clean,
                           bitmap_file, bitmap_chunk, write_behind,
-                          delay, verbose-quiet, autof);
+                          delay, verbose-quiet, autof, size);
                break;
        case CREATE:
                if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
@@ -1238,7 +1265,8 @@ int main(int argc, char *argv[])
                                                char *name;
                                                struct map_ent *me;
                                                me = map_by_devnum(&map, e->devnum);
-                                               if (me && me->path)
+                                               if (me && me->path
+                                                   && strcmp(me->path, "/unknown") != 0)
                                                        name = me->path;
                                                else
                                                        name = get_md_name(e->devnum);
@@ -1345,6 +1373,13 @@ int main(int argc, char *argv[])
                        rv = 1;
                        break;
                }
+               if (delay == 0) {
+                       if (get_linux_version() > 20616)
+                               /* mdstat responds to poll */
+                               delay = 1000;
+                       else
+                               delay = 60;
+               }
                rv= Monitor(devlist, mailaddr, program,
                            delay?delay:60, daemonise, scan, oneshot,
                            dosyslog, test, pidfile);
@@ -1407,7 +1442,7 @@ int main(int argc, char *argv[])
                        break;
                }
                rv = Incremental(devlist->devname, verbose-quiet, runstop,
-                                ss, homehost, autof);
+                                ss, homehost, require_homehost, autof);
                break;
        case AUTODETECT:
                autodetect();