Make sure resync_start is initialised properly and maintained properly

[thirdparty/mdadm.git] / monitor.c

diff --git a/monitor.c b/monitor.c
index 0d85d32f2bb3a12151d8ccd7ff520cc498e87715..314889657aaae88629241ab4ae69d80b4832284a 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1,7 +1,7 @@
 
 #include "mdadm.h"
 #include "mdmon.h"
-
+#include <sys/syscall.h>
 #include <sys/select.h>
 #include <signal.h>
 
@@ -48,7 +48,7 @@ static int read_attr(char *buf, int len, int fd)
 }
 
 
-static int get_resync_start(struct active_array *a)
+int get_resync_start(struct active_array *a)
 {
        char buf[30];
        int n;
@@ -138,7 +138,9 @@ int read_dev_state(int fd)
 
 static void signal_manager(void)
 {
-       kill(getpid(), SIGUSR1);
+       /* tgkill(getpid(), mon_tid, SIGUSR1); */
+       int pid = getpid();
+       syscall(SYS_tgkill, pid, mgr_tid, SIGUSR1);
 }
 
 /* Monitor a set of active md arrays - all of which share the
@@ -240,7 +242,7 @@ static int read_and_act(struct active_array *a)
                 * readonly ???
                 */
                get_resync_start(a);
-               printf("Found a readonly array at %llu\n", a->resync_start);
+//             printf("Found a readonly array at %llu\n", a->resync_start);
                if (a->resync_start == ~0ULL)
                        a->next_state = read_auto; /* array is clean */
                else {
@@ -249,7 +251,8 @@ static int read_and_act(struct active_array *a)
                }
        }
 
-       if (a->curr_action == idle &&
+       if (!deactivate &&
+           a->curr_action == idle &&
            a->prev_action == resync) {
                /* A resync has finished.  The endpoint is recorded in
                 * 'sync_start'.  We don't update the metadata
@@ -261,14 +264,19 @@ static int read_and_act(struct active_array *a)
                check_degraded = 1;
        }
 
-       if (a->curr_action == idle &&
+       if (!deactivate &&
+           a->curr_action == idle &&
            a->prev_action == recover) {
+               /* A recovery has finished.  Some disks may be in sync now,
+                * and the array may no longer be degraded
+                */
                for (mdi = a->info.devs ; mdi ; mdi = mdi->next) {
                        a->container->ss->set_disk(a, mdi->disk.raid_disk,
                                                   mdi->curr_state);
                        if (! (mdi->curr_state & DS_INSYNC))
                                check_degraded = 1;
                }
+               a->container->ss->set_array_state(a, 0);
        }
 
        for (mdi = a->info.devs ; mdi ; mdi = mdi->next) {
@@ -367,16 +375,6 @@ static void reconcile_failed(struct active_array *aa, struct mdinfo *failed)
        }
 }
 
-static int handle_pipe(struct md_generic_cmd *cmd, struct active_array *aa)
-{
-       switch (cmd->action) {
-       case md_action_ping_monitor:
-               return 0;
-       }
-
-       return -1;
-}
-
 #ifdef DEBUG
 static void dprint_wake_reasons(fd_set *fds)
 {
@@ -407,8 +405,7 @@ static void dprint_wake_reasons(fd_set *fds)
 }
 #endif
 
-static int wait_and_act(struct supertype *container, int pfd,
-                       int nowait)
+static int wait_and_act(struct supertype *container, int nowait)
 {
        fd_set rfds;
        int maxfd = 0;
@@ -419,7 +416,6 @@ static int wait_and_act(struct supertype *container, int pfd,
 
        FD_ZERO(&rfds);
 
-       add_fd(&rfds, &maxfd, pfd);
        for (ap = aap ; *ap ;) {
                a = *ap;
                /* once an array has been deactivated we want to
@@ -455,29 +451,24 @@ static int wait_and_act(struct supertype *container, int pfd,
                if (fd >= 0 || errno != EBUSY) {
                        /* OK, we are safe to leave */
                        dprintf("no arrays to monitor... exiting\n");
+                       remove_pidfile(container->devname);
                        exit_now = 1;
                        signal_manager();
-                       remove_pidfile(container->devname);
                        exit(0);
                }
        }
 
        if (!nowait) {
-               rv = select(maxfd+1, &rfds, NULL, NULL, NULL);
-
+               sigset_t set;
+               sigprocmask(SIG_UNBLOCK, NULL, &set);
+               sigdelset(&set, SIGUSR1);
+               rv = pselect(maxfd+1, &rfds, NULL, NULL, NULL, &set);
+               if (rv == -1 && errno == EINTR)
+                       rv = 0;
                #ifdef DEBUG
                dprint_wake_reasons(&rfds);
                #endif
 
-               if (rv <= 0)
-                       return rv;
-
-               if (FD_ISSET(pfd, &rfds)) {
-                       int err = -1;
-
-                       if (read(pfd, &err, 1) > 0)
-                               err = handle_pipe(active_cmd, *aap);
-               }
        }
 
        if (update_queue) {
@@ -526,8 +517,7 @@ void do_monitor(struct supertype *container)
        int rv;
        int first = 1;
        do {
-               rv = wait_and_act(container, container->mgr_pipe[0],
-                                 first);
+               rv = wait_and_act(container, first);
                first = 0;
        } while (rv >= 0);
 }