From 1212fb7330ffe0996c5501de3158e222ab3038b7 Mon Sep 17 00:00:00 2001
From: Kotresh HR <khiremat@redhat.com>
Date: Mon, 29 Oct 2018 17:55:28 +0530
Subject: georep: python2 to python3 compat - scheduler

1. scheduler - Popen
2. syncdutils - corner case on failure

Backport of:
> Patch: https://review.gluster.org/21505
> BUG: 1643932
> Change-Id: I65af97a244a8790e976acedc2728db6ebbf2ae10
> Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 33e96100e17e9a293db6d63d9d5449d6c2d69376)

fixes: bz#1644514
Change-Id: I65af97a244a8790e976acedc2728db6ebbf2ae10
Signed-off-by: Kotresh HR <khiremat@redhat.com>
---
 geo-replication/syncdaemon/syncdutils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'geo-replication')

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()
-- 
cgit