X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=managemon.c;h=454c39dc7e4193d52e48c149689604d9997ca7f1;hb=63b4aae33ebf00d443378daf313622630f2336c0;hp=5f0a61b5ce106f56d44404ae08b7347f29a1a36f;hpb=04a8ac089c1d295c59380419c927d2bc49f33454;p=thirdparty%2Fmdadm.git diff --git a/managemon.c b/managemon.c index 5f0a61b5..454c39dc 100644 --- a/managemon.c +++ b/managemon.c @@ -1,8 +1,8 @@ /* * mdmon - monitor external metadata arrays * - * Copyright (C) 2007-2008 Neil Brown - * Copyright (C) 2007-2008 Intel Corporation + * Copyright (C) 2007-2009 Neil Brown + * 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, @@ -112,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); @@ -209,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; @@ -241,7 +249,9 @@ static void add_disk_to_container(struct supertype *st, struct mdinfo *sd) { 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, @@ -261,6 +271,25 @@ static void add_disk_to_container(struct supertype *st, struct mdinfo *sd) if (dfd < 0) return; + /* Check the metadata and see if it is already part of this + * array + */ + 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); @@ -332,6 +361,23 @@ static void manage_container(struct mdstat_ent *mdstat, } } +static int disk_init_and_add(struct mdinfo *disk, struct mdinfo *clone, + struct active_array *aa) +{ + if (!disk || !clone) + return -1; + + *disk = *clone; + disk->recovery_fd = sysfs_open(aa->devnum, disk->sys_name, "recovery_start"); + disk->state_fd = sysfs_open(aa->devnum, disk->sys_name, "state"); + disk->prev_state = read_dev_state(disk->state_fd); + disk->curr_state = disk->prev_state; + disk->next = aa->info.devs; + aa->info.devs = disk; + + return 0; +} + static void manage_member(struct mdstat_ent *mdstat, struct active_array *a) { @@ -355,8 +401,9 @@ 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; + struct mdinfo *d; a->check_degraded = 0; @@ -364,34 +411,39 @@ static void manage_member(struct mdstat_ent *mdstat, * 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 = malloc(sizeof(*newd)); - *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; + 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", "recover"); + disk_init_and_add(newd, d, newa); + } + 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); } } @@ -471,16 +523,7 @@ static void manage_new(struct mdstat_ent *mdstat, if (i == di->disk.raid_disk) break; - if (di && newd) { - memcpy(newd, di, sizeof(*newd)); - - newd->state_fd = sysfs_open(new->devnum, - newd->sys_name, - "state"); - - newd->prev_state = read_dev_state(newd->state_fd); - newd->curr_state = newd->prev_state; - } else { + if (disk_init_and_add(newd, di, new) != 0) { if (newd) free(newd); @@ -490,18 +533,13 @@ static void manage_new(struct mdstat_ent *mdstat, 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->metadata_fd = sysfs_open(new->devnum, NULL, "metadata_version"); - get_resync_start(new); dprintf("%s: inst: %d action: %d state: %d\n", __func__, atoi(inst), new->action_fd, new->info.state_fd); @@ -633,14 +671,10 @@ 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 { @@ -658,15 +692,6 @@ void do_manager(struct supertype *container) read_sock(container); - if (container->sock < 0 || socket_hup_requested) { - 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(); @@ -678,12 +703,9 @@ void do_manager(struct supertype *container) 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 (update_queue == NULL) + 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);