Move WaitClean from sysfs to Monitor.c
It might not really belong in Monitor, but it really doesn't belong in sysfs.c, and fits well with Wait() Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown
parent
7b0bbd0f71
commit
679eb882fc
102
Monitor.c
102
Monitor.c
|
|
@ -985,3 +985,105 @@ int Wait(char *dev)
|
|||
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 */
|
||||
|
|
|
|||
103
sysfs.c
103
sysfs.c
|
|
@ -828,106 +828,3 @@ int sysfs_freeze_array(struct mdinfo *sra)
|
|||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
#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 */
|
||||
|
|
|
|||
Loading…
Reference in New Issue