summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/nsr-server/src/nsr.c
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2014-01-29 21:06:58 +0000
committerJeff Darcy <jdarcy@redhat.com>2014-02-11 13:55:32 +0000
commitef9d6ebe81e75463cd1ff0d3cf9a649bd2002421 (patch)
tree5cea5499238e3f040e099bddfce1f084b91b683d /xlators/cluster/nsr-server/src/nsr.c
parent00eab2c50adfb440354b4c5b650fdbf961901c50 (diff)
nsr: add first reconciliation test
The test itself fails, because reconciliation never actually seems to complete. Instead, it fills up several log files with 16M lines worth of junk, even though we only did ~200 writes. Fencing is also disabled so we can make progress despite this. Still, this test should provide a basic framework for testing reconciliation once it's fixed. This patch also fixes the hard-coded executable path used to start the recon daemon. Without this, starting the brick fails on a standard install (because the hard-coded path was to a non-standard location). Change-Id: I982967d796c3fb5713c5062912be2d804dcc0149 Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/cluster/nsr-server/src/nsr.c')
-rw-r--r--xlators/cluster/nsr-server/src/nsr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/cluster/nsr-server/src/nsr.c b/xlators/cluster/nsr-server/src/nsr.c
index 75412a8f5..9f2338148 100644
--- a/xlators/cluster/nsr-server/src/nsr.c
+++ b/xlators/cluster/nsr-server/src/nsr.c
@@ -664,7 +664,7 @@ nsr_init (xlator_t *this)
if (!stat(priv->vol_file, &buf)) {
runinit (&runner);
- runner_add_args(&runner, "/usr/local/sbin/glusterfs",
+ runner_add_args(&runner, SBIN_DIR "/glusterfs",
"-f", recon_file,
"-p", recon_pid_file,
"-l", recon_log,