Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
This commit is contained in:
Marko
117
Development/branching-and-tagging.md
Normal file
117
Development/branching-and-tagging.md
Normal file
@ -0,0 +1,117 @@
|
||||
# Branching and Tagging
|
||||
|
||||
## Overview
|
||||
|
||||
This document describes how git branches and tags are used in the MaxScale
|
||||
development.
|
||||
|
||||
## Release Numbering
|
||||
|
||||
The releases of MaxScale are numbered as `X.Y.Z` where `X` is the major
|
||||
version, `Y` is the minor version, and `Z` is the maintenance version.
|
||||
|
||||
`X` changes very rarely and is currently `2`. `Y` is incremented when new
|
||||
features are introduced and `Z` is incremented in conjunction with bug
|
||||
fixes.
|
||||
|
||||
When `X` changes, `Y` is reset to 0 and when `Y` changes, `Z` is reset to
|
||||
0.
|
||||
|
||||
## Branches
|
||||
|
||||
There are two kinds of minor branches in MaxScale; branches named as
|
||||
`X.Y`, such as `2.1` and `2.2` and the branch `develop`.
|
||||
|
||||
The development of the _next_ minor release takes place in `develop`.
|
||||
|
||||
The only development that takes place in an `X.Z` branch is related to bug
|
||||
fixes. Occasionally, due to explicit customer demand, feature development
|
||||
may also take place.
|
||||
|
||||
## Maintenance Releases
|
||||
|
||||
Suppose the last released version is `2.1.6`.
|
||||
|
||||
Any bug fixes related to version `2.1.6` are now pushed to `2.1`. When
|
||||
there are "enough" bug fixes, or at least one and enough time has passed
|
||||
since the last release, a new tag is created.
|
||||
```
|
||||
git checkout 2.1
|
||||
git tag -a maxscale-2.1.7-tt1
|
||||
git push --tags origin
|
||||
```
|
||||
The suffix `-tt1` stands for _tentative tag 1_, because before the
|
||||
test-suite has been run and all packages have been built (using that tag),
|
||||
we do not know with certainty whether that commit actually will be the
|
||||
release `2.1.7`.
|
||||
|
||||
If there are problems, then those are fixed and a new tag
|
||||
`maxscale-2.1.7-tt2` is created. That continues until there are no issues
|
||||
left. Typically a few iterations are needed.
|
||||
|
||||
Once all is green, the final tag is created.
|
||||
```
|
||||
git checkout maxscale-2.1.7-tt2`
|
||||
git tag -a maxscale-2.1.7
|
||||
```
|
||||
but the packages are not rebuilt. At this point, the tentative tags are
|
||||
removed:
|
||||
```
|
||||
git tag -d maxscale-2.1.7-tt1
|
||||
git tag -d maxscale-2.1.7-tt2
|
||||
git push origin :refs/tags/maxscale-2.1.7-tt1
|
||||
git push origin :refs/tags/maxscale-2.1.7-tt2
|
||||
```
|
||||
At this point, the _branch_ `2.1.7` is also created:
|
||||
```
|
||||
git checkout maxscale-2.1.7
|
||||
git checkout -b 2.1.7
|
||||
git push origin 2.1.7
|
||||
```
|
||||
This branch is **only** used for updating the documentation, if there is
|
||||
an urgent need for doing that. There is always one need; once the packages
|
||||
have been uploaded to the download site and we know the exact date when
|
||||
they will be made available, the release date is added in the release notes.
|
||||
```
|
||||
git checkout 2.1.7
|
||||
# Update the release date
|
||||
git add Documentation/Release-Notes/MaxScale-2.1.7-Release-Notes.md
|
||||
git commit
|
||||
git push origin 2.1.7
|
||||
```
|
||||
The next step is to merge that branch into the corresponding minor branch.
|
||||
```
|
||||
git checkout 2.1
|
||||
git merge 2.1.7
|
||||
```
|
||||
Now the updated minor branch should be merged upwards until we reach
|
||||
`develop`.
|
||||
```
|
||||
git checkout 2.2
|
||||
git merge 2.1
|
||||
git checkout develop
|
||||
git merge 2.2
|
||||
```
|
||||
|
||||
## Feature Releases
|
||||
|
||||
Feature releases are always the next minor version and the development
|
||||
takes place in `develop`.
|
||||
|
||||
The procedure is roughly similar to that releated to maintenance releases
|
||||
but with an inital deviation.
|
||||
|
||||
Once the development of the next minor release is close to readiness, the
|
||||
new minor release branch is created.
|
||||
```
|
||||
git checkout develop
|
||||
git checkout -b 2.3
|
||||
git push origin 2.3
|
||||
```
|
||||
After this, all commits related to the next release, are pushed to the
|
||||
branch `2.3`. If there already is development related to the minor release
|
||||
following that, those commits are pushed to `develop`.
|
||||
|
||||
Hereafter the procedure is exactly like the one of a maintenance
|
||||
release. The first tag will be `maxscale-2.3.0-tt1`, the final tag will be
|
||||
`maxscale-2.3.0` and the branch `2.3.0`.
|
||||
@ -28,6 +28,7 @@
|
||||
the master. There is also limited capability for rejoining nodes.
|
||||
|
||||
For more details, please refer to:
|
||||
* [MariaDB MaxScale 2.2.8 Release Notes](Release-Notes/MaxScale-2.2.8-Release-Notes.md)
|
||||
* [MariaDB MaxScale 2.2.7 Release Notes](Release-Notes/MaxScale-2.2.7-Release-Notes.md)
|
||||
* [MariaDB MaxScale 2.2.6 Release Notes](Release-Notes/MaxScale-2.2.6-Release-Notes.md)
|
||||
* [MariaDB MaxScale 2.2.5 Release Notes](Release-Notes/MaxScale-2.2.5-Release-Notes.md)
|
||||
|
||||
34
Documentation/Release-Notes/MaxScale-2.2.8-Release-Notes.md
Normal file
34
Documentation/Release-Notes/MaxScale-2.2.8-Release-Notes.md
Normal file
@ -0,0 +1,34 @@
|
||||
# MariaDB MaxScale 2.2.8 Release Notes -- Not Released
|
||||
|
||||
Release 2.2.8 is a GA release.
|
||||
|
||||
This document describes the changes in release 2.2.8, when compared to
|
||||
release 2.2.7.
|
||||
|
||||
For any problems you encounter, please consider submitting a bug
|
||||
report at [Jira](https://jira.mariadb.org).
|
||||
|
||||
## Bug fixes
|
||||
|
||||
* [MXS-1889](https://jira.mariadb.org/browse/MXS-1889) A single remaining master is valid for readconnroute configured with 'router_options=slave'
|
||||
* [MXS-1740](https://jira.mariadb.org/browse/MXS-1740) Hintfilter leaks memory
|
||||
|
||||
## Known Issues and Limitations
|
||||
|
||||
There are some limitations and known issues within this version of MaxScale.
|
||||
For more information, please refer to the [Limitations](../About/Limitations.md) document.
|
||||
|
||||
## Packaging
|
||||
|
||||
RPM and Debian packages are provided for the Linux distributions supported
|
||||
by MariaDB Enterprise.
|
||||
|
||||
Packages can be downloaded [here](https://mariadb.com/downloads/mariadb-tx/maxscale).
|
||||
|
||||
## Source Code
|
||||
|
||||
The source code of MaxScale is tagged at GitHub with a tag, which is identical
|
||||
with the version of MaxScale. For instance, the tag of version X.Y.Z of MaxScale
|
||||
is X.Y.Z. Further, *master* always refers to the latest released non-beta version.
|
||||
|
||||
The source code is available [here](https://github.com/mariadb-corporation/MaxScale).
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
|
||||
set(MAXSCALE_VERSION_MINOR "2" CACHE STRING "Minor version")
|
||||
set(MAXSCALE_VERSION_PATCH "8" CACHE STRING "Patch version")
|
||||
set(MAXSCALE_VERSION_PATCH "9" CACHE STRING "Patch version")
|
||||
|
||||
# This should only be incremented if a package is rebuilt
|
||||
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")
|
||||
|
||||
@ -104,6 +104,7 @@ typedef enum qc_query_op
|
||||
QUERY_OP_EXPLAIN,
|
||||
QUERY_OP_GRANT,
|
||||
QUERY_OP_INSERT,
|
||||
QUERY_OP_LOAD_LOCAL,
|
||||
QUERY_OP_LOAD,
|
||||
QUERY_OP_REVOKE,
|
||||
QUERY_OP_SELECT,
|
||||
|
||||
@ -480,6 +480,7 @@ public:
|
||||
SHA1Checksum()
|
||||
{
|
||||
SHA1_Init(&m_ctx);
|
||||
m_sum.fill(0); // CentOS 6 doesn't like aggregate initialization...
|
||||
}
|
||||
|
||||
void update(GWBUF* buffer)
|
||||
|
||||
@ -613,6 +613,10 @@ add_test_executable(mxs1507_inconsistent_trx.cpp mxs1507_inconsistent_trx mxs150
|
||||
# https://jira.mariadb.org/browse/MXS-1507
|
||||
add_test_executable(mxs1507_migrate_trx.cpp mxs1507_migrate_trx mxs1507_trx_replay LABELS readwritesplit REPL_BACKEND)
|
||||
|
||||
# MXS-1507: Transaction replay
|
||||
# https://jira.mariadb.org/browse/MXS-1507
|
||||
add_test_executable(mxs1507_trx_stress.cpp mxs1507_trx_stress mxs1507_trx_stress LABELS readwritesplit REPL_BACKEND)
|
||||
|
||||
# MXS-1509: Show correct server state for multisource replication
|
||||
# https://jira.mariadb.org/browse/MXS-1509
|
||||
add_test_executable(mxs1509.cpp mxs1509 mxs1509 LABELS mysqlmon REPL_BACKEND)
|
||||
@ -713,6 +717,10 @@ add_test_executable(mxs1831_unknown_param.cpp mxs1831_unknown_param replication
|
||||
# https://jira.mariadb.org/browse/MXS-1873
|
||||
add_test_executable(mxs1873_large_sescmd.cpp mxs1873_large_sescmd replication LABELS readwritesplit REPL_BACKEND)
|
||||
|
||||
# MXS-1896: LOAD DATA INFILE is mistaken for LOAD DATA LOCAL INFILE
|
||||
# https://jira.mariadb.org/browse/MXS-1896
|
||||
add_test_executable(mxs1896_load_data_infile.cpp mxs1896_load_data_infile replication LABELS readwritesplit REPL_BACKEND)
|
||||
|
||||
# 'namedserverfilter' test
|
||||
add_test_executable(namedserverfilter.cpp namedserverfilter namedserverfilter LABELS namedserverfilter LIGHT REPL_BACKEND)
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4,server5
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
detect_replication_lag=1
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxuser
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -7,7 +7,6 @@ log_debug=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
monitor_interval=10000
|
||||
servers=server1,server2,server3,server4
|
||||
detect_replication_lag=1
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -7,7 +7,6 @@ auth_write_timeout=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
monitor_interval=10000
|
||||
servers=server1,server2,server3,server4
|
||||
user=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ auth_connect_timeout=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ query_classifier_args=log_unrecognized_statements=3
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -10,7 +10,6 @@ protocol=MySQLBackend
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -7,7 +7,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[galera Monitor]
|
||||
type=monitor
|
||||
module=galeramon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mariadbmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mariadbmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
detect_replication_lag=1
|
||||
user=maxskysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_info=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1,server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_info=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -7,7 +7,6 @@ auth_connect_timeout=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1,server2
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_info=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_info=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_info=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -0,0 +1,63 @@
|
||||
[maxscale]
|
||||
threads=###threads###
|
||||
log_info=1
|
||||
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
monitor_interval=1000
|
||||
backend_connect_timeout=1
|
||||
backend_read_timeout=1
|
||||
|
||||
|
||||
[RW Split Router]
|
||||
type=service
|
||||
router=readwritesplit
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
transaction_replay=true
|
||||
delayed_retry_timeout=30
|
||||
|
||||
[RW Split Listener]
|
||||
type=listener
|
||||
service=RW Split Router
|
||||
protocol=MySQLClient
|
||||
port=4006
|
||||
|
||||
[CLI]
|
||||
type=service
|
||||
router=cli
|
||||
|
||||
[CLI Listener]
|
||||
type=listener
|
||||
service=CLI
|
||||
protocol=maxscaled
|
||||
socket=default
|
||||
|
||||
[server1]
|
||||
type=server
|
||||
address=###node_server_IP_1###
|
||||
port=###node_server_port_1###
|
||||
protocol=MySQLBackend
|
||||
|
||||
[server2]
|
||||
type=server
|
||||
address=###node_server_IP_2###
|
||||
port=###node_server_port_2###
|
||||
protocol=MySQLBackend
|
||||
|
||||
[server3]
|
||||
type=server
|
||||
address=###node_server_IP_3###
|
||||
port=###node_server_port_3###
|
||||
protocol=MySQLBackend
|
||||
|
||||
[server4]
|
||||
type=server
|
||||
address=###node_server_IP_4###
|
||||
port=###node_server_port_4###
|
||||
protocol=MySQLBackend
|
||||
@ -5,7 +5,6 @@ query_classifier_args=log_unrecognized_statements=3
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -28,7 +28,6 @@ protocol=MySQLBackend
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL-Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
password=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL-Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL-Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -4,7 +4,6 @@ threads=###threads###
|
||||
[MySQL-Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers=server1,server2,server3,server4
|
||||
user=maxskysql
|
||||
passwd=skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2,server3 ,server4
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
@ -5,7 +5,6 @@ log_warning=1
|
||||
[MySQL Monitor]
|
||||
type=monitor
|
||||
module=mysqlmon
|
||||
###repl51###
|
||||
servers= server1, server2
|
||||
user=maxskysql
|
||||
passwd= skysql
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user