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))
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 new_found;
}
-unsigned long long min_spare_size_required(struct state *st)
+static int get_min_spare_size_required(struct state *st, unsigned long long *sizep)
{
int fd;
- unsigned long long rv = 0;
if (!st->metadata ||
- !st->metadata->ss->min_acceptable_spare_size)
- return rv;
+ !st->metadata->ss->min_acceptable_spare_size) {
+ *sizep = 0;
+ return 0;
+ }
fd = open(st->devname, O_RDONLY);
if (fd < 0)
- return 0;
- st->metadata->ss->load_super(st->metadata, fd, st->devname);
+ return 1;
+ if (st->metadata->ss->external)
+ st->metadata->ss->load_container(st->metadata, fd, st->devname);
+ else
+ st->metadata->ss->load_super(st->metadata, fd, st->devname);
close(fd);
- rv = st->metadata->ss->min_acceptable_spare_size(st->metadata);
+ if (!st->metadata->sb)
+ return 1;
+ *sizep = st->metadata->ss->min_acceptable_spare_size(st->metadata);
st->metadata->ss->free_super(st->metadata);
- return rv;
-}
-
-static int move_spare(struct state *from, struct state *to,
- dev_t devid,
- struct alert_info *info)
-{
- struct mddev_dev devlist;
- char devname[20];
-
- /* try to remove and add */
- int fd1 = open(to->devname, O_RDONLY);
- int fd2 = open(from->devname, O_RDONLY);
-
- if (fd1 < 0 || fd2 < 0) {
- if (fd1>=0) close(fd1);
- if (fd2>=0) close(fd2);
- return 0;
- }
-
- devlist.next = NULL;
- devlist.used = 0;
- devlist.re_add = 0;
- devlist.writemostly = 0;
- devlist.devname = devname;
- sprintf(devname, "%d:%d", major(devid), minor(devid));
-
- devlist.disposition = 'r';
- if (Manage_subdevs(from->devname, fd2, &devlist, -1, 0, NULL) == 0) {
- devlist.disposition = 'a';
- 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, 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;
}
struct dev_policy *pol;
unsigned long long dev_size;
+ if (to->metadata->ss->external &&
+ test_partition_from_id(from->devid[d]))
+ continue;
+
if (min_size &&
dev_size_from_id(from->devid[d], &dev_size) &&
dev_size < min_size)
static dev_t container_choose_spare(struct state *from, struct state *to,
struct domainlist *domlist,
- unsigned long long min_size)
+ unsigned long long min_size, int active)
{
/* 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;
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;
- }
- if (from == to)
- /* Just checking if destination already has
- * a spare, no need to check policy, we are
- * done.
- */
- break;
-
- 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);
+ if (from == to) {
+ /* We must check if number of active disks has not increased
+ * since ioctl in main loop. mdmon may have added spare
+ * to subarray. If so we do not need to look for more spares
+ * so return non zero value */
+ int active_cnt = 0;
+ struct mdinfo *dp;
+ list = st->ss->getinfo_super_disks(st);
+ if (!list) {
+ st->ss->free_super(st);
+ return 1;
+ }
+ dp = list->devs;
+ while (dp) {
+ if (dp->disk.state & (1<<MD_DISK_SYNC) &&
+ !(dp->disk.state & (1<<MD_DISK_FAULTY)))
+ active_cnt++;
+ dp = dp->next;
+ }
+ sysfs_free(list);
+ if (active < active_cnt) {
+ /* Spare just activated.*/
+ st->ss->free_super(st);
+ return 1;
}
}
- sysfs_free(disks);
+
+ /* 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);
+ }
+ st->ss->free_super(st);
return dev;
}
struct state *to = st;
unsigned long long min_size;
+ if (to->parent_dev != NoMdDev && !to->parent)
+ /* subarray monitored without parent container
+ * we can't move spares here */
+ continue;
+
if (to->parent)
/* member of a container */
to = to->parent;
- min_size = min_spare_size_required(to);
+ if (get_min_spare_size_required(to, &min_size))
+ continue;
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);
+ to, to, NULL, min_size, st->active);
if (devid > 0)
continue;
}
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, min_size);
+ from, to, domlist, min_size, 0);
else
devid = choose_spare(from, to, domlist,
min_size);
if (devid > 0
- && move_spare(from, to, devid, info))
- break;
+ && move_spare(from->devname, to->devname, devid)) {
+ alert("MoveSpare", to->devname, from->devname, info);
+ break;
+ }
}
domain_free(domlist);
}
projects / thirdparty / mdadm.git / blobdiff