summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2018-09-28 07:48:13 -0400
committerShyamsundar Ranganathan <srangana@redhat.com>2018-10-05 14:21:27 +0000
commit76976d106d183fa275285066df2ced4902037f5a (patch)
tree9a6b41c60085478d797049aa58a8aab6ef41c7ce
parent78abb99e6aa9e7abbb364dabfd38c6df2fdd5b88 (diff)
georep: python2 to python3 compatibility-mount write
python3 expects byte string for os.write. This works for both py2 and py3. Fixed the same for geo-rep mount testing code path. Updates: #411 Change-Id: I2dfedcb0869457707bcca4d2847ef0d52bff1987 Signed-off-by: Kotresh HR <khiremat@redhat.com>
-rw-r--r--geo-replication/syncdaemon/resource.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index df4006f971a..e38027716b7 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -869,7 +869,9 @@ class Mounter(object):
if self.mntpt:
# mntpt is determined pre-mount
d = self.mntpt
- os.write(mpo, d + '\0')
+ mnt_msg = d + '\0'
+ encoded_msg = mnt_msg.encode()
+ os.write(mpo, encoded_msg)
po = Popen(margv, **self.mountkw)
self.handle_mounter(po)
po.terminate_geterr()
@@ -877,8 +879,11 @@ class Mounter(object):
if not d:
# mntpt is determined during mount
d = self.mntpt
- os.write(mpo, d + '\0')
- os.write(mpo, 'M')
+ mnt_msg = d + '\0'
+ encoded_msg = mnt_msg.encode()
+ os.write(mpo, encoded_msg)
+ encoded_msg = 'M'.encode()
+ os.write(mpo, encoded_msg)
t = syncdutils.Thread(target=lambda: os.chdir(d))
t.start()
tlim = rconf.starttime + gconf.get("connection-timeout")
@@ -907,6 +912,7 @@ class Mounter(object):
mntdata = ''
while True:
c = os.read(mpi, 1)
+ c = c.decode()
if not c:
break
mntdata += c