static int check_array(struct state *st, struct mdstat_ent *mdstat,
int test, struct alert_info *info,
int increments);
-static int add_new_arrays(struct mdstat_ent *mdstat, struct state *statelist,
+static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
int test, struct alert_info *info);
static void try_spare_migration(struct state *statelist, struct alert_info *info);
static void link_containers_with_subarrays(struct state *list);
info.mailfrom = mailfrom;
info.dosyslog = dosyslog;
- if (daemonise)
- if (make_daemon(pidfile))
- return 1;
+ if (daemonise) {
+ int rv = make_daemon(pidfile);
+ if (rv >= 0)
+ return rv;
+ }
if (share)
if (check_one_sharer(scan))
/* now check if there are any new devices found in mdstat */
if (scan)
- new_found = add_new_arrays(mdstat, statelist, test,
+ new_found = add_new_arrays(mdstat, &statelist, test,
&info);
/* If an array has active < raid && spare == 0 && spare_group != NULL
static int make_daemon(char *pidfile)
{
+ /* Return:
+ * -1 in the forked daemon
+ * 0 in the parent
+ * 1 on error
+ * so a none-negative becomes the exit code.
+ */
int pid = fork();
if (pid > 0) {
if (!pidfile)
dup2(0,1);
dup2(0,2);
setsid();
- return 0;
+ return -1;
}
static int check_one_sharer(int scan)
return 0;
}
-static int add_new_arrays(struct mdstat_ent *mdstat, struct state *statelist,
+static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
int test, struct alert_info *info)
{
struct mdstat_ent *mse;
continue;
}
close(fd);
- st->next = statelist;
+ st->next = *statelist;
st->err = 1;
st->devnum = mse->devnum;
st->percent = -2;
devname2devnum(mse->metadata_version+10);
else
st->parent_dev = NoMdDev;
- statelist = st;
+ *statelist = st;
if (test)
alert("TestMessage", st->devname, NULL, info);
alert("NewArray", st->devname, NULL, info);
sprintf(devname, "%d:%d", major(devid), minor(devid));
devlist.disposition = 'r';
- if (Manage_subdevs(from->devname, fd2, &devlist, -1, 0) == 0) {
+ if (Manage_subdevs(from->devname, fd2, &devlist, -1, 0, NULL) == 0) {
devlist.disposition = 'a';
- if (Manage_subdevs(to->devname, fd1, &devlist, -1, 0) == 0) {
+ if (Manage_subdevs(to->devname, fd1, &devlist, -1, 0, NULL) == 0) {
alert("MoveSpare", to->devname, from->devname, info);
+ /* make sure we will see newly added spare before next
+ * time through loop
+ */
+ ping_manager(to->devname);
+ ping_manager(from->devname);
close(fd1);
close(fd2);
return 1;
}
- else Manage_subdevs(from->devname, fd2, &devlist, -1, 0);
+ else Manage_subdevs(from->devname, fd2, &devlist, -1, 0, NULL);
}
close(fd1);
close(fd2);
return 0;
}
-static int check_donor(struct state *from, struct state *to,
- struct domainlist *domlist)
+static int check_donor(struct state *from, struct state *to)
{
struct state *sub;
return 0;
if (from->spare <= 0)
return 0;
- if (domlist == NULL)
- return 0;
return 1;
}
static dev_t choose_spare(struct state *from, struct state *to,
- struct domainlist *domlist)
+ struct domainlist *domlist, unsigned long long min_size)
{
int d;
dev_t dev = 0;
- unsigned long long min_size
- = min_spare_size_required(to);
for (d = from->raid; !dev && d < MaxDisks; d++) {
if (from->devid[d] > 0 &&
}
static dev_t container_choose_spare(struct state *from, struct state *to,
- struct domainlist *domlist)
+ struct domainlist *domlist,
+ unsigned long long min_size)
{
/* This is similar to choose_spare, but we cannot trust devstate,
* so we need to read the metadata instead
*/
-
+ struct mdinfo *list;
struct supertype *st = from->metadata;
int fd = open(from->devname, O_RDONLY);
int err;
- struct mdinfo *disks, *d;
- unsigned long long min_size
- = min_spare_size_required(to);
dev_t dev = 0;
if (fd < 0)
return 0;
- if (!st->ss->getinfo_super_disks)
+ if (!st->ss->getinfo_super_disks) {
+ close(fd);
return 0;
+ }
err = st->ss->load_container(st, fd, NULL);
close(fd);
if (err)
return 0;
-
- disks = st->ss->getinfo_super_disks(st);
- st->ss->free_super(st);
-
- if (!disks)
- return 0;
- for (d = disks->devs ; d && !dev ; d = d->next) {
- if (d->disk.state == 0) {
- struct dev_policy *pol;
- unsigned long long dev_size;
- dev = makedev(d->disk.major,d->disk.minor);
-
- if (min_size &&
- dev_size_from_id(dev, &dev_size) &&
- dev_size < min_size) {
- dev = 0;
- continue;
- }
- pol = devnum_policy(dev);
- if (from->spare_group)
- pol_add(&pol, pol_domain,
- from->spare_group, NULL);
- if (!domain_test(domlist, pol, to->metadata->ss->name))
- dev = 0;
-
- dev_policy_free(pol);
- }
+ /* We only need one spare so full list not needed */
+ list = container_choose_spares(st, min_size, domlist, from->spare_group,
+ to->metadata->ss->name, 1);
+ if (list) {
+ struct mdinfo *disks = list->devs;
+ if (disks)
+ dev = makedev(disks->disk.major, disks->disk.minor);
+ sysfs_free(list);
}
- sysfs_free(disks);
+ st->ss->free_super(st);
return dev;
}
struct domainlist *domlist = NULL;
int d;
struct state *to = st;
+ unsigned long long min_size;
if (to->parent)
/* member of a container */
to = to->parent;
+ min_size = min_spare_size_required(to);
+ if (to->metadata->ss->external) {
+ /* We must make sure there is
+ * no suitable spare in container already.
+ * If there is we don't add more */
+ dev_t devid = container_choose_spare(
+ to, to, NULL, min_size);
+ if (devid > 0)
+ continue;
+ }
for (d = 0; d < MaxDisks; d++)
if (to->devid[d])
domainlist_add_dev(&domlist,
to->metadata->ss->name);
if (to->spare_group)
domain_add(&domlist, to->spare_group);
-
+ /*
+ * No spare migration if the destination
+ * has no domain. Skip this array.
+ */
+ if (!domlist)
+ continue;
for (from=statelist ; from ; from=from->next) {
dev_t devid;
- if (!check_donor(from, to, domlist))
+ if (!check_donor(from, to))
continue;
if (from->metadata->ss->external)
devid = container_choose_spare(
- from, to, domlist);
+ from, to, domlist, min_size);
else
- devid = choose_spare(from, to, domlist);
+ devid = choose_spare(from, to, domlist,
+ min_size);
if (devid > 0
&& move_spare(from, to, devid, info))
break;
projects / thirdparty / mdadm.git / blobdiff