diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-17 00:39:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-17 00:47:52 -0400 |
| commit | ffde7cf5658c2f0224f0061eff4b9ef1e1daf3f4 (patch) | |
| tree | b8297bfbd91cdf89569081bfe54503bf31c25be9 /Utility/Rsync.hs | |
| parent | 640f0fea3e98b8b08c1bd995e14f9d37fa6f9d7d (diff) | |
better fix for zombie problem, which turns out to be a zombie ssh started by rsync
When rsyncProgress pipes rsync's stdout, this turns out to cause a ssh
process started by rsync to be left behind as a zombie. I don't know why,
but my recent zombie reaping cleanup was correct, it's just that this other
zombie, that's not directly started by git-annex, was no longer reaped
due to changes in the cleanup. Make rsyncProgress reap the zombie started
by rsync, as a workaround.
FWIW, the process tree looks like this. It seems like the rsync child
is for some reason starting but not waiting on this extra ssh process.
Ssh connection caching may be involved -- disabling it seemed to change
the shape of the tree, but did not eliminate the zombie.
9378 pts/14 S+ 0:00 | \_ rsync -p --progress --inplace -4 -e 'ssh' '-S' ...
9379 pts/14 S+ 0:00 | | \_ ssh ...
9380 pts/14 S+ 0:00 | | \_ rsync -p --progress --inplace -4 -e 'ssh' '-S' ...
9381 pts/14 Z+ 0:00 | \_ [ssh] <defunct>
Diffstat (limited to 'Utility/Rsync.hs')
| -rw-r--r-- | Utility/Rsync.hs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index f8e19eb57..68d27550c 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -53,8 +53,13 @@ rsync = boolSystem "rsync" - The params must enable rsync's --progress mode for this to work. -} rsyncProgress :: (Integer -> IO ()) -> [CommandParam] -> IO Bool -rsyncProgress callback params = - withHandle StdoutHandle createProcessSuccess p (feedprogress 0 []) +rsyncProgress callback params = do + r <- withHandle StdoutHandle createProcessSuccess p (feedprogress 0 []) + {- For an unknown reason, piping rsync's output like this does + - causes it to run a second ssh process, which it neglects to wait + - on. Reap the resulting zombie. -} + reapZombies + return r where p = proc "rsync" (toCommand params) feedprogress prev buf h = do |