ctdb-tools: Remove some helper variables

Remove CTDB_EVENT_HELPER, CTDB_LVS_HELPER, CTDB_NATGW_HELPER.  Use
path_helperdir_append() instead.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/ctdb/tests/UNIT/tool/scripts/local.sh b/ctdb/tests/UNIT/tool/scripts/local.sh
index a8da0238026ce4f43812de54bf52e7c0cf4419bf..b3ffe7f642291ee247e18cf1d06f19dc26f18fcf 100644 (file)
--- a/ctdb/tests/UNIT/tool/scripts/local.sh
+++ b/ctdb/tests/UNIT/tool/scripts/local.sh
@@ -80,7 +80,6 @@ setup_natgw()
 {
        debug "Setting up NAT gateway"
 
-       export CTDB_NATGW_HELPER="${CTDB_SCRIPTS_TOOLS_HELPER_DIR}/ctdb_natgw"
        export CTDB_NATGW_NODES="${CTDB_BASE}/natgw_nodes"
 
        cat >"$CTDB_NATGW_NODES"
@@ -90,7 +89,6 @@ setup_lvs()
 {
        debug "Setting up LVS"
 
-       export CTDB_LVS_HELPER="${CTDB_SCRIPTS_TOOLS_HELPER_DIR}/ctdb_lvs"
        export CTDB_LVS_NODES="${CTDB_BASE}/lvs_nodes"
 
        cat >"$CTDB_LVS_NODES"

diff --git a/ctdb/tests/local_daemons.sh b/ctdb/tests/local_daemons.sh
index 1c4b94119646a700ee5e54020610cd88caa1d8ce..f65218110c8a42c649f407947932a8a3442b043c 100755 (executable)
--- a/ctdb/tests/local_daemons.sh
+++ b/ctdb/tests/local_daemons.sh
@@ -16,7 +16,6 @@ export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts"
 if ! $CTDB_TESTS_ARE_INSTALLED; then
        hdir="$CTDB_SCRIPTS_HELPER_BINDIR"
        export CTDB_EVENTD="${hdir}/ctdb-eventd"
-       export CTDB_EVENT_HELPER="${hdir}/ctdb-event"
        export CTDB_LOCK_HELPER="${hdir}/ctdb_lock_helper"
        export CTDB_RECOVERY_HELPER="${hdir}/ctdb_recovery_helper"
        export CTDB_TAKEOVER_HELPER="${hdir}/ctdb_takeover_helper"

diff --git a/ctdb/tests/scripts/integration_local_daemons.bash b/ctdb/tests/scripts/integration_local_daemons.bash
index 4176b635cc8daa11001f4a47c77859fce3e46d51..981a94b2982b2026b64f6ec9124a3cac40b4ef48 100644 (file)
--- a/ctdb/tests/scripts/integration_local_daemons.bash
+++ b/ctdb/tests/scripts/integration_local_daemons.bash
@@ -1,8 +1,5 @@
 # Hey Emacs, this is a -*- shell-script -*- !!!  :-)
 
-hdir="$CTDB_SCRIPTS_HELPER_BINDIR"
-export CTDB_EVENT_HELPER="${hdir}/ctdb-event"
-
 if $CTDB_TESTS_ARE_INSTALLED; then
        # Find it in $PATH
        helper="ctdb_local_daemons"

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index fb1248a873a981c7750420b15ccc2b7d01a297cd..09e2455def1cd2a5e6990fa015c6572463e65800 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -2945,21 +2945,13 @@ static int control_lvs(TALLOC_CTX *mem_ctx,
                       int argc,
                       const char **argv)
 {
-       char *t, *lvs_helper = NULL;
+       char *lvs_helper = NULL;
 
        if (argc != 1) {
                usage("lvs");
        }
 
-       t = getenv("CTDB_LVS_HELPER");
-       if (t != NULL) {
-               lvs_helper = talloc_strdup(mem_ctx, t);
-       } else {
-               lvs_helper = talloc_asprintf(mem_ctx,
-                                            "%s/ctdb_lvs",
-                                            CTDB_HELPER_BINDIR);
-       }
-
+       lvs_helper = path_helperdir_append(mem_ctx, "ctdb_lvs");
        if (lvs_helper == NULL) {
                fprintf(stderr, "Unable to set LVS helper\n");
                return 1;
@@ -5648,17 +5640,9 @@ static int control_event(TALLOC_CTX *mem_ctx,
                         int argc,
                         const char **argv)
 {
-       char *t, *event_helper = NULL;
-
-       t = getenv("CTDB_EVENT_HELPER");
-       if (t != NULL) {
-               event_helper = talloc_strdup(mem_ctx, t);
-       } else {
-               event_helper = talloc_asprintf(mem_ctx,
-                                              "%s/ctdb-event",
-                                              CTDB_HELPER_BINDIR);
-       }
+       char *event_helper = NULL;
 
+       event_helper = path_helperdir_append(mem_ctx, "ctdb-event");
        if (event_helper == NULL) {
                fprintf(stderr, "Unable to set event daemon helper\n");
                return 1;
@@ -5693,21 +5677,13 @@ static int control_natgw(TALLOC_CTX *mem_ctx,
                         int argc,
                         const char **argv)
 {
-       char *t, *natgw_helper = NULL;
+       char *natgw_helper = NULL;
 
        if (argc != 1) {
                usage("natgw");
        }
 
-       t = getenv("CTDB_NATGW_HELPER");
-       if (t != NULL) {
-               natgw_helper = talloc_strdup(mem_ctx, t);
-       } else {
-               natgw_helper = talloc_asprintf(mem_ctx,
-                                              "%s/ctdb_natgw",
-                                              CTDB_HELPER_BINDIR);
-       }
-
+       natgw_helper = path_helperdir_append(mem_ctx, "ctdb_natgw");
        if (natgw_helper == NULL) {
                fprintf(stderr, "Unable to set NAT gateway helper\n");
                return 1;