summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2018-10-29 17:55:28 +0530
committerAmar Tumballi <amarts@redhat.com>2018-10-30 13:12:46 +0000
commit33e96100e17e9a293db6d63d9d5449d6c2d69376 (patch)
tree494177883df12bfed66d9f13ec91d5f98203f41d
parent6cc573631df28eb357ffb006d1dbfe1bfd60aeba (diff)
georep: python2 to python3 compat - scheduler
1. scheduler - Popen 2. syncdutils - corner case on failure fixes: bz#1643932 Change-Id: I65af97a244a8790e976acedc2728db6ebbf2ae10 Signed-off-by: Kotresh HR <khiremat@redhat.com>
-rw-r--r--extras/geo-rep/schedule_georep.py.in2
-rw-r--r--geo-replication/syncdaemon/syncdutils.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/extras/geo-rep/schedule_georep.py.in b/extras/geo-rep/schedule_georep.py.in
index 79af80b841a..f29ae020b8f 100644
--- a/extras/geo-rep/schedule_georep.py.in
+++ b/extras/geo-rep/schedule_georep.py.in
@@ -83,7 +83,7 @@ def execute(cmd, success_msg="", failure_msg="", exitcode=-1):
On success it can print message in stdout if specified.
On failure, exits after writing to stderr.
"""
- p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
out, err = p.communicate()
if p.returncode == 0:
if success_msg:
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
index fad1a3e4f76..fd96ca70b2f 100644
--- a/geo-replication/syncdaemon/syncdutils.py
+++ b/geo-replication/syncdaemon/syncdutils.py
@@ -847,7 +847,7 @@ class Popen(subprocess.Popen):
break
b = os.read(self.stderr.fileno(), 1024)
if b:
- elines.append(b)
+ elines.append(b.decode())
else:
break
self.stderr.close()