Merge branch '2.2' into develop

Documentation/REST-API/Resources-Monitor.md

@@ -269,7 +269,7 @@ The :name in the URI must map to a monitor name with all whitespace replaced wit
 hyphens. The request body must be a valid JSON document representing the modified monitor.
 
 ```
-PATCH /v1/monitor/:name
+PATCH /v1/monitors/:name
 ```
 
 ### Modifiable Fields
@@ -353,7 +353,7 @@ servers and if it does a PATCH request which removes these relationships is
 required before a DELETE request for the monitor can be made.
 
 ```
-DELETE /v1/monitor/:name/stop
+DELETE /v1/monitors/:name/stop
 ```
 
 #### Response
@@ -371,7 +371,7 @@ Monitor could not be deleted:
 Stops a started monitor.
 
 ```
-PUT /v1/monitor/:name/stop
+PUT /v1/monitors/:name/stop
 ```
 
 #### Response
@@ -385,7 +385,7 @@ Monitor is stopped:
 Starts a stopped monitor.
 
 ```
-PUT /v1/monitor/:name/start
+PUT /v1/monitors/:name/start
 ```
 
 #### Response

maxscale-system-test/different_size.cpp

@@ -100,6 +100,7 @@ void different_packet_size(TestConnections* Test, bool binlog)
     Test->tprintf("Restoring max_allowed_packet");
     set_max_packet(Test, binlog, (char*) "set global max_allowed_packet = 1048576;");
 
+    Test->set_timeout(300);
     conn = connect_to_serv(Test, binlog);
     Test->try_query(conn, "DROP TABLE test.large_event");
     mysql_close(conn);

maxscale-system-test/different_size_rwsplit.cpp

@@ -19,6 +19,7 @@ int main(int argc, char* argv[])
 
     different_packet_size(Test, false);
 
+    Test->set_timeout(180);
     Test->repl->sync_slaves();
     Test->check_maxscale_alive(0);
     int rval = Test->global_result;

maxscale-system-test/mdbci/cnf/galera_server1.cnf

@@ -1,7 +1,7 @@
 [mysqld]
 expire_logs_days=7
 user=mysql
-server_id=1
+server_id=101
 wsrep_on=ON
 
 # Row binary log format is required by Galera

maxscale-system-test/mdbci/cnf/galera_server2.cnf

@@ -1,7 +1,7 @@
 [mysqld]
 expire_logs_days=7
 user=mysql
-server_id=2
+server_id=102
 wsrep_on=ON
 
 # Row binary log format is required by Galera

maxscale-system-test/mdbci/cnf/galera_server3.cnf

@@ -1,7 +1,7 @@
 [mysqld]
 expire_logs_days=7
 user=mysql
-server_id=3
+server_id=103
 wsrep_on=ON
 
 # Row binary log format is required by Galera

maxscale-system-test/mdbci/cnf/galera_server4.cnf

@@ -1,7 +1,7 @@
 [mysqld]
 expire_logs_days=7
 user=mysql
-server_id=4
+server_id=104
 wsrep_on=ON
 
 # Row binary log format is required by Galera

server/modules/authenticator/MySQLAuth/dbusers.cc

@@ -1046,7 +1046,8 @@ static int get_users(SERV_LISTENER* listener, bool skip_local)
     for (server = service->dbref; !maxscale_is_shutting_down() && server; server = server->next)
     {
         if (!SERVER_REF_IS_ACTIVE(server) || !server_is_active(server->server)
-            || (skip_local && server_is_mxs_service(server->server)))
+            || (skip_local && server_is_mxs_service(server->server))
+            || !server_is_running(server->server))
         {
             continue;
         }

server/modules/routing/readwritesplit/rwsplit_route_stmt.cc

@@ -419,6 +419,7 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
     }
 
     MXS_INFO("Session write, routing to all servers.");
+    bool attempted_write = false;
 
     for (auto it = m_backends.begin(); it != m_backends.end(); it++)
     {
@@ -426,6 +427,7 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
 
         if (backend->in_use())
         {
+            attempted_write = true;
             backend->append_session_command(sescmd);
 
             uint64_t current_pos = backend->next_session_command()->get_position();
@@ -510,6 +512,11 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
             m_recv_sescmd++;
         }
     }
+    else
+    {
+        MXS_ERROR("Could not route session command: %s", attempted_write ? "Write to all backends failed" :
+                  "All connections have failed");
+    }
 
     return nsucc;
 }