ctdb-tool: Print a warning when setting an obsolete tunable variable

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh b/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
index 6c3fbd533cf6d00dd397348096bcb690ea9f0949..6fd2dbfef126ab6b3588be79fb92414d1e71ab14 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
@@ -12,6 +12,7 @@ CTDB_SET_EventScriptUnhealthyOnTimeout=0
 EOF
 
 required_result 0 <<EOF
+Setting obsolete tunable variable 'EventScriptUnhealthyOnTimeout'
 Set EventScriptUnhealthyOnTimeout to 0
 Set MonitorInterval to 5
 EOF

diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/eventscripts/stubs/ctdb
index b9524b1968d51c9bbd2695482ace2dd55927cc8c..cdb60134d69d0091188e5e3ac7e3f51a1b4e227d 100755 (executable)
--- a/ctdb/tests/eventscripts/stubs/ctdb
+++ b/ctdb/tests/eventscripts/stubs/ctdb
@@ -317,6 +317,7 @@ ctdb_setvar ()
 
     for _i in $FAKE_CTDB_TUNABLES_OBSOLETE ; do
        if [ "$_var" = "$_i" ] ; then
+           echo "Setting obsolete tunable variable '${_var}'"
            return 0
        fi
     done

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 4654f3cf432802b41a2a2265a252459c3546ad8a..b420dcd23a91d0f5def11ea35430b1758189c001 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -4839,6 +4839,11 @@ static int control_setvar(struct ctdb_context *ctdb, int argc, const char **argv
                DEBUG(DEBUG_ERR, ("Unable to set tunable variable '%s'\n", name));
                return -1;
        }
+       if (ret == 1) {
+               DEBUG(DEBUG_WARNING,
+                     ("Setting obsolete tunable variable '%s'\n",
+                      name));
+       }
        return 0;
 }