MXS-2428 Allow fixed Clustrix configuration

If 'dynamic_node_detection' has been set to false, then the
Clustrix monitor will not dynamically figure out what nodes are
available, but instead use the bootstrap nodes as such.

With 'dynamic_node_detection' being false, the Clustrix monitor
will do no cluster checks, but simply ping the health port of
each server.

Documentation/Monitors/Clustrix-Monitor.md

@@ -102,7 +102,7 @@ health_check_threshold=3
 ### `dynamic_node_detection`
 
 By default, the Clustrix monitor will only use the bootstrap nodes
-in order to connect to the Clustrux cluster and then find out the
+in order to connect to the Clustrix cluster and then find out the
 cluster configuration dynamically at runtime.
 
 That behaviour can be turned off with this optional parameter, in

server/modules/monitor/clustrixmon/clustrixmonitor.cc

@@ -248,9 +248,16 @@ void ClustrixMonitor::server_removed(SERVER* pServer)
 
 void ClustrixMonitor::pre_loop()
 {
-    // At startup we accept softfailed nodes in an attempt to be able to
+    if (m_config.dynamic_node_detection())
-    // connect at any cost. It'll be replaced once there is an alternative.
+    {
-    check_cluster(Clustrix::Softfailed::ACCEPT);
+        // At startup we accept softfailed nodes in an attempt to be able to
+        // connect at any cost. It'll be replaced once there is an alternative.
+        check_cluster(Clustrix::Softfailed::ACCEPT);
+    }
+    else
+    {
+        populate_from_bootstrap_servers();
+    }
 
     make_health_check();
 }
@@ -268,7 +275,7 @@ void ClustrixMonitor::post_loop()
 
 void ClustrixMonitor::tick()
 {
-    if (should_check_cluster())
+    if (m_config.dynamic_node_detection() && should_check_cluster())
     {
         check_cluster(Clustrix::Softfailed::REJECT);
     }
@@ -600,17 +607,7 @@ bool ClustrixMonitor::refresh_nodes(MYSQL* pHub_con)
                     node.set_running(false, ClustrixNode::APPROACH_OVERRIDE);
                 }
 
-                vector<string> health_urls;
+                update_http_urls();
-                for (const auto& element : m_nodes)
-                {
-                    const ClustrixNode& node = element.second;
-                    string url = "http://" + node.ip() + ":" + std::to_string(node.health_port());
-
-                    health_urls.push_back(url);
-                }
-
-                m_health_urls.swap(health_urls);
-
                 cluster_checked();
             }
             else
@@ -753,6 +750,37 @@ bool ClustrixMonitor::check_cluster_membership(MYSQL* pHub_con,
     return rv;
 }
 
+void ClustrixMonitor::populate_from_bootstrap_servers()
+{
+    int id = 1;
+
+    for (auto ms : m_servers)
+    {
+        SERVER* pServer = ms->server;
+
+        Clustrix::Status status = Clustrix::Status::UNKNOWN;
+        Clustrix::SubState substate = Clustrix::SubState::UNKNOWN;
+        int instance = 1;
+        ClustrixMembership membership(id, status, substate, instance);
+
+        std::string ip = pServer->address;
+        int mysql_port = pServer->port;
+        int health_port = m_config.health_check_port();
+        int health_check_threshold = m_config.health_check_threshold();
+
+        ClustrixNode node(this, membership, ip, mysql_port, health_port, health_check_threshold, pServer);
+
+        m_nodes.insert(make_pair(id, node));
+        ++id;
+
+        // New server, so it needs to be added to all services that
+        // use this monitor for defining its cluster of servers.
+        service_add_server(this, pServer);
+    }
+
+    update_http_urls();
+}
+
 void ClustrixMonitor::update_server_statuses()
 {
     mxb_assert(!m_servers.empty());
@@ -879,6 +907,20 @@ bool ClustrixMonitor::check_http(Call::action_t action)
     return false;
 }
 
+void ClustrixMonitor::update_http_urls()
+{
+    vector<string> health_urls;
+    for (const auto& element : m_nodes)
+    {
+        const ClustrixNode& node = element.second;
+        string url = "http://" + node.ip() + ":" + std::to_string(node.health_port());
+
+        health_urls.push_back(url);
+    }
+
+    m_health_urls.swap(health_urls);
+}
+
 bool ClustrixMonitor::perform_softfail(SERVER* pServer, json_t** ppError)
 {
     bool rv = perform_operation(Operation::SOFTFAIL, pServer, ppError);

server/modules/monitor/clustrixmon/clustrixmonitor.hh

@@ -123,11 +123,14 @@ private:
     bool check_cluster_membership(MYSQL* pHub_con,
                                   std::map<int, ClustrixMembership>* pMemberships);
 
+    void populate_from_bootstrap_servers();
+
     void update_server_statuses();
 
     void make_health_check();
     void initiate_delayed_http_check();
     bool check_http(Call::action_t action);
+    void update_http_urls();
 
     bool perform_softfail(SERVER* pServer, json_t** ppError);
     bool perform_unsoftfail(SERVER* pServer, json_t** ppError);