]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - monitor.c
mdmon: don't wait for O_EXCL when shutting down.
[thirdparty/mdadm.git] / monitor.c
index 62261d963fe89a25593de63c2172cbf6fe13fc85..69026ca0e35cc6d753b79c92e92d16e3255494a1 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,20 +66,37 @@ 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;
+               return 0;
+       if (strncmp(buf, "none", 4) == 0)
+               return MaxSector;
+       else
+               return strtoull(buf, NULL, 10);
+}
 
-       a->resync_start = strtoull(buf, NULL, 10);
+static unsigned long long read_sync_completed(int fd)
+{
+       unsigned long long val;
+       char buf[50];
+       int n;
+       char *ep;
 
-       return 1;
-}
+       n = read_attr(buf, 50, fd);
 
+       if (n <= 0)
+               return 0;
+       buf[n] = 0;
+       val = strtoull(buf, &ep, 0);
+       if (ep == buf || (*ep != 0 && *ep != '\n' && *ep != ' '))
+               return 0;
+       return val;
+}
 
 static enum array_state read_state(int fd)
 {
@@ -196,7 +213,9 @@ static void signal_manager(void)
 
 static int read_and_act(struct active_array *a)
 {
+       unsigned long long sync_completed;
        int check_degraded = 0;
+       int check_reshape = 0;
        int deactivate = 0;
        struct mdinfo *mdi;
        int dirty = 0;
@@ -206,22 +225,32 @@ static int read_and_act(struct active_array *a)
 
        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);
+       sync_completed = read_sync_completed(a->sync_completed_fd);
        for (mdi = a->info.devs; mdi ; mdi = mdi->next) {
                mdi->next_state = 0;
-               if (mdi->state_fd >= 0)
+               mdi->curr_state = 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 started
+                * possible that container operation has to be completed
+                */
+               a->container->ss->set_array_state(a, 0);
+       }
        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;
@@ -234,7 +263,6 @@ static int read_and_act(struct active_array *a)
                dirty = 1;
        }
        if (a->curr_state == clean) {
-               get_resync_start(a);
                a->container->ss->set_array_state(a, 1);
        }
        if (a->curr_state == active ||
@@ -251,7 +279,6 @@ 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 {
@@ -269,7 +296,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;
        }
@@ -288,6 +314,15 @@ static int read_and_act(struct active_array *a)
                }
        }
 
+       if (!deactivate &&
+           a->curr_action == reshape &&
+           a->prev_action != reshape)
+               /* reshape was requested by mdadm.  Need to see if
+                * new devices have been added.  Manager does that
+                * when it sees check_reshape
+                */
+               check_reshape = 1;
+
        /* Check for failures and if found:
         * 1/ Record the failure in the metadata and unblock the device.
         *    FIXME update the kernel to stop notifying on failed drives when
@@ -310,6 +345,52 @@ static int read_and_act(struct active_array *a)
                }
        }
 
+       /* Check for recovery checkpoint notifications.  We need to be a
+        * minimum distance away from the last checkpoint to prevent
+        * over checkpointing.  Note reshape checkpointing is handled
+        * in the second branch.
+        */
+       if (sync_completed > a->last_checkpoint &&
+           sync_completed - a->last_checkpoint > a->info.component_size >> 4 &&
+           a->curr_action > reshape) {
+               /* A (non-reshape) sync_action has reached a checkpoint.
+                * Record the updated position in the metadata
+                */
+               a->last_checkpoint = sync_completed;
+               a->container->ss->set_array_state(a, a->curr_state <= clean);
+       } else if ((a->curr_action == idle && a->prev_action == reshape) ||
+                  (a->curr_action == reshape
+                   && sync_completed > a->last_checkpoint) ) {
+               /* Reshape has progressed or completed so we need to
+                * update the array state - and possibly the array size
+                */
+               if (sync_completed != 0)
+                       a->last_checkpoint = sync_completed;
+               /* We might need to update last_checkpoint depending on
+                * the reason that reshape finished.
+                * if array reshape is really finished:
+                *        set check point to the end, this allows
+                *        set_array_state() to finalize reshape in metadata
+                * if reshape if broken: do not set checkpoint to the end
+                *        this allows for reshape restart from checkpoint
+                */
+               if ((a->curr_action != reshape) &&
+                   (a->prev_action == reshape)) {
+                       char buf[40];
+                       if ((sysfs_get_str(&a->info, NULL,
+                                         "reshape_position",
+                                         buf,
+                                         sizeof(buf)) >= 0) &&
+                            strncmp(buf, "none", 4) == 0)
+                               a->last_checkpoint = a->info.component_size;
+               }
+               a->container->ss->set_array_state(a, a->curr_state <= clean);
+               a->last_checkpoint = sync_completed;
+       }
+
+       if (sync_completed > a->last_checkpoint)
+               a->last_checkpoint = sync_completed;
+
        a->container->ss->sync_metadata(a->container);
        dprintf("%s(%d): state:%s action:%s next(", __func__, a->info.container_member,
                array_states[a->curr_state], sync_actions[a->curr_action]);
@@ -340,6 +421,7 @@ static int read_and_act(struct active_array *a)
                        if (remove_result > 0) {
                                dprintf(" %d:removed", mdi->disk.raid_disk);
                                close(mdi->state_fd);
+                               close(mdi->recovery_fd);
                                mdi->state_fd = -1;
                        }
                }
@@ -360,9 +442,12 @@ static int read_and_act(struct active_array *a)
                mdi->next_state = 0;
        }
 
-       if (check_degraded) {
+       if (check_degraded || check_reshape) {
                /* manager will do the actual check */
-               a->check_degraded = 1;
+               if (check_degraded)
+                       a->check_degraded = 1;
+               if (check_reshape)
+                       a->check_reshape = 1;
                signal_manager();
        }
 
@@ -450,7 +535,7 @@ static int wait_and_act(struct supertype *container, int nowait)
                /* once an array has been deactivated we want to
                 * ask the manager to discard it.
                 */
-               if (!a->container) {
+               if (!a->container || (a->info.array.level == 0)) {
                        if (discard_this) {
                                ap = &(*ap)->next;
                                continue;
@@ -464,6 +549,7 @@ static int wait_and_act(struct supertype *container, int nowait)
 
                add_fd(&rfds, &maxfd, a->info.state_fd);
                add_fd(&rfds, &maxfd, a->action_fd);
+               add_fd(&rfds, &maxfd, a->sync_completed_fd);
                for (mdi = a->info.devs ; mdi ; mdi = mdi->next)
                        add_fd(&rfds, &maxfd, mdi->state_fd);
 
@@ -477,26 +563,43 @@ static int wait_and_act(struct supertype *container, int nowait)
                 * problem as there are no active arrays, there is
                 * nothing that we need to be ready to do.
                 */
-               int fd = open_dev_excl(container->devnum);
+               int fd;
+               if (sigterm)
+                       fd = open_dev_excl(container->devnum);
+               else
+                       fd = open_dev_flags(container->devnum, O_RDONLY|O_EXCL);
                if (fd >= 0 || errno != EBUSY) {
                        /* OK, we are safe to leave */
                        if (sigterm && !dirty_arrays)
                                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();
+                       close(fd);
                        exit(0);
                }
        }
 
        if (!nowait) {
                sigset_t set;
+               struct timespec ts;
+               ts.tv_sec = 24*3600;
+               ts.tv_nsec = 0;
+               if (*aap == NULL) {
+                       /* just waiting to get O_EXCL access */
+                       ts.tv_sec = 0;
+                       ts.tv_nsec = 20000000ULL;
+               }
                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, &ts, &set);
                monitor_loop_cnt += 1;
                if (rv == -1 && errno == EINTR)
                        rv = 0;