Merge branch '2.3' into 2.4

system-test/mxs2313_rank.cpp

@@ -0,0 +1,173 @@
+/**
+ * MXS-2313: `rank` functional tests
+ * https://jira.mariadb.org/browse/MXS-2313
+ */
+
+#include <maxtest/testconnections.hh>
+#include <iostream>
+
+std::function<void(int)> block_wait;
+std::function<void(int)> unblock_wait;
+
+void test_rwsplit(TestConnections& test, std::vector<std::string> ids)
+{
+    std::cout << "Servers in two groups with different ranks" << std::endl;
+
+    test.check_maxctrl("alter server server1 rank primary");
+    test.check_maxctrl("alter server server2 rank primary");
+    test.check_maxctrl("alter server server3 rank secondary");
+    test.check_maxctrl("alter server server4 rank secondary");
+
+    Connection c = test.maxscales->rwsplit();
+
+    auto is_primary = [&]() {
+            auto id = c.field("SELECT @@server_id");
+            test.expect(id == ids[0] || id == ids[1], "Primary servers should reply");
+        };
+    auto is_secondary = [&]() {
+            auto id = c.field("SELECT @@server_id");
+            test.expect(id == ids[2] || id == ids[3], "Secondary servers should reply");
+        };
+
+    c.connect();
+    is_primary();
+
+    block_wait(0);
+    is_primary();
+
+    block_wait(1);
+    is_secondary();
+
+    block_wait(2);
+    is_secondary();
+
+    block_wait(3);
+    test.expect(!c.query("SELECT @@server_id"), "Query should fail");
+
+    unblock_wait(3);
+    c.disconnect();
+    c.connect();
+    is_secondary();
+
+    unblock_wait(2);
+    is_secondary();
+
+    unblock_wait(1);
+    is_secondary();
+
+    unblock_wait(0);
+    is_secondary();
+
+    test.expect(c.query("SELECT @@server_id, @@last_insert_id"), "Query should work");
+    is_primary();
+
+    std::cout << "Grouping servers into a three-node cluster with one low-ranking server" << std::endl;
+
+    test.check_maxctrl("alter server server1 rank primary");
+    test.check_maxctrl("alter server server2 rank primary");
+    test.check_maxctrl("alter server server3 rank primary");
+    test.check_maxctrl("alter server server4 rank secondary");
+
+    c.disconnect();
+    c.connect();
+
+    block_wait(0);
+    auto id = c.field("SELECT @@server_id");
+    test.expect(!id.empty() && id != ids[3], "Third slave should not reply");
+
+    block_wait(1);
+    id = c.field("SELECT @@server_id");
+    test.expect(!id.empty() && id != ids[3], "Third slave should not reply");
+
+    block_wait(2);
+    test.expect(c.field("SELECT @@server_id") == ids[3], "Third slave should reply");
+
+    for (int i = 0; i < 3; i++)
+    {
+        unblock_wait(i);
+        test.expect(c.field("SELECT @@server_id") == ids[3], "Third slave should reply");
+    }
+
+    block_wait(3);
+    id = c.field("SELECT @@server_id");
+    test.expect(!id.empty() && id != ids[3], "Third slave should not reply");
+    unblock_wait(3);
+}
+
+void test_readconnroute(TestConnections& test, std::vector<std::string> ids)
+{
+    std::cout << "Readconnroute with descending server rank" << std::endl;
+
+    test.check_maxctrl("alter server server1 rank primary");
+    test.check_maxctrl("alter server server2 rank primary");
+    test.check_maxctrl("alter server server3 rank secondary");
+    test.check_maxctrl("alter server server4 rank secondary");
+
+    auto do_test = [&](int node) {
+            Connection c = test.maxscales->readconn_master();
+            c.connect();
+            test.expect(c.field("SELECT @@server_id") == ids[node], "server%d should reply", node + 1);
+        };
+
+    do_test(0);
+    block_wait(0);
+    do_test(1);
+    block_wait(1);
+    do_test(2);
+    block_wait(2);
+    do_test(3);
+    unblock_wait(2);
+    do_test(2);
+    unblock_wait(1);
+    do_test(1);
+    unblock_wait(0);
+    do_test(0);
+}
+
+void test_hints(TestConnections& test, std::vector<std::string> ids)
+{
+    std::cout << "Test that routing hints override server rank" << std::endl;
+
+    test.check_maxctrl("alter server server1 rank primary");
+    test.check_maxctrl("alter server server2 rank primary");
+    test.check_maxctrl("alter server server3 rank primary");
+    test.check_maxctrl("alter server server4 rank secondary");
+
+    Connection c = test.maxscales->rwsplit();
+    c.connect();
+
+    auto id = c.field("SELECT @@server_id -- maxscale route to server server4");
+    test.expect(!id.empty() && id == ids[3], "Third slave should reply");
+
+    id = c.field("SELECT @@server_id -- maxscale route to slave");
+    test.expect(!id.empty() && (id == ids[1] || id == ids[2]), "Primary slave should reply");
+
+    id = c.field("SELECT @@server_id -- maxscale route to master");
+    test.expect(!id.empty() && id == ids[0], "Master should reply");
+}
+
+int main(int argc, char* argv[])
+{
+    TestConnections test(argc, argv);
+
+    block_wait = [&](int node) {
+            std::cout << "Block server" << (node + 1) << std::endl;
+            test.repl->block_node(node);
+            test.maxscales->wait_for_monitor(2);
+        };
+    unblock_wait = [&](int node) {
+            std::cout << "Unblock server" << (node + 1) << std::endl;
+            test.repl->unblock_node(node);
+            test.maxscales->wait_for_monitor(2);
+        };
+
+    test.repl->connect();
+    auto ids = test.repl->get_all_server_ids_str();
+    test.repl->disconnect();
+
+    test_rwsplit(test, ids);
+    test_readconnroute(test, ids);
+    test_hints(test, ids);
+
+    return test.global_result;
+}