From 31859ee486c9b136cd67b3eb60c164cf2926241c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Tue, 30 Oct 2018 11:26:07 +0200
Subject: [PATCH] Remove ses_bigmem test

The test doesn't work when ASAN is used as it increases the memory use of
the process. With the addition of more caches in 2.3, the test is also
more likely to fail. Due to the test being quite useless with ASAN, it is
better to remove it.
---
 maxscale-system-test/CMakeLists.txt           |  3 -
 .../maxscale.cnf.template.no_ses_cmd_store    | 92 -------------------
 maxscale-system-test/ses_bigmem.cpp           | 52 -----------
 3 files changed, 147 deletions(-)
 delete mode 100755 maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store
 delete mode 100644 maxscale-system-test/ses_bigmem.cpp

diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index 2feaa1a80..305ca7857 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -755,9 +755,6 @@ add_test_executable(compound_statement.cpp compound_statement replication LABELS
 # Check if 'weightby' parameter works
 add_test_executable(server_weight.cpp server_weight galera.weight LABELS readwritesplit readconnroute LIGHT GALERA_BACKEND)
 
-# Executes a lot of session commands with "disable_sescmd_history=true" and check that memory consumption is not increasing
-add_test_executable(ses_bigmem.cpp ses_bigmem no_ses_cmd_store LABELS readwritesplit REPL_BACKEND)
-
 # test for 'max_sescmd_history' and 'connection_timeout' parameters
 add_test_executable(session_limits.cpp session_limits session_limits LABELS readwritesplit REPL_BACKEND)
 
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store b/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store
deleted file mode 100755
index ac07e5cfc..000000000
--- a/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store
+++ /dev/null
@@ -1,92 +0,0 @@
-[maxscale]
-threads=###threads###
-log_warning=1
-
-[MySQL Monitor]
-type=monitor
-module=mysqlmon
-###repl51###
-servers= server1, server2,server3  ,server4
-user=maxskysql
-passwd= skysql
-monitor_interval=1000
-
-[RW Split Router]
-type=service
-router= readwritesplit
-servers=server1,     server2,              server3,server4
-user=maxskysql
-passwd=skysql
-router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS,disable_sescmd_history=true
-max_slave_connections=1
-
-[Read Connection Router Slave]
-type=service
-router=readconnroute
-router_options= slave
-servers=server1,server2,server3,server4
-user=maxskysql
-passwd=skysql
-
-[Read Connection Router Master]
-type=service
-router=readconnroute
-router_options=master
-servers=server1,server2,server3,server4
-user=maxskysql
-passwd=skysql
-
-[RW Split Listener]
-type=listener
-service=RW Split Router
-protocol=MySQLClient
-port=4006
-#socket=/tmp/rwsplit.sock
-
-[Read Connection Listener Slave]
-type=listener
-service=Read Connection Router Slave
-protocol=MySQLClient
-port=4009
-
-[Read Connection Listener Master]
-type=listener
-service=Read Connection Router Master
-protocol=MySQLClient
-port=4008
-
-[CLI]
-type=service
-router=cli
-
-[CLI Listener]
-type=listener
-service=CLI
-protocol=maxscaled
-#address=localhost
-socket=default
-
-[server1]
-type=server
-address=###node_server_IP_1###
-port=###node_server_port_1###
-protocol=MySQLBackend
-
-[server2]
-type=server
-address=###node_server_IP_2###
-port=###node_server_port_2###
-protocol=MySQLBackend
-
-[server3]
-type=server
-address=###node_server_IP_3###
-port=###node_server_port_3###
-protocol=MySQLBackend
-
-[server4]
-type=server
-address=###node_server_IP_4###
-port=###node_server_port_4###
-protocol=MySQLBackend
-
diff --git a/maxscale-system-test/ses_bigmem.cpp b/maxscale-system-test/ses_bigmem.cpp
deleted file mode 100644
index e218908e6..000000000
--- a/maxscale-system-test/ses_bigmem.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @file ses_bigmem Executes a lot of session commands with "disable_sescmd_history=true" and check that memory consumption is not increasing
- * (relates to MXS-672 "maxscale possible memory leak"
- */
-
-
-#include <iostream>
-#include <unistd.h>
-#include "testconnections.h"
-
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-    TestConnections * Test = new TestConnections(argc, argv);
-    unsigned long maxscale_mem;
-
-    Test->set_timeout(10);
-
-    Test->maxscales->connect_maxscale(0);
-    int iterations = Test->smoke ? 100000 : 1000000;
-    int r = Test->smoke ? 1 : 3;
-
-    for (int j = 0; j < r; j++)
-    {
-        for (int i = 0; i < iterations; i++)
-        {
-            Test->set_timeout(10);
-            Test->try_query(Test->maxscales->routers[0][j], (char*) "set autocommit=0;");
-            Test->try_query(Test->maxscales->routers[0][j], (char*) "select 1;");
-            Test->try_query(Test->maxscales->routers[0][j], (char*) "set autocommit=1;");
-            Test->try_query(Test->maxscales->routers[0][j], (char*) "select 2;");
-            if ((i / 1000) * 1000 == i)
-            {
-                Test->tprintf("i=%d\n", i);
-            }
-        }
-
-        maxscale_mem = Test->maxscales->get_maxscale_memsize(0);
-        Test->tprintf("Maxscale process uses %lu KBytes\n", maxscale_mem);
-
-        if (maxscale_mem > 2000000)
-        {
-            Test->add_result(1, "Maxscale consumes too much memory\n");
-        }
-    }
-
-    Test->check_maxscale_alive(0);
-    int rval = Test->global_result;
-    delete Test;
-    return rval;
-}