From f466adc7c21578657baac0ec47e0eadc59608fe3 Mon Sep 17 00:00:00 2001 From: Aravinda VK Date: Thu, 8 Sep 2016 17:30:37 +0530 Subject: geo-rep: Defunct tar process after sync After every sync iteration with tarssh mode leaves defunct tar process. Added wait for tar process to prevent this issue. > Reviewed-on: http://review.gluster.org/15426 > Smoke: Gluster Build System > NetBSD-regression: NetBSD Build System > Reviewed-by: Saravanakumar Arumugam > CentOS-regression: Gluster Build System > Reviewed-by: Kotresh HR BUG: 1375541 Change-Id: I9953239ef601cc1970c814b00074b45eb00f481e Signed-off-by: Aravinda VK (cherry picked from commit 6b30e9bf5a612e105eb7ded0a89ef25fd8530ba5) Reviewed-on: http://review.gluster.org/15490 Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Saravanakumar Arumugam NetBSD-regression: NetBSD Build System --- geo-replication/syncdaemon/resource.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'geo-replication') diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py index d372203a7ea..6d26a56a7bf 100644 --- a/geo-replication/syncdaemon/resource.py +++ b/geo-replication/syncdaemon/resource.py @@ -1065,6 +1065,12 @@ class SlaveRemote(object): # waiting for transfer to complete _, stderr1 = p1.communicate() + # stdin and stdout of p0 is already closed, Reset to None and + # wait for child process to complete + p0.stdin = None + p0.stdout = None + p0.communicate() + if log_err: for errline in stderr1.strip().split("\n")[:-1]: logging.error("SYNC Error(Untar): %s" % errline) -- cgit