summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Kumar <sunkumar@redhat.com>2019-05-13 14:32:53 +0530
committerSunny Kumar <sunkumar@redhat.com>2019-09-23 12:39:08 +0000
commitfd4144de3df743af29e81f70bc7af421a1b8220d (patch)
treea3879383cb69a8b269bd19339e1c8e87c4d0c6e5
parentfcfcb0ad04402a34f07075d29981922a6dbc858c (diff)
geo-rep : fix mountbroker setup
Problem: Unable to setup mountbroker root directory while creating geo-replication session for non-root user. Casue: With patch[1] which defines the max-port for glusterd one extra sapce got added in field of 'option max-port'. [1]. https://review.gluster.org/#/c/glusterfs/+/21872/ In geo-rep spliting of key-value pair form vol file was done on the basis of space so this additional space caused "ValueError: too many values to unpack". Solution: Use split so that it can treat consecutive whitespace as a single separator. Backport of: https://review.gluster.org/#/c/glusterfs/+/22716/. >Fixes: bz#1709248 >Change-Id: Ia22070a43f95d66d84cb35487f23f9ee58b68c73 >Signed-off-by: Sunny Kumar <sunkumar@redhat.com> >(cherry picked from commit 3dd03146bb7037ae2ebea0579d0b81be27fdd927) Change-Id: Ia22070a43f95d66d84cb35487f23f9ee58b68c73 Fixes: bz#1750230 Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
-rw-r--r--geo-replication/src/peer_mountbroker.py.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/geo-replication/src/peer_mountbroker.py.in b/geo-replication/src/peer_mountbroker.py.in
index 54f95c4b38d..ce33f97f43c 100644
--- a/geo-replication/src/peer_mountbroker.py.in
+++ b/geo-replication/src/peer_mountbroker.py.in
@@ -47,7 +47,7 @@ class MountbrokerUserMgmt(object):
for line in f:
line = line.strip()
if line.startswith("option "):
- key, value = line.split(" ")[1:]
+ key, value = line.split()[1:]
self._options[key] = value
if line.startswith("#"):
self.commented_lines.append(line)