summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2017-11-27 01:28:38 -0500
committerAravinda VK <avishwan@redhat.com>2017-11-30 06:32:37 +0000
commit3460b8cfc550f272bdae588e8929b75b105ab06b (patch)
tree9edbe41581553b16d7c6d5e0056242121fd9353c
parent98cf45970ec3c147d65c98da01727c6b4e0dce4f (diff)
geo-rep: Fix access-mount geo-rep config
Fix access-mount and slave-access-mount configs. Change-Id: Ib586677755e76a51b9f20093e441b72789b4fecc Signed-off-by: Kotresh HR <khiremat@redhat.com> BUG: 1517633
-rw-r--r--geo-replication/gsyncd.conf.in10
-rw-r--r--geo-replication/syncdaemon/gsyncd.py4
-rw-r--r--geo-replication/syncdaemon/gsyncdconfig.py2
3 files changed, 12 insertions, 4 deletions
diff --git a/geo-replication/gsyncd.conf.in b/geo-replication/gsyncd.conf.in
index 384e07f5fa0..ecdeab9377e 100644
--- a/geo-replication/gsyncd.conf.in
+++ b/geo-replication/gsyncd.conf.in
@@ -46,7 +46,15 @@ configurable=false
[access-mount]
value=false
-help=Do not unmount the Aux mounts when stopped or crash
+type=bool
+validation=bool
+help=Do not lazy unmount the master volume. This allows admin to access the mount for debugging.
+
+[slave-access-mount]
+value=false
+type=bool
+validation=bool
+help=Do not lazy unmount the slave volume. This allows admin to access the mount for debugging.
[isolated-slaves]
value=
diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py
index ae7b701a10c..edecf076a03 100644
--- a/geo-replication/syncdaemon/gsyncd.py
+++ b/geo-replication/syncdaemon/gsyncd.py
@@ -77,8 +77,6 @@ def main():
help="Remote node ID to connect to Slave Volume")
p.add_argument("--slave-id", help="Slave Volume ID")
p.add_argument("-c", "--config-file", help="Config File")
- p.add_argument("--access-mount", action="store_true",
- help="Do not umount the mount")
p.add_argument("--debug", action="store_true")
# Agent
@@ -120,7 +118,7 @@ def main():
p.add_argument("--slave-gluster-log-level",
help="Slave Gluster mount Log level")
p.add_argument("--slave-access-mount", action="store_true",
- help="Do not umount the mount")
+ help="Do not lazy umount the slave volume")
# Status
p = sp.add_parser("status")
diff --git a/geo-replication/syncdaemon/gsyncdconfig.py b/geo-replication/syncdaemon/gsyncdconfig.py
index 9ca6ef37105..ad313022b4e 100644
--- a/geo-replication/syncdaemon/gsyncdconfig.py
+++ b/geo-replication/syncdaemon/gsyncdconfig.py
@@ -338,6 +338,8 @@ def to_float(value):
def to_bool(value):
+ if isinstance(value, bool):
+ return value
return True if value in ["true", "True"] else False