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

mdmon: simplify try_kill_monitor 

After we SIGTERM the monitor we need to wait for it to finish up.
Rather than the complexity of waiting for every md array to be clean,
we can simply read from the sock connected to the monitor.
When the monitor dies, we will get EOF.  Before then we will block.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2010-01-29 11:33:01 +11:00
parent 3e7312a96c
commit af7ca33487
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mdmon.c
View File

@ -179,8 +179,8 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock)
{
char buf[100];
int fd;
struct mdstat_ent *mdstat;
int n;
long fl;
/* first rule of survival... don't off yourself */
if (pid == getpid())
@ -201,13 +201,12 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock)
kill(pid, SIGTERM);
mdstat = mdstat_read(0, 0);
for ( ; mdstat; mdstat = mdstat->next)
if (is_container_member(mdstat, devname)) {
sprintf(buf, "/dev/%s", mdstat->dev);
WaitClean(buf, sock, 0);
}
free_mdstat(mdstat);
/* Wait for monitor to exit by reading from the socket, after
* clearing the non-blocking flag */
fl = fcntl(sock, F_GETFL, 0);
fl &= ~O_NONBLOCK;
fcntl(sock, F_SETFL, fl);
read(sock, buf, 100);
}
void remove_pidfile(char *devname)