e3c68b
From 37df54966d5b7f01ad24d329bac5da1cf17f2abe Mon Sep 17 00:00:00 2001
e3c68b
From: Sunny Kumar <sunkumar@redhat.com>
e3c68b
Date: Wed, 12 Jun 2019 16:10:52 +0530
e3c68b
Subject: [PATCH 182/192] geo-rep : fix mountbroker setup
e3c68b
e3c68b
Problem:
e3c68b
e3c68b
Unable to setup mountbroker root directory while creating geo-replication
e3c68b
session for non-root user.
e3c68b
e3c68b
Casue:
e3c68b
With patch[1] which defines the max-port for glusterd one extra sapce
e3c68b
got added in field of 'option max-port'.
e3c68b
[1]. https://review.gluster.org/#/c/glusterfs/+/21872/
e3c68b
e3c68b
In geo-rep spliting of key-value pair form vol file was done on the
e3c68b
basis of space so this additional space caused "ValueError: too many values
e3c68b
to unpack".
e3c68b
e3c68b
Solution:
e3c68b
Use split so that it can treat consecutive whitespace as a single separator.
e3c68b
e3c68b
Backport of:
e3c68b
e3c68b
 >Upstream Patch: https://review.gluster.org/#/c/glusterfs/+/22716/
e3c68b
 >Fixes: bz#1709248
e3c68b
 >Change-Id: Ia22070a43f95d66d84cb35487f23f9ee58b68c73
e3c68b
 >Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
e3c68b
e3c68b
BUG: 1708043
e3c68b
Change-Id: Ic6d535a6faad62ce185c6aa5adc18f5fdf8f27be
e3c68b
Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
e3c68b
Reviewed-on: https://code.engineering.redhat.com/gerrit/173149
e3c68b
Tested-by: RHGS Build Bot <nigelb@redhat.com>
e3c68b
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
e3c68b
---
e3c68b
 geo-replication/src/peer_mountbroker.py.in | 2 +-
e3c68b
 1 file changed, 1 insertion(+), 1 deletion(-)
e3c68b
e3c68b
diff --git a/geo-replication/src/peer_mountbroker.py.in b/geo-replication/src/peer_mountbroker.py.in
e3c68b
index 54f95c4..ce33f97 100644
e3c68b
--- a/geo-replication/src/peer_mountbroker.py.in
e3c68b
+++ b/geo-replication/src/peer_mountbroker.py.in
e3c68b
@@ -47,7 +47,7 @@ class MountbrokerUserMgmt(object):
e3c68b
             for line in f:
e3c68b
                 line = line.strip()
e3c68b
                 if line.startswith("option "):
e3c68b
-                    key, value = line.split(" ")[1:]
e3c68b
+                    key, value = line.split()[1:]
e3c68b
                     self._options[key] = value
e3c68b
                 if line.startswith("#"):
e3c68b
                     self.commented_lines.append(line)
e3c68b
-- 
e3c68b
1.8.3.1
e3c68b