bbeaaa97b5
Merge branch '2.2' into develop
2018-06-13 23:18:52 +03:00
315738f279
Merge branch '2.1' into 2.2
2018-06-13 23:15:11 +03:00
53177c30de
Fix runtime listener creation
...
The number of arguments to createListener was incremented but the maximum
count was not. Also fixed the parameter types for createListener and
alterServer.
2018-06-13 23:13:16 +03:00
143882ddce
Merge branch '2.1' into 2.2
2018-06-13 21:04:49 +03:00
f6e01b4434
MXS-591 Fix documentation and change comment parameter type
2018-06-13 20:44:32 +03:00
5324a1bdaa
MXS-1845 Assign server roles
...
Assign server roles (master, slave, relay master, slave of external master)
for a graph with possibly multiple paths to a slave server.
2018-06-13 17:38:53 +03:00
3f82c25c62
MXS-1845 New algorithm for finding the master server
...
Not yet used, as more is needed to replace the old code. The
algorithm is based on counting the total number of slave nodes
a server has, possibly in multiple layers and/or cycles.
2018-06-13 17:38:33 +03:00
1ea7c65861
Fix runtime alteration of servers
...
The server runtime alteration was broken by commit
c850336199c3c19508a3d280fb7000291d66b80c when it increased the maximum
argument count of the `alter server` command to 14.
2018-06-13 14:29:28 +03:00
1475b22eac
Upgrade REST-API npm packages
...
Upgraded packages to more recent versions.
2018-06-13 10:07:37 +03:00
8094c67ac2
Merge branch '2.2' into develop
2018-06-13 00:25:56 +03:00
e99d9826ad
Fix route_by_statement return value
...
The return value of route_by_statement was not initialized and not set if
a COM_CHANGE_USER was processed.
2018-06-12 23:55:30 +03:00
24870e278c
MXS-1913: Check session before invoking dcb_foreach callback
...
If the session is the dummy session, the callback should not be called.
2018-06-12 23:55:30 +03:00
780620e796
Only use __atomic builtins
...
Now that the compiler for CentOS 6 was upgraded, there is no need to
support the old __sync builtins.
2018-06-12 19:40:34 +03:00
6927e67a6d
Enable rhscl repo for RHEL 6
...
To use the devtoolset, we need to enable the rhscl repo if we are running
RHEL 6. This fix most likely only works for the RHEL 6 images on AWS.
2018-06-12 19:40:34 +03:00
0627e8dc86
Resolve all symbols for routers at link time
...
The routers should not have undefied references. Exceptions to this are
the modules that use the maxscale_shutdown() function defined in
gateway.cc.
2018-06-12 19:40:34 +03:00
1946cb2876
Take a lambda function into use in readwritesplit
...
To test whether the compiler conforms to C++11, we can try to use a lambda
function.
2018-06-12 19:40:34 +03:00
a367267756
Enable newer compiler for CentOS 6
...
Install devtoolset-4 on CentOS 6 to enable C++11 on all supported
platforms. Change compiler flags to `-std=c++11` to explicitly use C++11.
2018-06-12 19:40:34 +03:00
d9100278b0
MXS-1719 Update qc test parser
...
The recent change to the qc_sqlite parser also requires some
modifications to the parser used for reading .test-files.
2018-06-12 17:35:49 +03:00
776f199d01
MXS-1719 Treat # comments the same way as -- comments
...
sqlite does not treat # as the start of a to-end-of-line
comment. It cannot trivially be treated as such because at
startup sqlite parses statements containing the #-character.
Thus, only after sqlite has been initialized can it be treated
the same way as --.
2018-06-12 17:35:49 +03:00
8f9bf100e1
MXS-1918 Remove HASHTABLE from dcb.cc
2018-06-12 17:32:35 +03:00
ee03ffd7db
MXS-1917 Replace HASHTABLE with std::set
2018-06-12 17:32:01 +03:00
f5f454a29b
MXS-1884 Clarify what a list means
2018-06-12 17:29:00 +03:00
f87fc45511
MXS-1884 Wrap lines of readconnroute documentation
...
No other changes.
2018-06-12 17:29:00 +03:00
de1f95028b
MXS-591 Add filter for injecting comments
...
Comments specified in the cnf file will be injected as a comment before
every sql statement.
2018-06-12 15:31:18 +03:00
69b19d1473
Remove unnecessary includes of hashtable.h
...
And add where necessary.
2018-06-12 11:02:29 +03:00
6cc03afdf9
MXS-1908 Reorder the code slightly
2018-06-12 10:49:05 +03:00
9a11394f22
MXS-1908 Rename classes
...
- MessageStats -> MessageRegistry
- MessageStatsKey -> MessageRegistryKey
- MessageStatsValue -> MessageRegistryStats
2018-06-12 10:49:05 +03:00
690999c4af
MXS-1908 Turn LM_MESSAGE_STATS into a class
2018-06-12 10:49:05 +03:00
9f64c73bb4
MXS-1908 Turn LM_MESSAGE_KEY into a class
2018-06-12 10:49:05 +03:00
9e3b4b46fc
MXS-1908 Replace HASHTABLE with std::unordered_map
...
Just minimal changes, further cleanup and simplification could
be done.
2018-06-12 10:49:05 +03:00
cd136b11a7
MXS-1891: dealloc named prepare should route to all ( #174 )
...
* dealloc named prepare route to all
* add newline
* erase from ps manager too
* little refactor
2018-06-12 10:45:11 +03:00
52ae0a66d1
Update ChangeLog with 2.3 section
2018-06-12 10:00:37 +03:00
e5314deb5e
Coding style and guidelines
...
A verbatim copy from the GitHub wiki pages. Easier to update and
review if part of the MaxScale source. Updates will follow.
2018-06-12 09:45:06 +03:00
d0453bd3ed
Measure monitor loop execution time when calculating sleep time
2018-06-11 13:30:36 +03:00
96ed651466
Merge branch '2.2' into develop
2018-06-11 11:28:36 +03:00
1a24f0a956
Merge branch '2.1' into 2.2
2018-06-11 10:36:57 +03:00
c798a4ae36
Remove use of HASHTABLE in galeramon
...
Replaced the HASHTABLE in galeramon with an std::unordered_map. This
simplifies the code by a great amount and makes it more readable. Removed
the extraneous functions that mostly logged debug information and
simplified the logic by removing redundant checks.
2018-06-11 10:22:23 +03:00
9263a06b15
Fix galera master selection
...
The master selection still used the current status instead of the pending
status. This caused the master selection to lag behind by one monitor
loop.
2018-06-11 10:22:23 +03:00
283a6d564e
Update MaxCtrl dependencies
...
Updated various npm dependencies of MaxCtrl. Also updated the testing
docker-compose image to use 10.2.
2018-06-11 09:17:02 +03:00
1e1734f42e
MXS-1910: Only require ssl_ca_cert for servers
...
Servers in MaxScale can encrypt the connections without client keys and
certificates. As keys and certificates are no longer required, the CA
certificate must always be initialized.
2018-06-09 00:15:48 +03:00
dd49d4faea
Check pending Synced status in Galeramon
...
The pending status must be used, not the current.
2018-06-08 14:41:11 +03:00
9f5358eac0
Remove server_get_parameter_nolock
...
The function is no longer needed as there is no recursive access to the
server.
2018-06-08 14:41:11 +03:00
ba0e3bd6b7
Speed up avrorouter testing
...
Cut test time from about 300 seconds to 200 seconds.
2018-06-08 12:18:14 +03:00
8c22131827
Remove redundant or unused avrorouter code
...
The code in avrorouter that returned the current transaction was not very
useful and it can be acquired via the REST API in a more convenient
format.
The number of created sessions is tracked on the service level so there is
no need to track it in the avrorouter.
Removed declarations for functions that do not exist and moved code around
to reduce the scope.
2018-06-08 12:18:14 +03:00
47d84cab81
Fix annotate_rows and binlog name processing
...
The four extra bytes added by the binlog checksums weren't ignored. This
caused the info messages to display the binary data of the checksum.
2018-06-08 12:18:14 +03:00
7c18696608
Abstract all row event processing
...
The code that handles the Avro files is now fully abstracted behind the
AvroConverter class that implements the RowEventHandler interface.
The code still has some avro specific behavior in a few places (parsing of
JSON files into TableCreate objects). This can be replaced, if needed, by
querying the master server for the CREATE TABLE statements.
2018-06-08 12:18:14 +03:00
d094e93209
Rename conflicting objects
...
The START_ENCRYPTION_EVENT is the name of an object that is exposed by the
Connector-C.
2018-06-08 12:18:13 +03:00
5268d032c5
Process file and data events separately
...
The various file operation related binlog events are now processed on the
upper level. This makes the actual data event processing simpler and
easier to comprehend.
2018-06-08 12:18:13 +03:00
9ec6293e3f
Implement avrorouter in a separate file
...
The module implementation is now contained in one file. This makes it
easier to see which parts depend on each other.
2018-06-08 12:18:13 +03:00
b3cc65c516
Add missing binlog_checksum initialization
...
The variable was not initialized.
2018-06-08 12:18:13 +03:00
