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