Merge branch 'develop' into 1.2.1-binlog_router_trx

This commit is contained in:
Markus Makela
2015-11-02 18:09:59 +02:00
3 changed files with 8 additions and 7 deletions

View File

@ -50,11 +50,11 @@ Please see the section about [Protocol Modules](#protocol-modules) for more deta
### Global Settings ### Global Settings
The global settings, in a section named `[MaxScale]`, allow various parameters that affect MaxScale as a whole to be tuned. Currently the only setting that is supported is the number of threads to use to handle the network traffic. MaxScale will also accept the section name of `[gateway]` for global settings. This is for backward compatibility with versions prior to the naming of MaxScale. The global settings, in a section named `[MaxScale]`, allow various parameters that affect MaxScale as a whole to be tuned.
#### `threads` #### `threads`
To control the number of threads that poll for network traffic set the parameter threads to a number. It is recommended that you start with a single thread and add more as you find the performance is not satisfactory. MaxScale is implemented to be very thread efficient, so a small number of threads is usually adequate to support reasonably heavy workloads. Adding more threads may not improve performance and can consume resources needlessly. This parameter controls the number of worker threads that are handling the events coming from the kernel. MaxScale will auto-detect the number of processors of the system unless number of threads is manually configured. It is recommended that you let MaxScale detect how many cores the system has and leave this parameter undefined. The number of used cores will be logged into the message logs and if you are not satisfied with the auto-detected value, you can manually configure it. Increasing the amount of worker threads beyond the number of processor cores does not improve performance and can consume resources needlessly.
``` ```
# Valid options are: # Valid options are:

View File

@ -14,7 +14,7 @@ router_options=master
servers=server1 servers=server1
user=maxuser user=maxuser
passwd=maxpwd passwd=maxpwd
filter=Hint filters=Hint
[Hint] [Hint]
type=filter type=filter

View File

@ -51,11 +51,11 @@ MariaDB [(none)]> grant SELECT on mysql.user to '*username*'@'*maxscalehost*';
Additionally, GRANT SELECT on the mysql.db table and SHOW DATABASES privileges are required in order to load databases name and grants suitable for database name authorization. Additionally, GRANT SELECT on the mysql.db table and SHOW DATABASES privileges are required in order to load databases name and grants suitable for database name authorization.
``` ```
MariaDB [(none)]> GRANT SELECT ON mysql.db TO 'username'@'maxscalehost'; MariaDB [(none)]> GRANT SELECT ON mysql.db TO '*username*'@'maxscalehost';
**Query OK, 0 rows affected (0.00 sec)** **Query OK, 0 rows affected (0.00 sec)**
MariaDB [(none)]> GRANT SHOW DATABASES ON *.* TO 'username'@'maxscalehost'; MariaDB [(none)]> GRANT SHOW DATABASES ON *.* TO '*username*'@'maxscalehost';
**Query OK, 0 rows affected (0.00 sec)** **Query OK, 0 rows affected (0.00 sec)**
``` ```
@ -76,7 +76,7 @@ If you wish to use two different usernames for the two different roles of monito
## Creating Your MaxScale Configuration ## Creating Your MaxScale Configuration
MaxScale configuration is held in an ini file that is located in the file maxscale.cnf in the directory /etc. This is not created as part of the installation process and must be manually created. A template file does exist in the `/usr/share/maxscale` folder that can be use as a basis for your configuration. MaxScale reads its configuration from `/etc/maxscale.cnf`. This is not created as part of the installation process and must be manually created. A template file does exist in the `/usr/share/maxscale` folder that can be use as a basis for your configuration.
A global, maxscale, section is included within every MaxScale configuration file; this is used to set the values of various MaxScale wide parameters, perhaps the most important of these is the number of threads that MaxScale will use to execute the code that forwards requests and handles responses for clients. A global, maxscale, section is included within every MaxScale configuration file; this is used to set the values of various MaxScale wide parameters, perhaps the most important of these is the number of threads that MaxScale will use to execute the code that forwards requests and handles responses for clients.
@ -220,6 +220,7 @@ module=mysqlmon
servers=dbserv1, dbserv2, dbserv3 servers=dbserv1, dbserv2, dbserv3
user=maxscale user=maxscale
passwd=96F99AA1315BDC3604B006F427DD9484 passwd=96F99AA1315BDC3604B006F427DD9484
monitor_interval=10000
``` ```
As with the password definition in the server either plain text or encrypted passwords may be used. As with the password definition in the server either plain text or encrypted passwords may be used.
@ -255,7 +256,7 @@ or
service maxscale start service maxscale start
``` ```
Check the error log in /var/log/lomaxscale/ to see if any errors are detected in the configuration file and to confirm MaxScale has been started. Also the maxadmin command may be used to confirm that MaxScale is running and the services, listeners etc have been correctly configured. Check the error log in /var/log/maxscale/ to see if any errors are detected in the configuration file and to confirm MaxScale has been started. Also the maxadmin command may be used to confirm that MaxScale is running and the services, listeners etc have been correctly configured.
``` ```
% maxadmin -pmariadb list services % maxadmin -pmariadb list services