diff options
author | Kotresh HR <khiremat@redhat.com> | 2019-05-08 10:56:31 +0530 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2019-05-17 07:47:53 +0000 |
commit | 072a21576a65b5b0b2597115280972376f076a91 (patch) | |
tree | 763f94786c63332f4b559bc353bab6ff9e69cc94 /tests | |
parent | 219c9bc92c721d49de78fd5a4d98aca7d3c66ad4 (diff) |
geo-rep: Fix sync-method config
Problem:
When 'use_tarssh' is set to true, it exits with successful
message but the default 'rsync' was used as sync-engine.
The new config 'sync-method' is not allowed to set from cli.
Analysis and Fix:
The 'use_tarssh' config is deprecated with new
config framework and 'sync-method' is the new
config to choose sync-method i.e. tarssh or rsync.
This patch fixes the 'sync-method' config. The allowed
values are tarssh and rsync.
Backport of:
> Patch: https://review.gluster.org/22683
> Change-Id: I0edb0319cad0455b29e49f2f08a64ce324735e84
> BUG: 1707686
> Signed-off-by: Kotresh HR <khiremat@redhat.com>
Change-Id: I0edb0319cad0455b29e49f2f08a64ce324735e84
fixes: bz#1709737
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t | 2 | ||||
-rw-r--r-- | tests/00-geo-rep/georep-basic-dr-tarssh.t | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t b/tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t index cb530adbe0e..3757f7b7769 100644 --- a/tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t +++ b/tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t @@ -81,7 +81,7 @@ TEST $GEOREP_CLI $master $slave config use_meta_volume true TEST $CLI volume set $GMV0 changelog.rollover-time 3 #Config tarssh as sync-engine -TEST $GEOREP_CLI $master $slave config use_tarssh true +TEST $GEOREP_CLI $master $slave config sync-method tarssh #Wait for common secret pem file to be created EXPECT_WITHIN $GEO_REP_TIMEOUT 0 check_common_secret_file diff --git a/tests/00-geo-rep/georep-basic-dr-tarssh.t b/tests/00-geo-rep/georep-basic-dr-tarssh.t index 9e2f6135751..0380ed68dce 100644 --- a/tests/00-geo-rep/georep-basic-dr-tarssh.t +++ b/tests/00-geo-rep/georep-basic-dr-tarssh.t @@ -81,7 +81,7 @@ TEST $GEOREP_CLI $master $slave config use_meta_volume true TEST $CLI volume set $GMV0 changelog.rollover-time 3 #Config tarssh as sync-engine -TEST $GEOREP_CLI $master $slave config use_tarssh true +TEST $GEOREP_CLI $master $slave config sync-method tarssh #Wait for common secret pem file to be created EXPECT_WITHIN $GEO_REP_TIMEOUT 0 check_common_secret_file |