diff options
| author | Kotresh HR <khiremat@redhat.com> | 2017-08-11 04:55:18 -0400 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-01-05 07:08:10 +0000 |
| commit | 60a992e69a7cf5a588f5139709d325125d6f04fb (patch) | |
| tree | d96c997f90174e7c0936b38aab5732cbef096e88 /geo-replication/syncdaemon/resource.py | |
| parent | 78d67da17356b48cf1d5a6595764650d5b200ba7 (diff) | |
tests: Enable geo-rep test cases
This patch re-enables the geo-rep test cases.
Along with it does following optimizations.
1. Use EXPECT_WITHIN instead of sleep
2. Clean up geo-rep ssh key after test
3. Changes to gverify.sh and S56glusterd-geo-rep-create-post.sh
to use the given ssh identity file for geo-rep create
4. Make gluster-command-dir configurable and introduce
slave-gluster-command-dir which points the parent directory
of gluster binaries in master and slave respectively.
Change-Id: Ia7696278d9dd3ba04224dcd7c3564088ca970b04
BUG: 1480491
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Diffstat (limited to 'geo-replication/syncdaemon/resource.py')
| -rw-r--r-- | geo-replication/syncdaemon/resource.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py index ab0484d5f5e..2d48a28c145 100644 --- a/geo-replication/syncdaemon/resource.py +++ b/geo-replication/syncdaemon/resource.py @@ -807,8 +807,10 @@ class Mounter(object): @classmethod def get_glusterprog(cls): - return os.path.join(gconf.get("gluster-command-dir"), - cls.glusterprog) + gluster_cmd_dir = gconf.get("gluster-command-dir") + if rconf.args.subcmd == "slave": + gluster_cmd_dir = gconf.get("slave-gluster-command-dir") + return os.path.join(gluster_cmd_dir, cls.glusterprog) def umount_l(self, d): """perform lazy umount""" @@ -1371,7 +1373,9 @@ class SSH(object): '--slave-timeout', str(gconf.get("slave-timeout")), '--slave-log-level', gconf.get("slave-log-level"), '--slave-gluster-log-level', - gconf.get("slave-gluster-log-level")] + gconf.get("slave-gluster-log-level"), + '--slave-gluster-command-dir', + gconf.get("slave-gluster-command-dir")] if gconf.get("slave-access-mount"): args_to_slave.append('--slave-access-mount') |