diff --git a/Documentation/Getting-Started/Configuration-Guide.md b/Documentation/Getting-Started/Configuration-Guide.md index ed429acc6..23f47b2ba 100644 --- a/Documentation/Getting-Started/Configuration-Guide.md +++ b/Documentation/Getting-Started/Configuration-Guide.md @@ -1491,6 +1491,9 @@ can add a filter to a service and combine multiple filters in one service. ## Reloading Configuration +**Note:** This functionality has been deprecated. Use the MaxScale REST API or the + MaxAdmin `alter` commands to change configuration values at runtime. + The current MariaDB MaxScale configuration may be updated by editing the configuration file and then forcing MariaDB MaxScale to reread the configuration file. To force MariaDB MaxScale to reread the configuration file, send a SIGHUP diff --git a/Documentation/Reference/MaxAdmin.md b/Documentation/Reference/MaxAdmin.md index 008ae450c..a5f59861c 100644 --- a/Documentation/Reference/MaxAdmin.md +++ b/Documentation/Reference/MaxAdmin.md @@ -1336,6 +1336,9 @@ of the values to 0, disables the throttling. ## Reloading The Configuration +**Note:** This command has been deprecated. Use the MaxScale REST API or the + MaxAdmin `alter` commands to change configuration values at runtime. + A command, _reload config_, is available that will cause MariaDB MaxScale to reload the maxscale.cnf configuration file. Note that not all configuration changes are taken into effect when the configuration is reloaded. Refer to diff --git a/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md index 67f880235..11a95644d 100644 --- a/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md +++ b/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md @@ -104,11 +104,15 @@ The following commands have been deprecated: * `enable sessionlog-priority [debug|info|notice|warning]` * `disable sessionlog-priority [debug|info|notice|warning]` +* `reload config` -The commands can be issued, but have no effect. +The `{ enable | disable } sessionlog-priority` commands can be issued, but they +have no effect. + +#### Filenames as MaxAdmin Arguments MaxAdmin no longer attempts to interpret additional command line parameters as a -file name to load commands from (e.g. `maxadmin mycommands.txt`). The shell +file name to load commands from (e.g. `maxadmin mycommands.txt`). The shell indirection operator `<` should be used to achieve the same effect (`maxadmin < mycommands.txt`). diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c index 34e788dca..30f4c5cf0 100644 --- a/server/modules/routing/debugcli/debugcmd.c +++ b/server/modules/routing/debugcli/debugcmd.c @@ -672,7 +672,7 @@ struct subcommand reloadoptions[] = { { "config", 0, 0, reload_config, - "Reload the configuration", + "[Deprecated] Reload the configuration", "Usage: reload config", {0} }, @@ -2281,7 +2281,10 @@ reload_dbusers(DCB *dcb, SERVICE *service) static void reload_config(DCB *dcb) { - dcb_printf(dcb, "Reloading configuration from file.\n"); + dcb_printf(dcb, "Reloading configuration from file.\n\n" + "Warning! This command has been deprecated, please use the `alter`\n" + "commands or use the MaxScale REST API to change the configuration\n" + "at runtime.\n"); config_reload(); }