8094c67ac2
Merge branch '2.2' into develop
2018-06-13 00:25:56 +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
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
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
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
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
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
e9dee55245
Fix improper use of the metadata pointer
...
The value was unconditionally dereferenced even if the data type did not
have metadata. In this case the pointer would point to unallocated memory
which can lead to a crash.
2018-06-08 12:18:12 +03:00
0d73530ff3
Merge branch '2.2' into develop
2018-06-08 11:30:55 +03:00
a7dd2127d6
Merge branch '2.1' into 2.2
2018-06-08 11:21:35 +03:00
c850336199
MXS-1907: Allow ssl_verify_peer_certificate when creating listener
...
When a listener is created at runtime or SSL is being enabled for an
already created listener, the ssl_verify_peer_certificate parameter can
now be defined.
2018-06-08 10:11:43 +03:00
8afa8c2c5a
MXS-1775 Add MonitorInstanceSimple class
...
MonitorInstanceSimple is intended for simple monitors that
probe servers in a straightforward fashion. More complex monitors
can be derived directly from MonitorInstance.
2018-06-07 15:13:26 +03:00
880db1353a
Merge branch '2.2' into develop
2018-06-07 14:39:16 +03:00
3c0f301674
MXS-1709 Fix to test_server
2018-06-06 22:36:10 +03:00
82a95bfe2d
MXS-1709 Fix memory leaks causing test_server to fail
2018-06-06 22:36:10 +03:00
6d1863451a
MXS-1775 Fix galera monitor
...
The statuses were flushed at the wrong place as far as the
Galera monitor was concerned.
2018-06-06 15:34:40 +03:00
af717426d5
MXS-1775 Load server journal unconditionally
...
The server journal is unconditionally loaded and need not be
done in @c pre_loop.
2018-06-06 15:25:57 +03:00
f600b3a769
MXS-1775 Check disk space in MariaDBMonitor
2018-06-06 15:25:57 +03:00
329a6df662
MXS-1775 Factor out post-processing
...
Further adjustments for being able to move MariaDBMonitor on
top of MonitorInstance::main().
2018-06-06 15:25:57 +03:00
71194d83d3
MXS-1775 Rearrange for moving main loop to MonitorInstance
...
This is another step in the process for moving the main loop
from MariaDBMonitor to MonitorInstance.
2018-06-06 15:25:57 +03:00
5172c43e29
MXS-1775 Add functions for checking disk space of servers
2018-06-06 15:25:57 +03:00
70fdd0fc17
Merge branch '2.2' into develop
2018-06-06 08:56:31 +03:00
f2b2951c99
Track the number of performed monitoring intervals
...
Tracking how many times the monitor has performed its monitoring allows
the test framework to consistently wait for an event instead of waiting
for a hard-coded time period. The MaxCtrl `api get` command can be used to
easily extract the numeric value.
2018-06-06 08:46:46 +03:00
19a0c94661
Typo fix in logthrottling_test
2018-06-05 15:49:22 +03:00
1857252033
MXS-1749 Delete old process datadir on startup if it still exists
...
When starting MaxScale it deletes all of the old process datadirs that
might have not been cleaned up due to unexpected exit of the program.
2018-06-05 15:10:41 +03:00
ac998b70a3
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2018-06-05 11:37:18 +03:00
48509d30f1
Silence the -Wunused-result warning
...
-Wunused-result warning in test_logthrottling.cc was causing error when
trying to build MaxScale from source. This warning can be silenced with by
putting the function triggering the warning in if-clause.
2018-06-05 11:30:55 +03:00
e858ef672c
Fix moudle command debug assertion
...
The names can be of different case.
2018-06-04 19:26:36 +03:00
4a3216d483
Merge branch '2.2' into develop
2018-06-04 16:00:19 +03:00
306beb05cd
MXS-1899: Allow generated [maxscale] sections
...
The generated configuration file contains a [maxscale] section which
should not be treated as an error.
2018-06-04 15:17:48 +03:00
cddcc6d7d5
MXS-1896: Distinct LOAD DATA LOCAL INFILE from LOAD DATA INFILE
...
The two operations return different types of results and need to be
treated differently in order for them to be handled correctly in 2.2.
This fixes the unexpected internal state errors that happened in all 2.2
versions due to a wrong assumption made by readwritesplit. This fix is not
necessary for newer versions as the LOAD DATA LOCAL INFILE processing is
done with a simpler, and more robust, method.
2018-06-04 15:17:48 +03:00
7cd19a12a2
MXS-1883 Remove locking during monitor loop
...
Since the admin cannot modify server states any more, the locks are not
required.
2018-06-01 15:03:07 +03:00
37841183b3
Cleanup server.h
...
Renamed, rearranged and clarified status bits. Removed unused macros.
2018-06-01 14:29:51 +03:00
e8deb553be
MXS-1775 Make MonitorInstance more resilient towards abuse
...
If MonitorInstance is in the wrong state when it is started/stopped
a warning is logged and the operation ignored.
2018-06-01 13:48:15 +03:00
a55019774d
MXS-1775 Expose the state of the monitor
2018-06-01 13:48:15 +03:00
ebcb807438
MXS-1775 Add default implementations
2018-06-01 13:48:15 +03:00
9b7e37e112
MXS-1775 Change MonitorInstance::configure() prototype
...
Now return boolean, to allow derived class to signal a failure
to configure.
2018-06-01 13:48:15 +03:00
0833db8a48
MXS-1775 Flush pending status to servers using common code
2018-06-01 13:48:15 +03:00
15b1c270a3
MXS-1775 Check connection in MonitorInstance::tick()
...
Since the connection checking is done in an identical fashion in
all monitors, it can be moved to the base-class.
2018-06-01 13:48:15 +03:00
c0ace6a694
MXS-1775 Rename server_clear_set_status
...
Renamed to server_clear_set_status_nolock, like all other non-locking
functions are called. Rename arguments to be self-explanatory.
2018-06-01 13:48:15 +03:00
df4e19eb27
MXS-1775 Provide default implementation for MonitorInstance::tick
2018-06-01 13:48:15 +03:00
