hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2019-01-07 10:33:34 +02:00
parent a4540b5cee 2172c4ca85
commit 0859f3caff
8 changed files with 113 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/Changelog.md
View File

@ -63,6 +63,7 @@ For more details, please refer to:
the master. There is also limited capability for rejoining nodes. the master. There is also limited capability for rejoining nodes.
For more details, please refer to: For more details, please refer to:
* [MariaDB MaxScale 2.2.19 Release Notes](Release-Notes/MaxScale-2.2.19-Release-Notes.md)
* [MariaDB MaxScale 2.2.18 Release Notes](Release-Notes/MaxScale-2.2.18-Release-Notes.md) * [MariaDB MaxScale 2.2.18 Release Notes](Release-Notes/MaxScale-2.2.18-Release-Notes.md)
* [MariaDB MaxScale 2.2.17 Release Notes](Release-Notes/MaxScale-2.2.17-Release-Notes.md) * [MariaDB MaxScale 2.2.17 Release Notes](Release-Notes/MaxScale-2.2.17-Release-Notes.md)
* [MariaDB MaxScale 2.2.16 Release Notes](Release-Notes/MaxScale-2.2.16-Release-Notes.md) * [MariaDB MaxScale 2.2.16 Release Notes](Release-Notes/MaxScale-2.2.16-Release-Notes.md)

12
Documentation/Filters/Database-Firewall-Filter.md
View File

@ -419,16 +419,18 @@ details about module commands.
The dbfwfilter supports the following module commands. The dbfwfilter supports the following module commands.
### `dbfwfilter::rules/reload [FILE]` ### `rules/reload FILTER [FILE]`
Load a new rule file or reload the current rules. New rules are only taken into Load a new rule file or reload the current rules. New rules are only taken into
use if they are successfully loaded and in cases where loading of the rules use if they are successfully loaded and in cases where loading of the rules
fail, the old rules remain in use. The _FILE_ argument is an optional path to a fail, the old rules remain in use. The _FILTER_ parameter is the filter instance
rule file and if it is not defined, the current rule file is used. whose rules are reloaded. The _FILE_ argument is an optional path to a rule file
and if it is not defined, the current rule file is used.
### `dbfwfilter::rules` ### `rules FILTER`
Shows the current statistics of the rules. Shows the current statistics of the rules. The _FILTER_ parameter is the filter
instance to inspect.
## Use Cases ## Use Cases

37
Documentation/Release-Notes/MaxScale-2.2.19-Release-Notes.md Normal file
View File

@ -0,0 +1,37 @@
# MariaDB MaxScale 2.2.19 Release Notes
Release 2.2.19 is a GA release.
This document describes the changes in release 2.2.19, when compared to the
previous release in the same series.
For any problems you encounter, please consider submitting a bug
report on [our Jira](https://jira.mariadb.org/projects/MXS).
## Bug fixes
* [MXS-2238](https://jira.mariadb.org/browse/MXS-2238) MaxScale fails to send large CDC schemas
* [MXS-2234](https://jira.mariadb.org/browse/MXS-2234) Add extra info to log when MaxScale loads persisted configuration files
* [MXS-2232](https://jira.mariadb.org/browse/MXS-2232) version_string prefix 5.5.5- is always added
* [MXS-2231](https://jira.mariadb.org/browse/MXS-2231) Kerberos together with ssl doesn't work
* [MXS-2048](https://jira.mariadb.org/browse/MXS-2048) Rewrite dbfwfilter module command documentation
## 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 supported the Linux distributions.
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 `maxscale-X.Y.Z`. Further, the default branch is always the latest GA version
of MaxScale.
The source code is available [here](https://github.com/mariadb-corporation/MaxScale).

2
Documentation/Release-Notes/generate_release_notes.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
cd $(dirname $(realpath $0))
major="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_VERSION_MAJOR'|sed 's/.*=//'`" major="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_VERSION_MAJOR'|sed 's/.*=//'`"
minor="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_VERSION_MINOR'|sed 's/.*=//'`" minor="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_VERSION_MINOR'|sed 's/.*=//'`"
patch="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_VERSION_PATCH'|sed 's/.*=//'`" patch="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_VERSION_PATCH'|sed 's/.*=//'`"

5
connectors/cdc-connector/examples/Makefile Normal file
View File

@ -0,0 +1,5 @@
all:
c++ -I ../ ../cdc_connector.cpp main.cpp -ljansson -lcrypto -o cdc
clean:
rm -rf cdc

2
connectors/cdc-connector/examples/main.cpp
View File

@ -26,7 +26,7 @@ int main(int argc, char** argv)
if (conn.connect(argv[5])) if (conn.connect(argv[5]))
{ {
CDC::Row row; CDC::SRow row;
while ((row = conn.read())) while ((row = conn.read()))
{ {

113
maxscale-system-test/Documentation/RELEASE.md
View File

@ -2,58 +2,78 @@
## Pre-release Checklist ## Pre-release Checklist
* Create new release notes and add all fixed bugs, use a previous one as a template * Make sure all bugs that have been fixed are also closed on Jira and have the
correct fixVersion
For major releases:
* Create new release notes and add all fixed bugs, use a previous one as a
template
For bug fix releases:
* Run the `Documentation/Release-Notes/generate_release_notes.sh` script to
auto-generate release notes
Finally:
* Add link to release notes and document major changes in Changelog.md * Add link to release notes and document major changes in Changelog.md
## 1. Tag ## 1. Tag
Release builds are always made using a tag. However, the used Release builds are always made using a tag and a separate branch. However, the
tag is a _tentative_ tag, to ensure that there never is a need used tag is a _tentative_ tag, to ensure that there never is a need to _move_
to _move_ any tag, should the release have to be modified after any tag, should the release have to be modified after it has been tagged. All
it has been tagged. All that is needed is to create a new that is needed is to create a new tentative tag.
tentative tag.
The source for release `x.y.z` is tagged with `maxscale-x.y.z-ttN` The source for release `x.y.z` is tagged with `maxscale-x.y.z-ttN` where `N` is
where `N` is 1 for the first attempt and incremented in case the 1 for the first attempt and incremented in case the `x.y.z` source still needs
`x.y.z` source still needs to be modified and the release rebuilt. to be modified and the release rebuilt.
The final tag `maxscale-x.y.z` is created _after_ the packages have The final tag `maxscale-x.y.z` is created _after_ the packages have been
been published and we are certain they will not be rebuilt, without published and we are certain they will not be rebuilt, without also the version
also the version number being changed. number being changed.
So, ensure that the `maxscale-x.y.z-ttN` has been created and pushed To create the tag and the branch from the main _x.y_ branch:
to the repository.
``` ```
git checkout x.y
git checkout -b x.y.z
git tag maxscale-x.y.z-ttN
git push -u origin x.y.z
git push origin refs/tags/maxscale-x.y.z-ttN git push origin refs/tags/maxscale-x.y.z-ttN
``` ```
**A note on fixing bugs while doing a release:**
A separate branch is used to guarantee that no commits are added once the
release proceedings have started. If any fixes to code or documentation need to
be done, do them on the _x.y.z_ branch. If a fix has been made, create a new tag
by incrementing the `-ttN` suffix by one and push both the branch and the new
tag to the repo.
**NOTE** The tentative suffix - `-ttN` - is **only** used when **NOTE** The tentative suffix - `-ttN` - is **only** used when
specifying the tag for the build, it must **not** be present in specifying the tag for the build, it must **not** be present in
any other names or paths. any other names or paths.
## 2. Build and upgrade test ## 2. Build and upgrade test
The Jenkins The BuildBot [build_for_release](https://maxscale-ci.mariadb.com/#/builders/38)
[build_for_release](http://127.0.0.1:8089/job/build_for_release/) job should be used for building the packages. Use your GitHub account to log in
job should be used for building the packages. to actually see the job. Click the blue _Build for release_ button in the top
right corner to start it.
Note that the above will not work unless you have set up an
ssh tunnel to Jenkins:
```
$ ssh -f -N -L 8089:127.0.0.1:8089 vagrant@max-tst-01.mariadb.com
```
### Parameters to define ### Parameters to define
#### `scm_source` #### `branch`
This is the tag that is used to build the release. This is the tag that is used to build the release.
``` ```
refs/tags/maxscale-x.y.z-ttN refs/tags/maxscale-x.y.z-ttN
``` ```
#### `version_number`
#### `The version number of this release in x.y.z format`
The version number of this release in x.y.z format. This will create two packages; maxscale-x.y.z-release and maxscale-x.y.z-debug. The version number of this release in x.y.z format. This will create two packages; maxscale-x.y.z-release and maxscale-x.y.z-debug.
@ -61,39 +81,16 @@ The version number of this release in x.y.z format. This will create two package
x.y.z x.y.z
``` ```
#### `old_target` #### `Old target`
The previous released version, used by upgrade tests. The previous released version, used by upgrade tests. Set it to the previous
release e.g. for 2.2.19 set it to 2.2.18. For GA releases, set it to the latest
release of the previous major release e.g. for 2.3.0 set it to 2.2.19.
``` ```
x.y.z x.y.z
``` ```
### 1.4.x build
Use the [build_all](http://127.0.0.1:8089/job/build_all/) job.
For `1.4` builds the default values of the following parameters
should be changed:
#### use_mariadbd
```
yes
```
#### cnf_file
```
maxscale.cnf.minimum.1.4.4
```
#### maxadmin_command
```
maxadmin -pmariadb show services
```
## 3. Copying to code.mariadb.com ## 3. Copying to code.mariadb.com
ssh to `code.mariadb.com` with your LDAP credentials. ssh to `code.mariadb.com` with your LDAP credentials.
@ -165,18 +162,6 @@ git tag -d maxscale-x.y.z-ttN
git push origin :refs/tags/maxscale-x.y.z-ttN git push origin :refs/tags/maxscale-x.y.z-ttN
``` ```
## 6. Create the branch
Release `x.y.z` is typically developed in the branch `x.y`.
Once `x.y.z` has been released, the branch `x.y.z` also needs
to be created.
```bash
git checkout maxscale-x.y.z
git checkout -b x.y.z
git push origin x.y.z
```
## 7. Update the release date ## 7. Update the release date
Once the branch `x.y.z` has been created and the actual release Once the branch `x.y.z` has been created and the actual release

17
server/core/config.cc
View File

@ -1133,6 +1133,7 @@ static bool config_load_and_process(const char* filename, bool (* process_config
{ {
bool rval = false; bool rval = false;
DUPLICATE_CONTEXT dcontext; DUPLICATE_CONTEXT dcontext;
bool have_persisted_configs = false;
if (duplicate_context_init(&dcontext)) if (duplicate_context_init(&dcontext))
{ {
@ -1166,8 +1167,12 @@ static bool config_load_and_process(const char* filename, bool (* process_config
* TODO: Figure out a cleaner way to do this * TODO: Figure out a cleaner way to do this
*/ */
is_persisted_config = true; is_persisted_config = true;
have_persisted_configs = true;
MXS_NOTICE("Loading generated configuration files from '%s'", persist_cnf); MXS_NOTICE("Runtime configuration changes have been done to MaxScale. Loading persisted "
"configuration files and applying them on top of the main configuration file. "
"These changes can override the values of the main configuration file: "
"To revert them, remove all the files in '%s'.", persist_cnf);
DUPLICATE_CONTEXT p_dcontext; DUPLICATE_CONTEXT p_dcontext;
/** /**
* We need to initialize a second duplicate context for the * We need to initialize a second duplicate context for the
@ -1193,12 +1198,12 @@ static bool config_load_and_process(const char* filename, bool (* process_config
if (!check_config_objects(config_context.next) || !process_config(config_context.next)) if (!check_config_objects(config_context.next) || !process_config(config_context.next))
{ {
rval = false; rval = false;
if (contains_cnf_files(persist_cnf)) if (have_persisted_configs)
{ {
MXS_WARNING("One or more generated configurations were found at '%s'. " MXS_WARNING("Persisted configuration files generated by runtime configuration "
"If the error relates to any of the files located there, " "changes were found at '%s' and at least one configuration error was "
"remove the offending configurations from this directory.", "encountered. If the errors relate to any of the persisted configuration "
persist_cnf); "files, remove the offending files and restart MaxScale.", persist_cnf);
} }
} }
} }