From c3706e7fb07bcb35f7d894c4e8e0c12b4a62d0db Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Mon, 9 Feb 2015 10:33:35 +1100
Subject: [PATCH] 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>
---
 ctdb/tests/eventscripts/00.ctdb.setup.004.sh | 1 +
 ctdb/tests/eventscripts/stubs/ctdb           | 1 +
 ctdb/tools/ctdb.c                            | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh b/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
index 6c3fbd533cf..6fd2dbfef12 100755
--- 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 b9524b1968d..cdb60134d69 100755
--- 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 4654f3cf432..b420dcd23a9 100644
--- 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;
 }