X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=managemon.c;h=e3350778b9fcb0381b052588c8afac62221492fe;hp=94fbcb2ce67c519b212de1685a286c943cfff691;hb=2904b26f059c5d82d9d631c9987e92e3f9af498c;hpb=272bcc48d18b6f8dd89f3181b166e1fabfbd5b7b

diff --git a/managemon.c b/managemon.c
index 94fbcb2c..e3350778 100644
--- a/managemon.c
+++ b/managemon.c
@@ -1,3 +1,22 @@
+/*
+ * mdmon - monitor external metadata arrays
+ *
+ * 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,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 /*
  * The management thread for monitoring active md arrays.
@@ -93,8 +112,10 @@ static void close_aa(struct active_array *aa)
 {
 	struct mdinfo *d;
 
-	for (d = aa->info.devs; d; d = d->next)
+	for (d = aa->info.devs; d; d = d->next) {
+		close(d->recovery_fd);
 		close(d->state_fd);
+	}
 
 	close(aa->action_fd);
 	close(aa->info.state_fd);
@@ -190,16 +211,22 @@ struct metadata_update *update_queue = NULL;
 struct metadata_update *update_queue_handled = NULL;
 struct metadata_update *update_queue_pending = NULL;
 
-void check_update_queue(struct supertype *container)
+static void free_updates(struct metadata_update **update)
 {
-	while (update_queue_handled) {
-		struct metadata_update *this = update_queue_handled;
-		update_queue_handled = this->next;
+	while (*update) {
+		struct metadata_update *this = *update;
+
+		*update = this->next;
 		free(this->buf);
-		if (this->space)
-			free(this->space);
+		free(this->space);
 		free(this);
 	}
+}
+
+void check_update_queue(struct supertype *container)
+{
+	free_updates(&update_queue_handled);
+
 	if (update_queue == NULL &&
 	    update_queue_pending) {
 		update_queue = update_queue_pending;
@@ -218,13 +245,56 @@ static void queue_metadata_update(struct metadata_update *mu)
 	*qp = mu;
 }
 
-void wait_update_handled(void)
+static void add_disk_to_container(struct supertype *st, struct mdinfo *sd)
 {
-	/* Wait for any pending update to be handled by monitor.
-	 * i.e. wait until update_queue is NULL
+	int dfd;
+	char nm[20];
+	struct supertype *st2;
+	struct metadata_update *update = NULL;
+	struct mdinfo info;
+	mdu_disk_info_t dk = {
+		.number = -1,
+		.major = sd->disk.major,
+		.minor = sd->disk.minor,
+		.raid_disk = -1,
+		.state = 0,
+	};
+
+	dprintf("%s: add %d:%d to container\n",
+		__func__, sd->disk.major, sd->disk.minor);
+
+	sd->next = st->devs;
+	st->devs = sd;
+
+	sprintf(nm, "%d:%d", sd->disk.major, sd->disk.minor);
+	dfd = dev_open(nm, O_RDWR);
+	if (dfd < 0)
+		return;
+
+	/* Check the metadata and see if it is already part of this
+	 * array
 	 */
-	while (update_queue)
-		usleep(100 * 1000);
+	st2 = dup_super(st);
+	if (st2->ss->load_super(st2, dfd, NULL) == 0) {
+		st2->ss->getinfo_super(st, &info);
+		if (st->ss->compare_super(st, st2) == 0 &&
+		    info.disk.raid_disk >= 0) {
+			/* Looks like a good member of array.
+			 * Just accept it.
+			 * mdadm will incorporate any parts into
+			 * active arrays.
+			 */
+			st2->ss->free_super(st2);
+			return;
+		}
+	}
+	st2->ss->free_super(st2);
+
+	st->update_tail = &update;
+	st->ss->add_to_super(st, &dk, dfd, NULL);
+	st->ss->write_init_super(st);
+	queue_metadata_update(update);
+	st->update_tail = NULL;
 }
 
 static void manage_container(struct mdstat_ent *mdstat,
@@ -237,12 +307,56 @@ static void manage_container(struct mdstat_ent *mdstat,
 	 * about spare assignment.... probably not.
 	 */
 	if (mdstat->devcnt != container->devcnt) {
+		struct mdinfo **cdp, *cd, *di, *mdi;
+		int found;
+
 		/* read /sys/block/NAME/md/dev-??/block/dev to find out
 		 * what is there, and compare with container->info.devs
 		 * To see what is removed and what is added.
 		 * These need to be remove from, or added to, the array
 		 */
-		// FIXME
+		mdi = sysfs_read(-1, mdstat->devnum, GET_DEVS|SKIP_GONE_DEVS);
+		if (!mdi) {
+			/* invalidate the current count so we can try again */
+			container->devcnt = -1;
+			return;
+		}
+
+		/* check for removals */
+		for (cdp = &container->devs; *cdp; ) {
+			found = 0;
+			for (di = mdi->devs; di; di = di->next)
+				if (di->disk.major == (*cdp)->disk.major &&
+				    di->disk.minor == (*cdp)->disk.minor) {
+					found = 1;
+					break;
+				}
+			if (!found) {
+				cd = *cdp;
+				*cdp = (*cdp)->next;
+				free(cd);
+			} else
+				cdp = &(*cdp)->next;
+		}
+
+		/* check for additions */
+		for (di = mdi->devs; di; di = di->next) {
+			for (cd = container->devs; cd; cd = cd->next)
+				if (di->disk.major == cd->disk.major &&
+				    di->disk.minor == cd->disk.minor)
+					break;
+			if (!cd) {
+				struct mdinfo *newd = malloc(sizeof(*newd));
+
+				if (!newd) {
+					container->devcnt = -1;
+					continue;
+				}
+				*newd = *di;
+				add_disk_to_container(container, newd);
+			}
+		}
+		sysfs_free(mdi);
 		container->devcnt = mdstat->devcnt;
 	}
 }
@@ -270,42 +384,80 @@ static void manage_member(struct mdstat_ent *mdstat,
 
 	if (a->check_degraded) {
 		struct metadata_update *updates = NULL;
-		struct mdinfo *newdev;
+		struct mdinfo *newdev = NULL;
 		struct active_array *newa;
-		wait_update_handled();
+		struct mdinfo *d;
+
 		a->check_degraded = 0;
 
 		/* The array may not be degraded, this is just a good time
 		 * to check.
 		 */
 		newdev = a->container->ss->activate_spare(a, &updates);
-		if (newdev) {
-			struct mdinfo *d;
-			/* Cool, we can add a device or several. */
-			newa = duplicate_aa(a);
-			/* suspend recovery - maybe not needed */
-
-			/* Add device to array and set offset/size/slot.
-			 * and open files for each newdev */
-			for (d = newdev; d ; d = d->next) {
-				struct mdinfo *newd;
-				if (sysfs_add_disk(&newa->info, d) < 0)
-					continue;
-				newd = newa->info.devs;
-				newd->state_fd = sysfs_open(a->devnum,
-							    newd->sys_name,
-							    "state");
-				newd->prev_state
-					= read_dev_state(newd->state_fd);
-				newd->curr_state = newd->prev_state;
+		if (!newdev)
+			return;
+
+		newa = duplicate_aa(a);
+		if (!newa)
+			goto out;
+		/* Cool, we can add a device or several. */
+
+		/* Add device to array and set offset/size/slot.
+		 * and open files for each newdev */
+		for (d = newdev; d ; d = d->next) {
+			struct mdinfo *newd;
+
+			newd = malloc(sizeof(*newd));
+			if (!newd)
+				continue;
+			if (sysfs_add_disk(&newa->info, d, 0) < 0) {
+				free(newd);
+				continue;
 			}
-			queue_metadata_update(updates);
-			replace_array(a->container, a, newa);
-			sysfs_set_str(&a->info, NULL, "sync_action", "repair");
+			*newd = *d;
+			newd->next = newa->info.devs;
+			newa->info.devs = newd;
+
+			newd->state_fd = sysfs_open(a->devnum, newd->sys_name,
+						    "state");
+			newd->prev_state = read_dev_state(newd->state_fd);
+			newd->curr_state = newd->prev_state;
+		}
+		queue_metadata_update(updates);
+		updates = NULL;
+		replace_array(a->container, a, newa);
+		sysfs_set_str(&a->info, NULL, "sync_action", "recover");
+ out:
+		while (newdev) {
+			d = newdev->next;
+			free(newdev);
+			newdev = d;
 		}
+		free_updates(&updates);
 	}
 }
 
+static int aa_ready(struct active_array *aa)
+{
+	struct mdinfo *d;
+	int level = aa->info.array.level;
+
+	for (d = aa->info.devs; d; d = d->next)
+		if (d->state_fd < 0)
+			return 0;
+
+	if (aa->info.state_fd < 0)
+		return 0;
+
+	if (level > 0 && (aa->action_fd < 0 || aa->resync_start_fd < 0))
+		return 0;
+
+	if (!aa->container)
+		return 0;
+
+	return 1;
+}
+
 static void manage_new(struct mdstat_ent *mdstat,
 		       struct supertype *container,
 		       struct active_array *victim)
@@ -320,9 +472,25 @@ static void manage_new(struct mdstat_ent *mdstat,
 	struct mdinfo *mdi, *di;
 	char *inst;
 	int i;
+	int failed = 0;
+
+	/* check if array is ready to be monitored */
+	if (!mdstat->active)
+		return;
+
+	mdi = sysfs_read(-1, mdstat->devnum,
+			 GET_LEVEL|GET_CHUNK|GET_DISKS|GET_COMPONENT|
+			 GET_DEGRADED|GET_DEVS|GET_OFFSET|GET_SIZE|GET_STATE);
 
 	new = malloc(sizeof(*new));
 
+	if (!new || !mdi) {
+		if (mdi)
+			sysfs_free(mdi);
+		if (new)
+			free(new);
+		return;
+	}
 	memset(new, 0, sizeof(*new));
 
 	new->devnum = mdstat->devnum;
@@ -335,18 +503,6 @@ static void manage_new(struct mdstat_ent *mdstat,
 
 	inst = &mdstat->metadata_version[10+strlen(container->devname)+1];
 
-	mdi = sysfs_read(-1, new->devnum,
-			 GET_LEVEL|GET_CHUNK|GET_DISKS|GET_COMPONENT|
-			 GET_DEVS|GET_OFFSET|GET_SIZE|GET_STATE);
-	if (!mdi) {
-		/* Eeek. Cannot monitor this array.
-		 * Mark it to be ignored by setting container to NULL
-		 */
-		new->container = NULL;
-		replace_array(container, victim, new);
-		return;
-	}
-
 	new->info.array = mdi->array;
 	new->info.component_size = mdi->component_size;
 
@@ -357,42 +513,59 @@ static void manage_new(struct mdstat_ent *mdstat,
 			if (i == di->disk.raid_disk)
 				break;
 
-		if (di) {
+		if (di && newd) {
 			memcpy(newd, di, sizeof(*newd));
 
 			newd->state_fd = sysfs_open(new->devnum,
 						    newd->sys_name,
 						    "state");
+			newd->recovery_fd = sysfs_open(new->devnum,
+						      newd->sys_name,
+						      "recovery_start");
 
 			newd->prev_state = read_dev_state(newd->state_fd);
 			newd->curr_state = newd->prev_state;
 		} else {
-			newd->state_fd = -1;
-			newd->disk.raid_disk = i;
-			newd->prev_state = DS_REMOVE;
-			newd->curr_state = DS_REMOVE;
+			if (newd)
+				free(newd);
+
+			failed++;
+			if (failed > new->info.array.failed_disks) {
+				/* we cannot properly monitor without all working disks */
+				new->container = NULL;
+				break;
+			}
+			continue;
 		}
 		sprintf(newd->sys_name, "rd%d", i);
 		newd->next = new->info.devs;
 		new->info.devs = newd;
 	}
+
 	new->action_fd = sysfs_open(new->devnum, NULL, "sync_action");
 	new->info.state_fd = sysfs_open(new->devnum, NULL, "array_state");
 	new->resync_start_fd = sysfs_open(new->devnum, NULL, "resync_start");
-	new->resync_start = 0;
+	new->metadata_fd = sysfs_open(new->devnum, NULL, "metadata_version");
 	dprintf("%s: inst: %d action: %d state: %d\n", __func__, atoi(inst),
 		new->action_fd, new->info.state_fd);
 
 	sysfs_free(mdi);
-	// finds and compares.
-	if (container->ss->open_new(container, new, inst) < 0) {
-		// FIXME close all those files
+
+	/* if everything checks out tell the metadata handler we want to
+	 * manage this instance
+	 */
+	if (!aa_ready(new) || container->ss->open_new(container, new, inst) < 0) {
+		fprintf(stderr, "mdmon: failed to monitor %s\n",
+			mdstat->metadata_version);
 		new->container = NULL;
+		free_aa(new);
+	} else {
 		replace_array(container, victim, new);
-		return;
+		if (failed) {
+			new->check_degraded = 1;
+			manage_member(mdstat, new);
+		}
 	}
-	replace_array(container, victim, new);
-	return;
 }
 
 void manage(struct mdstat_ent *mdstat, struct supertype *container)
@@ -408,12 +581,7 @@ void manage(struct mdstat_ent *mdstat, struct supertype *container)
 			manage_container(mdstat, container);
 			continue;
 		}
-		if (mdstat->metadata_version == NULL ||
-		    strncmp(mdstat->metadata_version, "external:/", 10) != 0 ||
-		    strncmp(mdstat->metadata_version+10, container->devname,
-			    strlen(container->devname)) != 0 ||
-		    mdstat->metadata_version[10+strlen(container->devname)]
-		      != '/')
+		if (!is_container_member(mdstat, container->devname))
 			/* Not for this array */
 			continue;
 		/* Looks like a member of this container */
@@ -435,9 +603,30 @@ static void handle_message(struct supertype *container, struct metadata_update *
 
 	struct metadata_update *mu;
 
-	if (msg->len == 0) {
-		wait_update_handled();
-	} else {
+	if (msg->len <= 0)
+		while (update_queue_pending || update_queue) {
+			check_update_queue(container);
+			usleep(15*1000);
+		}
+
+	if (msg->len == 0) { /* ping_monitor */
+		int cnt;
+		
+		cnt = monitor_loop_cnt;
+		if (cnt & 1)
+			cnt += 2; /* wait until next pselect */
+		else
+			cnt += 3; /* wait for 2 pselects */
+		wakeup_monitor();
+
+		while (monitor_loop_cnt - cnt < 0)
+			usleep(10 * 1000);
+	} else if (msg->len == -1) { /* ping_manager */
+		struct mdstat_ent *mdstat = mdstat_read(1, 0);
+
+		manage(mdstat, container);
+		free_mdstat(mdstat);
+	} else if (!sigterm) {
 		mu = malloc(sizeof(*mu));
 		mu->len = msg->len;
 		mu->buf = msg->buf;
@@ -488,29 +677,64 @@ void do_manager(struct supertype *container)
 {
 	struct mdstat_ent *mdstat;
 	sigset_t set;
+	int proc_fd;
 
 	sigprocmask(SIG_UNBLOCK, NULL, &set);
 	sigdelset(&set, SIGUSR1);
+	sigdelset(&set, SIGHUP);
+	sigdelset(&set, SIGALRM);
+	sigdelset(&set, SIGTERM);
+	proc_fd = open("/proc/mounts", O_RDONLY);
 
 	do {
 
 		if (exit_now)
 			exit(0);
 
-		mdstat = mdstat_read(1, 0);
-
-		manage(mdstat, container);
-
-		read_sock(container);
-
-		free_mdstat(mdstat);
+		/* Can only 'manage' things if 'monitor' is not making
+		 * structural changes to metadata, so need to check
+		 * update_queue
+		 */
+		if (update_queue == NULL) {
+			mdstat = mdstat_read(1, 0);
+
+			manage(mdstat, container);
+
+			read_sock(container);
+
+			if (container->sock < 0 || socket_hup_requested) {
+				/* If this fails, we hope it already exists
+				 * pid file lives in /var/run/mdadm/mdXX.pid
+				 */
+				mkdir("/var", 0600);
+				mkdir("/var/run", 0600);
+				mkdir("/var/run/mdadm", 0600);
+				close(container->sock);
+				container->sock = make_control_sock(container->devname);
+				make_pidfile(container->devname, 0);
+				socket_hup_requested = 0;
+			}
+			if (container->sock < 0)
+				alarm(30);
 
+			free_mdstat(mdstat);
+		}
 		remove_old();
 
 		check_update_queue(container);
 
 		manager_ready = 1;
 
-		mdstat_wait_fd(container->sock, &set);
+		if (sigterm)
+			wakeup_monitor();
+
+		if (update_queue == NULL) {
+			if (container->sock < 0)
+				mdstat_wait_fd(proc_fd, &set);
+			else
+				mdstat_wait_fd(container->sock, &set);
+		} else
+			/* If an update is happening, just wait for signal */
+			pselect(0, NULL, NULL, NULL, NULL, &set);
 	} while(1);
 }