summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2016-09-08 17:30:37 +0530
committerAravinda VK <avishwan@redhat.com>2016-09-14 23:31:05 -0700
commitbd0bab137e79b4f26ea6b933d4eb5a8a09986c25 (patch)
treef3c623bc4b4c040a129471a82032eca993f2fe2f
parented7d5042b68d1f25cc6c957ad9a0d82b1090fad0 (diff)
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 <jenkins@build.gluster.org> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > Reviewed-by: Saravanakumar Arumugam <sarumuga@redhat.com> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Kotresh HR <khiremat@redhat.com> BUG: 1375542 Change-Id: I9953239ef601cc1970c814b00074b45eb00f481e Signed-off-by: Aravinda VK <avishwan@redhat.com> (cherry picked from commit 6b30e9bf5a612e105eb7ded0a89ef25fd8530ba5) Reviewed-on: http://review.gluster.org/15489 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Saravanakumar Arumugam <sarumuga@redhat.com>
-rw-r--r--geo-replication/syncdaemon/resource.py6
1 files changed, 6 insertions, 0 deletions
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)