summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2017-10-06 05:33:31 -0400
committerjiffin tony Thottan <jthottan@redhat.com>2017-10-12 18:44:40 +0000
commit1e425a3aea627f902434ca5b8252ee64cfa32c3d (patch)
tree9dd56cf2378f0c1dbb7625b52d2406e9b36d8e01
parentdfd6f6b5f5a1d3ea7c4f0cdeab09effc2c866641 (diff)
geo-rep/scheduler: Add validation for session existence
Added validation to check for session existence to give out proper error message out. > Change-Id: I13c5f6ef29c1395cff092a14e1bd2c197a39f058 > BUG: 1499159 > Signed-off-by: Kotresh HR <khiremat@redhat.com> (cherry picked from commit 938addeb7ec634e431c2c8c0a768a2a9ed056c0d) Change-Id: I13c5f6ef29c1395cff092a14e1bd2c197a39f058 BUG: 1499392 Signed-off-by: Kotresh HR <khiremat@redhat.com>
-rw-r--r--cli/src/cli-rpc-ops.c2
-rw-r--r--extras/geo-rep/schedule_georep.py.in4
2 files changed, 5 insertions, 1 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 207534b30b3..eb1ca7788c4 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -5857,7 +5857,7 @@ gf_cli_gsync_status_output (dict_t *dict, gf_boolean_t is_detail)
gf_log ("cli", GF_LOG_INFO, "%s", errmsg);
cli_out ("%s", errmsg);
- ret = 0;
+ ret = -1;
goto out;
}
diff --git a/extras/geo-rep/schedule_georep.py.in b/extras/geo-rep/schedule_georep.py.in
index 2ae0f1029ab..1887fe7ba87 100644
--- a/extras/geo-rep/schedule_georep.py.in
+++ b/extras/geo-rep/schedule_georep.py.in
@@ -468,6 +468,10 @@ if __name__ == "__main__":
if args.no_color:
USE_CLI_COLOR = False
try:
+ # Check for session existence
+ cmd = ["@SBIN_DIR@/gluster", "volume", "geo-replication",
+ args.mastervol, "%s::%s" % (args.slave, args.slavevol), "status"]
+ execute(cmd)
main(args)
except KeyboardInterrupt:
output_notok("Exiting...")