summaryrefslogtreecommitdiffstats
path: root/geo-replication/syncdaemon/resource.py
diff options
context:
space:
mode:
authorVenky Shankar <vshankar@redhat.com>2014-01-20 19:38:44 +0530
committerVijay Bellur <vbellur@redhat.com>2014-02-06 01:50:46 -0800
commit0035b37a2d19c1ba8502cda93d9f5debfdd35c45 (patch)
tree6893039fbb7b1d8103b5edfbe20586eab2480cdd /geo-replication/syncdaemon/resource.py
parentc04c8a4cb1dcf20bdf05e9bdbf26862a1cf50979 (diff)
gsyncd / geo-rep: cleanup the "tar" process
A missing cleanup for the "tar" process (when tar+ssh is used as the sync engine). Change-Id: Ib9599b43e7ec606c70b7c5598793417142be3c0b BUG: 1036539 Signed-off-by: Venky Shankar <vshankar@redhat.com> Reviewed-on: http://review.gluster.org/6794 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'geo-replication/syncdaemon/resource.py')
-rw-r--r--geo-replication/syncdaemon/resource.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index 8deb5114b50..810c2a81d85 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -779,7 +779,11 @@ class SlaveRemote(object):
p0.stdin.write(f)
p0.stdin.write('\n')
p0.stdin.close()
+
+ # wait() for tar to terminate, collecting any errors, further
+ # waiting for transfer to complete
p0.wait()
+ p0.terminate_geterr(fail_on_err = False)
p1.wait()
p1.terminate_geterr(fail_on_err = False)