Markus Mäkelä
9efd33186d
MXS-2968: Fix direct replication server_id
2020-04-22 09:01:27 +03:00
Timofey Turenko
b586aeb6b8
Merge branch '2.4-clx' into 2.4
2020-04-21 01:18:32 +03:00
Markus Mäkelä
93c3e9ce23
MXS-2919: Add test case
...
The test checks that no slaves are used when the replication lag is not
measurable.
2020-04-18 07:19:43 +03:00
Markus Mäkelä
0c82fcb627
Update connector-c to 3.1.7
...
Still needs to be updated to 3.1.8 once released but we should
pre-emptively update it to see if any problems crop up.
2020-04-18 07:13:20 +03:00
Esa Korhonen
9115887725
Merge branch '2.3' into 2.4
2020-04-16 17:34:08 +03:00
Timofey Turenko
2d1b2b87c9
Add Clustrix machines to the default test template
2020-04-14 10:54:57 +03:00
Esa Korhonen
c3ddcb9056
MXS-2900 Add ability to add derived tests to add_test_executable_ex()
2020-04-13 17:21:40 +03:00
Esa Korhonen
f549d95793
MXS-2900 maxtest header cleanup
2020-04-11 22:10:35 +03:00
Esa Korhonen
1f15cd3d2e
Merge branch '2.3' into 2.4
2020-04-11 00:19:16 +03:00
Esa Korhonen
03726a5f25
MXS-2900 Rename maxtest files
...
Many of the headers were not renamed to avoid changing every test.
2020-04-10 20:50:28 +03:00
Markus Mäkelä
c8c919be27
Merge branch '2.3' into 2.4
2020-04-09 12:02:44 +03:00
Markus Mäkelä
aacae9b508
MXS-2956: Fix use of admin_ssl_ca_cert
...
The parameter is now optional and uses the correct file. If defined, it
defines the CA certificate that would be used to verify client
certificate. Client certificate verification doesn't seem to currently
work as that requires a custom verification callback that interfaces with
GnuTLS.
2020-04-09 11:58:50 +03:00
Markus Mäkelä
927db1fc6e
Clarify master_accept_reads
2020-04-09 11:48:46 +03:00
Markus Mäkelä
83b03d89b5
MXS-2861: Add ssl_cipher to servers and listeners
...
This allows the set of TLSv1.2 ciphers to be selected which is required to
fulfill certain regulatory requirements.
2020-04-09 11:48:44 +03:00
Esa Korhonen
1ff112ca38
Merge branch '2.3' into 2.4
2020-04-07 17:18:46 +03:00
Esa Korhonen
594e431f1a
MXS-2900 Move MariaDB-Monitor tests
2020-04-07 15:49:34 +03:00
Markus Mäkelä
b1054de72a
Merge branch '2.3' into 2.4
2020-04-07 12:36:13 +03:00
Markus Mäkelä
5dbe4f11c9
MXS-2948: Don't update passwords with cluster sync
...
Not updating the passwords prevents the cluster sync from breaking working
configurations.
2020-04-07 12:35:56 +03:00
Esa Korhonen
def264f117
Merge branch '2.3' into 2.4
2020-04-07 11:49:51 +03:00
Esa Korhonen
983b8247dd
MXS-2900 Cleanup environment variable management
2020-04-07 11:29:50 +03:00
Markus Mäkelä
dcccd99eb7
Merge branch '2.3' into 2.4
2020-04-07 08:52:40 +03:00
Markus Mäkelä
1ed6304281
MXS-2954: Use correct object for PATCH
...
The destination object instead of the source object was used. This caused
the PATCH to be a no-op.
Due to how the REST API behaves when it received parameters, the set of
synced parameters must be filtered. The REST API should be more lenient
towards alterations to parameters that don't actually change the value.
2020-04-06 19:37:53 +03:00
Esa Korhonen
10600f8bb2
Merge branch '2.3' into 2.4
2020-04-06 11:55:20 +03:00
Esa Korhonen
3bbeaa17ba
Merge branch '2.3' into 2.4
2020-04-03 13:39:21 +03:00
Esa Korhonen
c3790c753c
Merge branch '2.3' into 2.4
2020-04-03 12:39:45 +03:00
Esa Korhonen
e346c7b13b
Merge branch '2.3' into 2.4
2020-04-02 16:46:48 +03:00
Esa Korhonen
071501ea1f
MXS-2900 Run uncrustify on testconnections.cpp
...
Also some other minor cleanup.
2020-04-02 11:52:02 +03:00
Esa Korhonen
5ed99b2f5b
MXS-2900 Move more TestConnection fields to private
2020-04-02 11:51:36 +03:00
Esa Korhonen
2420ccf9a8
MXS-2900 Use named arguments in add_test_executable_ex()
...
Backend setup and labels are given in separate arguments. Only the backend
setup is saved to the test information array. Additional link libraries may
also be defined if a group of tests want to share code.
2020-04-01 22:06:04 +03:00
Esa Korhonen
711d6a4083
Merge branch '2.3' into 2.4
2020-04-01 21:31:30 +03:00
Esa Korhonen
a3e358f29b
MXS-2900 Cleanup test labels handling
...
The labels are stored in sets for easy searching.
2020-04-01 21:28:03 +03:00
Esa Korhonen
6754586f76
MXS-2900 Add possibility of having system test in any directory
...
The cmake-function add_test_executable_ex() adds a test using a source file in the
current directory. The config file is given as a relative path.
2020-04-01 21:27:07 +03:00
Markus Mäkelä
08bc1ff594
Merge branch '2.3' into 2.4
2020-04-01 09:14:40 +03:00
Markus Mäkelä
67a77a2497
MXS-2944: Remove old tutorials
2020-04-01 09:09:28 +03:00
Markus Mäkelä
007f41ddf3
Merge remote-tracking branch 'origin/2.3' into 2.4
2020-03-31 14:50:42 +03:00
Markus Mäkelä
e0cd4ec485
MXS-2931: Use a preun, not a postun, script
...
The script must be called before the package is removed on CentOS 6 to
allow the process to be stopped correctly.
2020-03-31 14:49:54 +03:00
Esa Korhonen
194ade9439
Merge branch '2.3' into 2.4
2020-03-31 14:09:32 +03:00
Esa Korhonen
c6a9c8bb0f
MXS-2900 Cleanup system test information generation
...
The system test information array now has the full path to the MaxScale
configuration file. The array now only contains labels given in
CMakeLists.txt. The resulting .cc-file has linebreaks for readability.
2020-03-31 13:38:45 +03:00
Esa Korhonen
3441497079
Merge branch '2.3' into 2.4
2020-03-31 12:15:42 +03:00
Esa Korhonen
d69e519038
MXS-2900 MXS-2900 Clean up TestConnection string handling
...
Now uses std::string for several fields.
2020-03-30 15:37:53 +03:00
Esa Korhonen
4ff703910f
Merge branch '2.3' into 2.4
2020-03-30 11:31:26 +03:00
Esa Korhonen
480c57c122
MXS-2900 Move more TestConnections fields to private
2020-03-30 10:28:12 +03:00
Markus Mäkelä
6fdb7ed089
Merge remote-tracking branch 'origin/2.3' into 2.4
2020-03-30 10:23:35 +03:00
Markus Mäkelä
c270cfad31
Install 2.4 license file
2020-03-30 10:18:18 +03:00
Markus Mäkelä
2630cc930f
Install 2.3 license file
2020-03-30 08:53:55 +03:00
Markus Mäkelä
1fc5ec36b1
Add filters to maxctrl show service
...
The filters were not listed.
2020-03-30 08:53:55 +03:00
Markus Mäkelä
7b00d2c01b
MXS-2942: Only DELETE monitors with no servers
...
The behavior is now according to the documentation and is consistent with
how services behave.
2020-03-30 08:53:54 +03:00
Markus Mäkelä
a412ed6211
Fix monitor REST API documentation
...
The DELETE documentation had the wrong endpoint.
2020-03-30 08:53:54 +03:00
Esa Korhonen
f101ff642f
Merge branch '2.3' into 2.4
2020-03-27 20:34:23 +02:00
Markus Mäkelä
e6ee3aaff4
MXS-2943: Use correct variable
2020-03-26 06:08:56 +02:00