Improve partition table code.

[thirdparty/mdadm.git] / monitor.c

diff --git a/monitor.c b/monitor.c
index 5c17910fe535249452cb908ffa39b43f5a950205..e43e545ce196f1370ad68b78c9b02dac67ae89f9 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1,8 +1,8 @@
 /*
  * mdmon - monitor external metadata arrays
  *
- * Copyright (C) 2007-2008 Neil Brown <neilb@suse.de>
- * Copyright (C) 2007-2008 Intel Corporation
+ * Copyright (C) 2007-2009 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2007-2009 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -66,21 +66,20 @@ static int read_attr(char *buf, int len, int fd)
        return n;
 }
 
-int get_resync_start(struct active_array *a)
+static unsigned long long read_resync_start(int fd)
 {
        char buf[30];
        int n;
 
-       n = read_attr(buf, 30, a->resync_start_fd);
+       n = read_attr(buf, 30, fd);
        if (n <= 0)
-               return n;
-
-       a->resync_start = strtoull(buf, NULL, 10);
-
-       return 1;
+               return 0;
+       if (strncmp(buf, "none", 4) == 0)
+               return MaxSector;
+       else
+               return strtoull(buf, NULL, 10);
 }
 
-
 static enum array_state read_state(int fd)
 {
        char buf[20];
@@ -199,42 +198,48 @@ static int read_and_act(struct active_array *a)
        int check_degraded = 0;
        int deactivate = 0;
        struct mdinfo *mdi;
+       int dirty = 0;
 
        a->next_state = bad_word;
        a->next_action = bad_action;
 
        a->curr_state = read_state(a->info.state_fd);
        a->curr_action = read_action(a->action_fd);
+       a->info.resync_start = read_resync_start(a->resync_start_fd);
        for (mdi = a->info.devs; mdi ; mdi = mdi->next) {
                mdi->next_state = 0;
-               if (mdi->state_fd >= 0)
+               if (mdi->state_fd >= 0) {
+                       mdi->recovery_start = read_resync_start(mdi->recovery_fd);
                        mdi->curr_state = read_dev_state(mdi->state_fd);
+               }
        }
 
        if (a->curr_state <= inactive &&
            a->prev_state > inactive) {
                /* array has been stopped */
-               get_resync_start(a);
                a->container->ss->set_array_state(a, 1);
                a->next_state = clear;
                deactivate = 1;
        }
        if (a->curr_state == write_pending) {
-               get_resync_start(a);
                a->container->ss->set_array_state(a, 0);
                a->next_state = active;
+               dirty = 1;
        }
        if (a->curr_state == active_idle) {
                /* Set array to 'clean' FIRST, then mark clean
                 * in the metadata
                 */
                a->next_state = clean;
+               dirty = 1;
        }
        if (a->curr_state == clean) {
-               get_resync_start(a);
                a->container->ss->set_array_state(a, 1);
        }
-
+       if (a->curr_state == active ||
+           a->curr_state == suspended ||
+           a->curr_state == bad_word)
+               dirty = 1;
        if (a->curr_state == readonly) {
                /* Well, I'm ready to handle things.  If readonly
                 * wasn't requested, transition to read-auto.
@@ -245,11 +250,12 @@ static int read_and_act(struct active_array *a)
                        /* explicit request for readonly array.  Leave it alone */
                        ;
                } else {
-                       get_resync_start(a);
                        if (a->container->ss->set_array_state(a, 2))
                                a->next_state = read_auto; /* array is clean */
-                       else
+                       else {
                                a->next_state = active; /* Now active for recovery etc */
+                               dirty = 1;
+                       }
                }
        }
 
@@ -261,7 +267,6 @@ static int read_and_act(struct active_array *a)
                 * until the array goes inactive or readonly though.
                 * Just check if we need to fiddle spares.
                 */
-               get_resync_start(a);
                a->container->ss->set_array_state(a, a->curr_state <= clean);
                check_degraded = 1;
        }
@@ -361,7 +366,7 @@ static int read_and_act(struct active_array *a)
        if (deactivate)
                a->container = NULL;
 
-       return 1;
+       return dirty;
 }
 
 static struct mdinfo *
@@ -476,7 +481,11 @@ static int wait_and_act(struct supertype *container, int nowait)
                                dprintf("caught sigterm, all clean... exiting\n");
                        else
                                dprintf("no arrays to monitor... exiting\n");
-                       remove_pidfile(container->devname);
+                       if (!sigterm)
+                               /* On SIGTERM, someone (the take-over mdmon) will
+                                * clean up
+                                */
+                               remove_pidfile(container->devname);
                        exit_now = 1;
                        signal_manager();
                        exit(0);
@@ -488,7 +497,7 @@ static int wait_and_act(struct supertype *container, int nowait)
                sigprocmask(SIG_UNBLOCK, NULL, &set);
                sigdelset(&set, SIGUSR1);
                monitor_loop_cnt |= 1;
-               rv = pselect(maxfd+1, &rfds, NULL, NULL, NULL, &set);
+               rv = pselect(maxfd+1, NULL, NULL, &rfds, NULL, &set);
                monitor_loop_cnt += 1;
                if (rv == -1 && errno == EINTR)
                        rv = 0;
@@ -527,32 +536,17 @@ static int wait_and_act(struct supertype *container, int nowait)
                        /* FIXME check if device->state_fd need to be cleared?*/
                        signal_manager();
                }
-               if (a->container)
-                       rv += read_and_act(a);
-               else
-                       continue;
-
-               /* when terminating stop manipulating the array after it is
-                * clean, but make sure read_and_act() is given a chance to
-                * handle 'active_idle'
-                */
-               switch (read_state(a->info.state_fd)) {
-                       case active:
-                       case active_idle:
-                       case suspended:
-                       case bad_word:
-                               is_dirty = 1;
-                               break;
-                       default:
-                               if (a->curr_state == active_idle)
-                                       is_dirty = 1;
-                               else
-                                       is_dirty = 0;
-                               break;
+               if (a->container) {
+                       is_dirty = read_and_act(a);
+                       rv |= 1;
+                       dirty_arrays += is_dirty;
+                       /* when terminating stop manipulating the array after it
+                        * is clean, but make sure read_and_act() is given a
+                        * chance to handle 'active_idle'
+                        */
+                       if (sigterm && !is_dirty)
+                               a->container = NULL; /* stop touching this array */
                }
-               dirty_arrays += is_dirty;
-               if (sigterm && !is_dirty)
-                       a->container = NULL; /* stop touching this array */
        }
 
        /* propagate failures across container members */