]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - msg.c
Manage: Add support for --re-add faulty
[thirdparty/mdadm.git] / msg.c
diff --git a/msg.c b/msg.c
index 5ddf6e36fa3fc748f6e904a2ac4f9bb93c8d76fd..70cefe8f1e44c84d1bb8b9cfe42fac9baab4d6d7 100644 (file)
--- a/msg.c
+++ b/msg.c
@@ -106,9 +106,7 @@ int receive_message(int fd, struct metadata_update *msg, int tmo)
        if (rv < 0 || len > MSG_MAX_LEN)
                return -1;
        if (len > 0) {
-               msg->buf = malloc(len);
-               if (msg->buf == NULL)
-                       return -1;
+               msg->buf = xmalloc(len);
                rv = recv_buf(fd, msg->buf, len, tmo);
                if (rv < 0) {
                        free(msg->buf);
@@ -207,9 +205,28 @@ int fping_monitor(int sfd)
 int ping_monitor(char *devname)
 {
        int sfd = connect_monitor(devname);
-       int err = fping_monitor(sfd);
+       int err;
+
+       if (sfd >= 0) {
+               err = fping_monitor(sfd);
+               close(sfd);
+       } else
+               err = -1;
+
+       return err;
+}
+
+/* ping monitor using device number */
+int ping_monitor_by_id(int devnum)
+{
+       int err = -1;
+       char *container = devnum2devname(devnum);
+
+       if (container) {
+               err = ping_monitor(container);
+               free(container);
+       }
 
-       close(sfd);
        return err;
 }
 
@@ -235,7 +252,7 @@ static char *ping_monitor_version(char *devname)
        return msg.buf;
 }
 
-static int unblock_subarray(struct mdinfo *sra, const int unfreeze)
+int unblock_subarray(struct mdinfo *sra, const int unfreeze)
 {
        char buf[64];
        int rc = 0;
@@ -255,6 +272,51 @@ static int unblock_subarray(struct mdinfo *sra, const int unfreeze)
        return rc;
 }
 
+int block_subarray(struct mdinfo *sra)
+{
+       char buf[64];
+       int rc = 0;
+
+       sprintf(buf, "external:%s\n", sra->text_version);
+       buf[9] = '-';
+       if (sysfs_set_str(sra, NULL, "metadata_version", buf))
+               rc = -1;
+
+       return rc;
+}
+
+/* check mdmon version if it supports
+ * array blocking mechanism
+ */
+int check_mdmon_version(char *container)
+{
+       char *version = NULL;
+       int devnum = devname2devnum(container);
+
+       if (!mdmon_running(devnum)) {
+               /* if mdmon is not active we assume that any instance that is
+                * later started will match the current mdadm version, if this
+                * assumption is violated we may inadvertantly rebuild an array
+                * that was meant for reshape, or start rebuild on a spare that
+                * was to be moved to another container
+                */
+               /* pass */;
+       } else {
+               int ver;
+
+               version = ping_monitor_version(container);
+               ver = version ? mdadm_version(version) : -1;
+               free(version);
+               if (ver < 3002000) {
+                       pr_err("mdmon instance for %s cannot be disabled\n",
+                              container);
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
 /**
  * block_monitor - prevent mdmon spare assignment
  * @container - container to block
@@ -276,39 +338,17 @@ static int unblock_subarray(struct mdinfo *sra, const int unfreeze)
  */
 int block_monitor(char *container, const int freeze)
 {
-       int devnum = devname2devnum(container);
        struct mdstat_ent *ent, *e, *e2;
        struct mdinfo *sra = NULL;
-       char *version = NULL;
        char buf[64];
        int rv = 0;
 
-       if (!mdmon_running(devnum)) {
-               /* if mdmon is not active we assume that any instance that is
-                * later started will match the current mdadm version, if this
-                * assumption is violated we may inadvertantly rebuild an array
-                * that was meant for reshape, or start rebuild on a spare that
-                * was to be moved to another container
-                */
-               /* pass */;
-       } else {
-               int ver;
-
-               version = ping_monitor_version(container);
-               ver = version ? mdadm_version(version) : -1;
-               free(version);
-               if (ver < 3002000) {
-                       fprintf(stderr, Name
-                               ": mdmon instance for %s cannot be disabled\n",
-                               container);
-                       return -1;
-               }
-       }
+       if (check_mdmon_version(container))
+               return -1;
 
        ent = mdstat_read(0, 0);
        if (!ent) {
-               fprintf(stderr, Name
-                       ": failed to read /proc/mdstat while disabling mdmon\n");
+               pr_err("failed to read /proc/mdstat while disabling mdmon\n");
                return -1;
        }
 
@@ -319,9 +359,8 @@ int block_monitor(char *container, const int freeze)
                sysfs_free(sra);
                sra = sysfs_read(-1, e->devnum, GET_VERSION);
                if (!sra) {
-                       fprintf(stderr, Name
-                               ": failed to read sysfs for subarray%s\n",
-                               to_subarray(e, container));
+                       pr_err("failed to read sysfs for subarray%s\n",
+                              to_subarray(e, container));
                        break;
                }
                /* can't reshape an array that we can't monitor */
@@ -334,9 +373,7 @@ int block_monitor(char *container, const int freeze)
                 * takeover in reshape case and spare reassignment in the
                 * auto-rebuild case)
                 */
-               sprintf(buf, "external:%s\n", sra->text_version);
-               buf[9] = '-';
-               if (sysfs_set_str(sra, NULL, "metadata_version", buf))
+               if (block_subarray(sra))
                        break;
                ping_monitor(container);
 
@@ -348,12 +385,23 @@ int block_monitor(char *container, const int freeze)
                     sysfs_get_str(sra, NULL, "sync_action", buf, 20) > 0 &&
                     strcmp(buf, "frozen\n") == 0))
                        /* pass */;
-               else
+               else {
+                       unblock_subarray(sra, 0);
                        break;
+               }
+               /* Double check against races - there should be no spares
+                * or part-spares
+                */
+               sysfs_free(sra);
+               sra = sysfs_read(-1, e->devnum, GET_DEVS | GET_STATE);
+               if (sra && sra->array.spare_disks > 0) {
+                       unblock_subarray(sra, freeze);
+                       break;
+               }
        }
 
        if (e) {
-               fprintf(stderr, Name ": failed to freeze subarray%s\n",
+               pr_err("failed to freeze subarray%s\n",
                        to_subarray(e, container));
 
                /* thaw the partially frozen container */
@@ -363,7 +411,7 @@ int block_monitor(char *container, const int freeze)
                        sysfs_free(sra);
                        sra = sysfs_read(-1, e2->devnum, GET_VERSION);
                        if (unblock_subarray(sra, freeze))
-                               fprintf(stderr, Name ": Failed to unfreeze %s\n", e2->dev);
+                               pr_err("Failed to unfreeze %s\n", e2->dev);
                }
 
                ping_monitor(container); /* cleared frozen */
@@ -372,7 +420,6 @@ int block_monitor(char *container, const int freeze)
 
        sysfs_free(sra);
        free_mdstat(ent);
-       free(container);
 
        return rv;
 }
@@ -381,11 +428,11 @@ void unblock_monitor(char *container, const int unfreeze)
 {
        struct mdstat_ent *ent, *e;
        struct mdinfo *sra = NULL;
+       int to_ping = 0;
 
        ent = mdstat_read(0, 0);
        if (!ent) {
-               fprintf(stderr, Name
-                       ": failed to read /proc/mdstat while unblocking container\n");
+               pr_err("failed to read /proc/mdstat while unblocking container\n");
                return;
        }
 
@@ -394,11 +441,16 @@ void unblock_monitor(char *container, const int unfreeze)
                if (!is_container_member(e, container))
                        continue;
                sysfs_free(sra);
-               sra = sysfs_read(-1, e->devnum, GET_VERSION);
+               sra = sysfs_read(-1, e->devnum, GET_VERSION|GET_LEVEL);
+               if (!sra)
+                       continue;
+               if (sra->array.level > 0)
+                       to_ping++;
                if (unblock_subarray(sra, unfreeze))
-                       fprintf(stderr, Name ": Failed to unfreeze %s\n", e->dev);
+                       pr_err("Failed to unfreeze %s\n", e->dev);
        }
-       ping_monitor(container);
+       if (to_ping)
+               ping_monitor(container);
 
        sysfs_free(sra);
        free_mdstat(ent);
@@ -429,3 +481,13 @@ int ping_manager(char *devname)
        close(sfd);
        return err;
 }
+
+/* using takeover operation for grow purposes, mdadm has to be sure
+ * that mdmon processes all updates, and if necessary it will be closed
+ * at takeover to raid0 operation
+  */
+void flush_mdmon(char *container)
+{
+       ping_manager(container);
+       ping_monitor(container);
+}