summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--configure.ac17
-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
4 files changed, 31 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index a70a5b1..8f2534d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ contrib/argp-standalone/libargp.a
contrib/fuse-util/fusermount-glusterfs
contrib/uuid/uuid_types.h
extras/geo-rep/gsync-sync-gfid
+extras/geo-rep/schedule_georep.py
extras/init.d/glusterd-Debian
extras/init.d/glusterd-FreeBSD
extras/init.d/glusterd-Redhat
diff --git a/configure.ac b/configure.ac
index 0c02a88..2170773 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,6 +223,7 @@ AC_CONFIG_FILES([Makefile
extras/ocf/volume
extras/LinuxRPM/Makefile
extras/geo-rep/Makefile
+ extras/geo-rep/schedule_georep.py
extras/firewalld/Makefile
extras/hook-scripts/add-brick/Makefile
extras/hook-scripts/add-brick/pre/Makefile
@@ -1075,6 +1076,22 @@ case $host_os in
;;
esac
+# Default value for sbindir
+prefix_temp=$prefix
+exec_prefix_temp=$exec_prefix
+
+test "${prefix}" = "NONE" && prefix="${ac_default_prefix}"
+test "${exec_prefix}" = "NONE" && exec_prefix='${prefix}'
+sbintemp="${sbindir}"
+eval sbintemp=\"${sbintemp}\"
+eval sbintemp=\"${sbintemp}\"
+SBIN_DIR=${sbintemp}
+
+prefix=$prefix_temp
+exec_prefix=$exec_prefix_temp
+
+AC_SUBST(SBIN_DIR)
+
# lazy umount emulation
UMOUNTD_SUBDIR=""
if test "x${GF_HOST_OS}" != "xGF_LINUX_HOST_OS" ; then
diff --git a/extras/geo-rep/Makefile.am b/extras/geo-rep/Makefile.am
index fb6664e..da3dd1f 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("