ctdb-daemon: Add an environment variable to set version

This can be used to test the version checking logic.  Cache the
version to avoid re-checking the environment variable each time.

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

diff --git a/ctdb/server/ctdb_keepalive.c b/ctdb/server/ctdb_keepalive.c
index a4569ec2502265af2d0ebed32e8a210339a24ad1..b4c9d3731c4502763034d7bf4e2fb13793e75770 100644 (file)
--- a/ctdb/server/ctdb_keepalive.c
+++ b/ctdb/server/ctdb_keepalive.c
@@ -39,7 +39,27 @@
 
 static uint32_t keepalive_version(void)
 {
-       return (SAMBA_VERSION_MAJOR << 16) | SAMBA_VERSION_MINOR;
+       static uint32_t version = 0;
+
+       if (version == 0) {
+               const char *t;
+
+               version = (SAMBA_VERSION_MAJOR << 16) | SAMBA_VERSION_MINOR;
+
+               t = getenv("CTDB_TEST_SAMBA_VERSION");
+               if (t != NULL) {
+                       int v;
+
+                       v = atoi(t);
+                       if (v <= 0) {
+                               DBG_WARNING("Failed to parse env var: %s\n", t);
+                       } else {
+                               version = v;
+                       }
+               }
+       }
+
+       return version;
 }
 
 static uint32_t keepalive_uptime(struct ctdb_context *ctdb)

diff --git a/ctdb/tests/README b/ctdb/tests/README
index c911dd8f68d2a9b0e9f597cb046406ecbbef660b..bbda3313850ed41dff2bbb4abdcb6b01b85af406 100644 (file)
--- a/ctdb/tests/README
+++ b/ctdb/tests/README
@@ -162,6 +162,17 @@ Test and debugging variable options
 
           Default is no.
 
+       CTDB_TEST_SAMBA_VERSION=VERSION
+
+           VERSION is a 32-bit number containg the Samba major
+           version in the most significant 16 bits and the minor
+           version in the least significant 16 bits.  This can be
+           used to test CTDB's checking of incompatible versions
+           without installing an incompatible version.  This is
+           probably best set like this:
+
+               export CTDB_TEST_SAMBA_VERSION=$(( (4 << 16) | 12 ))
+
        CTDB_VARDIR=DIRECTORY
           DIRECTORY containing CTDB files that are modified at runtime.