Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monitor: containers don't have the same sysfs properties as arrays 

GET_MISMATCH option doesn't exist for containers so sysfs_read fails if
this information is requested. Set options according to the device using
information from /proc/mdstat.

Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
Mariusz Tkaczyk 2017-08-16 14:22:32 +02:00 committed by Jes Sorensen
parent dcd24efcfa
commit 802961a239
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Monitor.c
View File

@ -465,6 +465,8 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
int last_disk;
int new_array = 0;
int retval;
int is_container = 0;
unsigned long array_only_flags = 0;
if (test)
alert("TestMessage", dev, NULL, ainfo);
@ -475,6 +477,26 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
if (fd < 0)
goto disappeared;
if (st->devnm[0] == 0)
strcpy(st->devnm, fd2devnm(fd));
for (mse2 = mdstat; mse2; mse2 = mse2->next)
if (strcmp(mse2->devnm, st->devnm) == 0) {
mse2->devnm[0] = 0; /* flag it as "used" */
mse = mse2;
}
if (!mse) {
/* duplicated array in statelist
* or re-created after reading mdstat
*/
st->err++;
goto out;
}
if (mse->level == NULL)
is_container = 1;
if (!md_array_active(fd))
goto disappeared;
@ -482,11 +504,12 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
if (md_get_array_info(fd, &array) < 0)
goto disappeared;
if (st->devnm[0] == 0)
strcpy(st->devnm, fd2devnm(fd));
if (!is_container)
array_only_flags |= GET_MISMATCH;
sra = sysfs_read(-1, st->devnm, GET_LEVEL | GET_DISKS | GET_DEVS |
GET_STATE | array_only_flags);
sra = sysfs_read(-1, st->devnm, GET_LEVEL | GET_DISKS | GET_MISMATCH |
GET_DEVS | GET_STATE);
if (!sra)
goto disappeared;
@ -500,19 +523,6 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
goto out;
}
for (mse2 = mdstat; mse2; mse2 = mse2->next)
if (strcmp(mse2->devnm, st->devnm) == 0) {
mse2->devnm[0] = 0; /* flag it as "used" */
mse = mse2;
}
if (!mse) {
/* duplicated array in statelist
* or re-created after reading mdstat*/
st->err++;
close(fd);
goto out;
}
/* this array is in /proc/mdstat */
if (array.utime == 0)
/* external arrays don't update utime, so
@ -653,7 +663,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
out:
if (sra)
sysfs_free(sra);
if (fd > 0)
if (fd >= 0)
close(fd);
return retval;