From 8917458505b3b2b6b6fbd10de26cd698c3d3e5b2 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Wed, 30 May 2018 21:05:10 +0300
Subject: [PATCH] MXS-1890 Make it easier to run tests using local MaxScale

Now, if a test is invoked with '-l', then MaxScale is assumed to
be running locally using a configuration file suitable for the
test that is invoked. Further, at the end of the test, the log
files of MaxScale are not downloaded (obviously).

As a side-effect, an environment variable no_maxscale_log_copy,
similar to the existing no_backend_log_copy, has been introduced
using which the downloading of maxscale log files unconditionally
can be prevented.
---
 maxscale-system-test/testconnections.cpp | 67 +++++++++++++++++-------
 maxscale-system-test/testconnections.h   |  7 ++-
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/maxscale-system-test/testconnections.cpp b/maxscale-system-test/testconnections.cpp
index a2d6f908b..1c9e75f26 100644
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@@ -69,6 +69,7 @@ TestConnections::TestConnections(int argc, char *argv[]):
     global_result(0),
     use_snapshots(false),
     no_backend_log_copy(false),
+    no_maxscale_log_copy(false),
     verbose(false),
     smoke(true),
     binlog_cmd_option(0),
@@ -104,15 +105,17 @@ TestConnections::TestConnections(int argc, char *argv[]):
     static struct option long_options[] =
     {
 
-        {"verbose", no_argument, 0, 'v'},
-        {"silent", no_argument, 0, 'n'},
-        {"help", no_argument, 0, 'h'},
+        {"help",              no_argument, 0, 'h'},
+        {"verbose",           no_argument, 0, 'v'},
+        {"silent",            no_argument, 0, 'n'},
+        {"quiet",             no_argument, 0, 'q'},
         {"no-maxscale-start", no_argument, 0, 's'},
-        {"no-nodes-check", no_argument, 0, 'r'},
-        {"quiet", no_argument, 0, 'q'},
-        {"restart-galera", no_argument, 0, 'g'},
-        {"no-timeouts", no_argument, 0, 'z'},
-        {"no-galera", no_argument, 0, 'y'},
+        {"no-maxscale-init",  no_argument, 0, 'i'},
+        {"no-nodes-check",    no_argument, 0, 'r'},
+        {"restart-galera",    no_argument, 0, 'g'},
+        {"no-timeouts",       no_argument, 0, 'z'},
+        {"no-galera",         no_argument, 0, 'y'},
+        {"local-maxscale",    no_argument, 0, 'l'},
         {0, 0, 0, 0}
     };
 
@@ -120,7 +123,7 @@ TestConnections::TestConnections(int argc, char *argv[]):
     int option_index = 0;
     bool restart_galera = false;
 
-    while ((c = getopt_long(argc, argv, "vnqhsirgzy", long_options, &option_index)) != -1)
+    while ((c = getopt_long(argc, argv, "hvnqsirgzyl", long_options, &option_index)) != -1)
     {
         switch (c)
         {
@@ -137,22 +140,25 @@ TestConnections::TestConnections(int argc, char *argv[]):
             break;
 
         case 'h':
-            printf("Options:\n"
-                   "-h, --help\n"
-                   "-v, --verbose\n"
-                   "-q, --silent\n"
-                   "-s, --no-maxscale-start\n"
-                   "-i, --no-maxscale-init\n"
-                   "-g, --restart-galera\n"
-                   "-y, --no-galera\n"
-                   "-z, --no-timeouts\n");
-            exit(0);
+            {
+                printf("Options:\n");
+
+                struct option *o = long_options;
+
+                while (o->name)
+                {
+                    printf("-%c, --%s\n", o->val, o->name);
+                    ++o;
+                }
+                exit(0);
+            }
             break;
 
         case 's':
             printf("Maxscale won't be started\n");
             maxscale::start = false;
             break;
+
         case 'i':
             printf("Maxscale won't be started and Maxscale.cnf won't be uploaded\n");
             maxscale_init = false;
@@ -177,6 +183,15 @@ TestConnections::TestConnections(int argc, char *argv[]):
             no_galera = true;
             break;
 
+        case 'l':
+            printf("MaxScale assumed to be running locally; not started and logs not downloaded.\n");
+            maxscale_init = false;
+            no_maxscale_log_copy = true;
+            setenv("maxscale_IP", "127.0.0.1", true);
+            setenv("maxscale_network", "127.0.0.1", true);
+            setenv("maxscale_private_ip", "127.0.0.1", true);
+            break;
+
         default:
             printf("UNKNOWN OPTION: %c\n", c);
             break;
@@ -423,6 +438,11 @@ void TestConnections::read_env()
     {
         no_backend_log_copy = true;
     }
+    env = getenv("no_maxscale_log_copy");
+    if ((env != NULL) && ((strcasecmp(env, "yes") == 0) || (strcasecmp(env, "true") == 0) ))
+    {
+        no_maxscale_log_copy = true;
+    }
     env = getenv("use_ipv6");
     if ((env != NULL) && ((strcasecmp(env, "yes") == 0) || (strcasecmp(env, "true") == 0) ))
     {
@@ -723,7 +743,14 @@ int TestConnections::copy_all_logs()
         copy_mariadb_logs(galera, (char *) "galera");
     }
 
-    return (copy_maxscale_logs(0));
+    int rv = 0;
+
+    if (!no_maxscale_log_copy)
+    {
+        rv = copy_maxscale_logs(0);
+    }
+
+    return rv;
 }
 int TestConnections::copy_maxscale_logs(double timestamp)
 {
diff --git a/maxscale-system-test/testconnections.h b/maxscale-system-test/testconnections.h
index 828fe449f..324f8a54f 100644
--- a/maxscale-system-test/testconnections.h
+++ b/maxscale-system-test/testconnections.h
@@ -131,10 +131,15 @@ public:
     int copy_mariadb_logs(Mariadb_nodes *repl, char * prefix);
 
     /**
-     * @brief no_backend_log_copy if true logs from backends are not copied (needed if case of Aurora RDS backend or similar)
+     * @brief no_backend_log_copy if true logs from backends are not copied
+     *        (needed if case of Aurora RDS backend or similar)
      */
     bool no_backend_log_copy;
 
+    /**
+     * @brief Do not download MaxScale logs.
+     */
+    bool no_maxscale_log_copy;
     /**
      * @brief verbose if true more printing activated
      */