fprintf(stderr, Name ": Monitor using program \"%s\" from config file\n",
alert_cmd);
}
- if (scan && !mailaddr && !alert_cmd) {
+ if (scan && !mailaddr && !alert_cmd && !dosyslog) {
fprintf(stderr, Name ": No mail address or alert command - not monitoring.\n");
return 1;
}
struct stat buf;
fp = fopen("/var/run/mdadm/autorebuild.pid", "r");
if (fp) {
- fscanf(fp, "%d", &pid);
+ if (fscanf(fp, "%d", &pid) != 1)
+ pid = -1;
sprintf(dir, "/proc/%d", pid);
rv = stat(dir, &buf);
if (rv != -1) {
{
int priority;
- if (!info->alert_cmd && !info->mailaddr) {
+ if (!info->alert_cmd && !info->mailaddr && !info->dosyslog) {
time_t now = time(0);
printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");
char *dev = st->devname;
int fd;
int i;
+ int remaining_disks;
+ int last_disk;
if (test)
alert("TestMessage", dev, NULL, ainfo);
}
st->percent = mse->percent;
- for (i=0; i<MaxDisks && i <= array.raid_disks + array.nr_disks;
+ remaining_disks = array.nr_disks;
+ for (i=0; i<MaxDisks && remaining_disks > 0;
i++) {
mdu_disk_info_t disc;
disc.number = i;
info[i].state = disc.state;
info[i].major = disc.major;
info[i].minor = disc.minor;
+ if (disc.major || disc.minor)
+ remaining_disks --;
} else
info[i].major = info[i].minor = 0;
}
+ last_disk = i;
- if (strncmp(mse->metadata_version, "external:", 9) == 0 &&
+ if (mse->metadata_version &&
+ strncmp(mse->metadata_version, "external:", 9) == 0 &&
is_subarray(mse->metadata_version+9))
st->parent_dev =
devname2devnum(mse->metadata_version+10);
int change;
char *dv = NULL;
disc.number = i;
- if (i > array.raid_disks + array.nr_disks) {
+ if (i >= last_disk) {
newstate = 0;
disc.major = disc.minor = 0;
} else if (info[i].major || info[i].minor) {
} else if (mse && mse->pattern && i < (int)strlen(mse->pattern)) {
switch(mse->pattern[i]) {
case 'U': newstate = 6 /* ACTIVE/SYNC */; break;
- case '_': newstate = 0; break;
+ case '_': newstate = 8 /* REMOVED */; break;
}
disc.major = disc.minor = 0;
}
st->devnum = mse->devnum;
st->percent = -2;
st->expected_spares = -1;
- if (strncmp(mse->metadata_version, "external:", 9) == 0 &&
+ if (mse->metadata_version &&
+ strncmp(mse->metadata_version, "external:", 9) == 0 &&
is_subarray(mse->metadata_version+9))
st->parent_dev =
devname2devnum(mse->metadata_version+10);
int fd;
if (!st->metadata ||
- !st->metadata->ss->min_acceptable_spare_size)
+ !st->metadata->ss->min_acceptable_spare_size) {
+ *sizep = 0;
return 0;
+ }
fd = open(st->devname, O_RDONLY);
if (fd < 0)
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)
if (from->spare_group)
pol_add(&pol, pol_domain,
from->spare_group, NULL);
- if (domain_test(domlist, pol, to->metadata->ss->name))
+ if (domain_test(domlist, pol, to->metadata->ss->name) == 1)
dev = from->devid[d];
dev_policy_free(pol);
}
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
if (err)
return 0;
+ 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;
+ }
+ }
+
/* 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);
* 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;
}
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 (is_subarray(&e->metadata_version[9]))
ping_monitor(&e->metadata_version[9]);
else
- ping_monitor(devnum2devname(devnum));
+ ping_monitor_by_id(devnum);
}
free_mdstat(ms);
return rv;
mdstat_wait(5);
}
}
+
+#ifndef MDASSEMBLE
+
+static char *clean_states[] = {
+ "clear", "inactive", "readonly", "read-auto", "clean", NULL };
+
+int WaitClean(char *dev, int sock, int verbose)
+{
+ int fd;
+ struct mdinfo *mdi;
+ int rv = 1;
+ int devnum;
+
+ fd = open(dev, O_RDONLY);
+ if (fd < 0) {
+ if (verbose)
+ fprintf(stderr, Name ": Couldn't open %s: %s\n", dev, strerror(errno));
+ return 1;
+ }
+
+ devnum = fd2devnum(fd);
+ mdi = sysfs_read(fd, devnum, GET_VERSION|GET_LEVEL|GET_SAFEMODE);
+ if (!mdi) {
+ if (verbose)
+ fprintf(stderr, Name ": Failed to read sysfs attributes for "
+ "%s\n", dev);
+ close(fd);
+ return 0;
+ }
+
+ switch(mdi->array.level) {
+ case LEVEL_LINEAR:
+ case LEVEL_MULTIPATH:
+ case 0:
+ /* safemode delay is irrelevant for these levels */
+ rv = 0;
+ }
+
+ /* for internal metadata the kernel handles the final clean
+ * transition, containers can never be dirty
+ */
+ if (!is_subarray(mdi->text_version))
+ rv = 0;
+
+ /* safemode disabled ? */
+ if (mdi->safe_mode_delay == 0)
+ rv = 0;
+
+ if (rv) {
+ int state_fd = sysfs_open(fd2devnum(fd), NULL, "array_state");
+ char buf[20];
+ fd_set fds;
+ struct timeval tm;
+
+ /* minimize the safe_mode_delay and prepare to wait up to 5s
+ * for writes to quiesce
+ */
+ sysfs_set_safemode(mdi, 1);
+ tm.tv_sec = 5;
+ tm.tv_usec = 0;
+
+ FD_ZERO(&fds);
+
+ /* wait for array_state to be clean */
+ while (1) {
+ rv = read(state_fd, buf, sizeof(buf));
+ if (rv < 0)
+ break;
+ if (sysfs_match_word(buf, clean_states) <= 4)
+ break;
+ FD_SET(state_fd, &fds);
+ rv = select(state_fd + 1, NULL, NULL, &fds, &tm);
+ if (rv < 0 && errno != EINTR)
+ break;
+ lseek(state_fd, 0, SEEK_SET);
+ }
+ if (rv < 0)
+ rv = 1;
+ else if (fping_monitor(sock) == 0 ||
+ ping_monitor(mdi->text_version) == 0) {
+ /* we need to ping to close the window between array
+ * state transitioning to clean and the metadata being
+ * marked clean
+ */
+ rv = 0;
+ } else
+ rv = 1;
+ if (rv && verbose)
+ fprintf(stderr, Name ": Error waiting for %s to be clean\n",
+ dev);
+
+ /* restore the original safe_mode_delay */
+ sysfs_set_safemode(mdi, mdi->safe_mode_delay);
+ close(state_fd);
+ }
+
+ sysfs_free(mdi);
+ close(fd);
+
+ return rv;
+}
+#endif /* MDASSEMBLE */
projects / thirdparty / mdadm.git / blobdiff