summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2016-04-29 13:03:40 +0530
committerAravinda VK <avishwan@redhat.com>2016-05-10 04:33:49 -0700
commit956c064c4f7b52f893f2865652417f3c6dd420c1 (patch)
tree926c458bbb95e2cc6e427dc92c26d2ad2d9a7453 /extras
parentc1fe26b32d2e1fb5bd3c305f70968eacd4a15074 (diff)
geo-rep: Fix gluster binary invocation while running as cron
When scheduler script was executed as cron, it was unable to detect the Gluster binaries. BUG: 1331924 Change-Id: Ic9c533586ed9a472765f69aa2f87d004c46d4340 Signed-off-by: Aravinda VK <avishwan@redhat.com> Reviewed-on: http://review.gluster.org/14111 CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com> (cherry picked from commit 80e3832ec16f69d4184172cfc9afa9e42533e0ef) Reviewed-on: http://review.gluster.org/14122 Reviewed-by: Kotresh HR <khiremat@redhat.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/geo-rep/Makefile.am4
-rw-r--r--extras/geo-rep/schedule_georep.py.in (renamed from extras/geo-rep/schedule_georep.py)18
2 files changed, 13 insertions, 9 deletions
diff --git a/extras/geo-rep/Makefile.am b/extras/geo-rep/Makefile.am
index dcf0fc8..6c334b0 100644
--- a/extras/geo-rep/Makefile.am
+++ b/extras/geo-rep/Makefile.am
@@ -10,4 +10,6 @@ gsync_sync_gfid_SOURCES = gsync-sync-gfid.c
gsync_sync_gfid_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
EXTRA_DIST = gsync-sync-gfid.c gsync-upgrade.sh generate-gfid-file.sh \
- get-gfid.sh slave-upgrade.sh schedule_georep.py
+ get-gfid.sh slave-upgrade.sh schedule_georep.py.in
+
+CLEANFILES = schedule_georep.py
diff --git a/extras/geo-rep/schedule_georep.py b/extras/geo-rep/schedule_georep.py.in
index 74fc693..c931111 100644
--- a/extras/geo-rep/schedule_georep.py
+++ b/extras/geo-rep/schedule_georep.py.in
@@ -130,7 +130,7 @@ def glustermount(hostname, volname):
Automatically unmounts it in case of Exceptions/out of context
"""
mnt = tempfile.mkdtemp(prefix="georepsetup_")
- execute(["glusterfs",
+ execute(["@SBIN_DIR@/glusterfs",
"--volfile-server", hostname,
"--volfile-id", volname,
"-l", SESSION_MOUNT_LOG_FILE,
@@ -152,7 +152,7 @@ def get_bricks(volname):
parsed.
"""
value = []
- cmd = ["gluster", "volume", "info", volname, "--xml"]
+ cmd = ["@SBIN_DIR@/gluster", "volume", "info", volname, "--xml"]
info = execute(cmd)
try:
tree = etree.fromstring(info)
@@ -169,7 +169,7 @@ def get_bricks(volname):
def get_georep_status(mastervol, slave):
session_keys = set()
out = {}
- cmd = ["gluster", "volume", "geo-replication"]
+ cmd = ["@SBIN_DIR@/gluster", "volume", "geo-replication"]
if mastervol is not None:
cmd += [mastervol]
if slave:
@@ -357,20 +357,20 @@ def main(args):
turns = 1
# Stop Force
- cmd = ["gluster", "volume", "geo-replication", args.mastervol,
+ cmd = ["@SBIN_DIR@/gluster", "volume", "geo-replication", args.mastervol,
"%s::%s" % (args.slave, args.slavevol), "stop", "force"]
execute(cmd)
output_ok("Stopped Geo-replication")
# Set Checkpoint to NOW
- cmd = ["gluster", "volume", "geo-replication", args.mastervol,
+ cmd = ["@SBIN_DIR@/gluster", "volume", "geo-replication", args.mastervol,
"%s::%s" % (args.slave, args.slavevol), "config", "checkpoint",
"now"]
execute(cmd)
output_ok("Set Checkpoint")
# Start the Geo-replication
- cmd = ["gluster", "volume", "geo-replication", args.mastervol,
+ cmd = ["@SBIN_DIR@/gluster", "volume", "geo-replication", args.mastervol,
"%s::%s" % (args.slave, args.slavevol), "start"]
execute(cmd)
output_ok("Started Geo-replication and watching Status for "
@@ -421,7 +421,8 @@ def main(args):
if summary["checkpoints_ok"]:
output_ok("Stopping Geo-replication session now")
- cmd = ["gluster", "volume", "geo-replication", args.mastervol,
+ cmd = ["@SBIN_DIR@/gluster", "volume", "geo-replication",
+ args.mastervol,
"%s::%s" % (args.slave, args.slavevol), "stop"]
execute(cmd)
break
@@ -436,7 +437,8 @@ def main(args):
turns += 1
duration = int(time.time()) - start_time
if args.timeout > 0 and duration > (args.timeout * 60):
- cmd = ["gluster", "volume", "geo-replication", args.mastervol,
+ cmd = ["@SBIN_DIR@/gluster", "volume", "geo-replication",
+ args.mastervol,
"%s::%s" % (args.slave, args.slavevol), "stop", "force"]
execute(cmd)
output_notok("Timed out, Stopping Geo-replication("