X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=msg.c;h=c66b0a130e3fb7c719913b8121b476ea0a96dd02;hb=20dc76d15b40c17b4ccdc3d6283af8ecb513707f;hp=7bd85f8154477a6d009ab2bcd9fec9833fa11ab6;hpb=885f984583a08bd64ea0e3e04abc0712828a1276;p=thirdparty%2Fmdadm.git diff --git a/msg.c b/msg.c index 7bd85f81..c66b0a13 100644 --- a/msg.c +++ b/msg.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2008 Intel Corporation * - * mdmon socket / message handling + * mdmon socket / message handling * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -78,7 +78,6 @@ static int recv_buf(int fd, void* buf, int len, int tmo) return 0; } - int send_message(int fd, struct metadata_update *msg, int tmo) { __s32 len = msg->len; @@ -106,9 +105,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); @@ -173,7 +170,9 @@ int connect_monitor(char *devname) addr.sun_family = PF_LOCAL; strcpy(addr.sun_path, path); - if (connect(sfd, &addr, sizeof(addr)) < 0) { + if (connect(sfd, (struct sockaddr*)&addr, sizeof(addr)) < 0) { + pr_err("Error connecting monitor with %s: %s\n", + addr.sun_path, strerror(errno)); close(sfd); return -1; } @@ -207,9 +206,14 @@ 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; - close(sfd); return err; } @@ -235,7 +239,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 +259,50 @@ 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; + + if (!mdmon_running(container)) { + /* 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 +324,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; } @@ -317,11 +343,10 @@ int block_monitor(char *container, const int freeze) if (!is_container_member(e, container)) continue; sysfs_free(sra); - sra = sysfs_read(-1, e->devnum, GET_VERSION); + sra = sysfs_read(-1, e->devnm, 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 +359,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); @@ -356,7 +379,7 @@ int block_monitor(char *container, const int freeze) * or part-spares */ sysfs_free(sra); - sra = sysfs_read(-1, e->devnum, GET_DEVS | GET_STATE); + sra = sysfs_read(-1, e->devnm, GET_DEVS | GET_STATE); if (sra && sra->array.spare_disks > 0) { unblock_subarray(sra, freeze); break; @@ -364,7 +387,7 @@ int block_monitor(char *container, const int freeze) } 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 */ @@ -372,9 +395,9 @@ int block_monitor(char *container, const int freeze) if (!is_container_member(e2, container)) continue; sysfs_free(sra); - sra = sysfs_read(-1, e2->devnum, GET_VERSION); + sra = sysfs_read(-1, e2->devnm, 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->devnm); } ping_monitor(container); /* cleared frozen */ @@ -383,7 +406,6 @@ int block_monitor(char *container, const int freeze) sysfs_free(sra); free_mdstat(ent); - free(container); return rv; } @@ -396,8 +418,7 @@ void unblock_monitor(char *container, const int unfreeze) 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; } @@ -406,11 +427,13 @@ 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|GET_LEVEL); + sra = sysfs_read(-1, e->devnm, 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->devnm); } if (to_ping) ping_monitor(container); @@ -419,8 +442,6 @@ void unblock_monitor(char *container, const int unfreeze) free_mdstat(ent); } - - /* give the manager a chance to view the updated container state. This * would naturally happen due to the manager noticing a change in * /proc/mdstat; however, pinging encourages this detection to happen @@ -444,3 +465,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); +}