Merge branch '2.3.1' into 2.3

BUILD/install_build_deps.sh

@@ -16,7 +16,11 @@ then
        build-essential libssl-dev ncurses-dev bison flex \
        perl libtool libpcre3-dev tcl tcl-dev uuid \
        uuid-dev libsqlite3-dev liblzma-dev libpam0g-dev pkg-config \
-       libedit-dev libsystemd-dev
+       libedit-dev
+
+  # One of these will work, older systems use libsystemd-daemon-dev
+  sudo apt-get install -y libsystemd-dev || \
+      sudo apt-get install -y libsystemd-daemon-dev
 
   ## separatelibgnutls installation process for Ubuntu Trusty
   cat /etc/*release | grep -E "Trusty|wheezy"

Documentation/Getting-Started/Configuration-Guide.md

@@ -1988,3 +1988,9 @@ enabled MaxScale will check that all threads are running and notify systemd
 with a "keep-alive ping".
 
 Systemd reference: https://www.freedesktop.org/software/systemd/man/systemd.service.html
+
+*NOTE*: In 2.3.1 there is a deficiency that manifests itself so that if
+_any_ administrative operation, performed using _maxctrl_ or _maxadmin_,
+takes longer that the specified watchdog timeout, then the watchdog will
+kill and restart MaxScale. Please take that into account before enabling
+the watchdog.

Documentation/Reference/MaxAdmin.md

@@ -1,5 +1,7 @@
 # MaxAdmin - Admin Interface
 
+**NOTE:** MaxAdmin is deprecated, use [MaxCtrl](./MaxCtrl.md) instead.
+
 # The Maxscale Administrative & Monitoring Client Application
 
  - [Overview](#overview)

Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md

@@ -38,7 +38,7 @@ release. The functionality in `mmmon` has been largely obsoleted by the
 advancements in `mariadbmon`. The `ndbclustermon` is largely obsolete due to the
 fact that there are virtually no users who use it.
 
-### Deprecated options
+## Deprecated features
 
 The following configuration file options have been deprecated and will
 be removed in 2.4.
@@ -53,8 +53,19 @@ be removed in 2.4.
 
 ### MaxAdmin
 
-The commands `set pollsleep` and `set nbpolls` have been deprecated and
-will be removed in 2.4.
+MaxAdmin has been deprecated in favor of the REST API and MaxCtrl. It will be
+removed in a later release.
+
+In addition to this the commands `set pollsleep` and `set nbpolls` have been
+deprecated and will be removed already in 2.4.
+
+### MaxInfo
+
+The `maxinfo` router has been deprecated and will be removed in a later release.
+
+### Debugcli
+
+The `debugcli` module has been deprecated and will be removed in 2.4.
 
 ## New Features
 
@@ -89,9 +100,13 @@ enabled and MaxScale will behave accordingly. Please see the
 [documentation](Getting-Started/Configuration-Guide.md#systemd-watchdog)
 for more details.
 
-By default there will be a watchdog timeout of 30 seconds. That is, if
-MaxScale is hung, then systemd will detect that and restart MaxScale after
-slightly more than 30 seconds.
+By default the watchdog is disabled.
+
+*NOTE*: In 2.3.1 there is a deficiency that manifests itself so that if
+_any_ administrative operation, performed using _maxctrl_ or _maxadmin_,
+takes longer that the specified watchdog timeout, then the watchdog will
+kill and restart MaxScale. Please take that into account before enabling
+the watchdog.
 
 ### Miscellaneous
 

etc/maxscale.service.in

@@ -20,7 +20,9 @@ ExecStart=@CMAKE_INSTALL_PREFIX@/@MAXSCALE_BINDIR@/maxscale
 TimeoutStartSec=120
 LimitNOFILE=65535
 StartLimitBurst=0
-WatchdogSec=60s
+#Please see the MaxScale release notes and/or watchdog documentation
+#before turning the watchdog on.
+#WatchdogSec=60s
 
 # Only relevant when MaxScale is linked with -fsanitize=address
 Environment=ASAN_OPTIONS=abort_on_error=1

server/modules/routing/cli/cli.cc

@@ -63,7 +63,7 @@ extern int execute_cmd(CLI_SESSION* cli);
  */
 extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
-    MXS_NOTICE("Initialise CLI router module");
+    MXS_WARNING("THE 'cli' MODULE AND 'maxadmin' ARE DEPRECATED: Use 'maxctrl' instead");
 
     static MXS_ROUTER_OBJECT MyObject =
     {

server/modules/routing/debugcli/debugcli.cc

@@ -65,7 +65,7 @@ static CLI_INSTANCE* instances;
  */
 extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
-    MXS_NOTICE("Initialise debug CLI router module.");
+    MXS_WARNING("THE 'debugcli' MODULE IS DEPRECATED");
     pthread_mutex_init(&instlock, NULL);
     instances = NULL;
 

server/modules/routing/maxinfo/maxinfo.cc

@@ -93,7 +93,7 @@ static INFO_INSTANCE* instances;
  */
 extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
-    MXS_NOTICE("Initialise MaxInfo router module.");
+    MXS_WARNING("THE 'maxinfo' MODULE IS DEPRECATED");
     pthread_mutex_init(&instlock, NULL);
     instances = NULL;