hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,910 Commits 1 Branch 0 Tags
Commit Graph

692 Commits

Author SHA1 Message Date
Esa Korhonen
34f61bc4f2 Close connections before starting loop 
The connections should be closed after the check queries.
 2018-07-03 10:32:06 +03:00
Esa Korhonen
03491a45f0 Remove old code 
The functionality is elsewhere.
 2018-07-03 10:32:06 +03:00
Esa Korhonen
fd31c9cced MXS-1905 Set slaves with low disk space to maintenance 
Also, servers in maintenance are updated just as other servers.
 2018-07-02 14:24:57 +03:00
Esa Korhonen
a59c0c61ce Remove depth field from SERVER 
It was not really used anymore.
 2018-06-29 10:54:34 +03:00
Esa Korhonen
960d08a36a Code cleanup 
Removed unused code.
 2018-06-29 10:54:34 +03:00
Johan Wikman
0afcd4b468 Fix test-program failures 
Due to recent changes, mxs::MessageQueue::init() must be called
explicitly, if a monitor is created.
 2018-06-29 10:43:49 +03:00
Esa Korhonen
9525d3507b Run manual commands without stopping the monitor 
The command is saved in a function object which is read by the monitor
thread. This way, manual and automatic cluster modification commands are
ran in the same step of a monitor cycle.

This update required several modifications in related code.
 2018-06-28 16:56:41 +03:00
Esa Korhonen
6bf10904d7 MXS-1845 Only rebuild topology when required 
The monitor now detects when a server has changed such that a replication
graph rebuild is needed and only then rebuilds the graph and detects
cycles and master.

Also, some old code is no longer called in the monitor cycle. It will be
removed in later commits. Refactored some of the related functions.
 2018-06-28 16:56:41 +03:00
Johan Wikman
cc0299aee6 Update change date of 2.3 2018-06-25 10:07:52 +03:00
Esa Korhonen
8bd9e1d473 Check monitor permissions when reconnecting to server 
Previously, the permissions would only be checked at monitor start.
Now, the permissions are checked if [Auth Error] is on or server
was reconnected.
 2018-06-20 17:54:46 +03:00
Esa Korhonen
58207ec414 MXS-1775 Check disk space warning bit when selecting a new master for failover 
This also applies to autoselect switchover. The disk space warning has the least
priority, as the other criteria could lead to replication failures. Also, print
the reason the new master was selected over the second best candidate.
 2018-06-18 17:59:19 +03:00
Esa Korhonen
019d62bbb8 MXS-1886 Better auto-rejoin error description and tolerance 
Contains changes from commit 09df01752812444c6e7c409a8957d292f7de63cf
adapted to the 2.3 branch.
 2018-06-18 16:35:28 +03:00
Esa Korhonen
d3e9cc9a4f MXS-1886 Auto-failover error tolerance 
Contains changes from commit 9e68d8ec3ddf1621f533067021c4b3042f695e80
adapted to the 2.3 branch.
 2018-06-18 16:35:28 +03:00
Markus Mäkelä
9d961ece3a
Clear galeramon server info in pre_tick 
The server information in galeramon is gathered every monitoring
interval. To prevent stale information from being used, the server
information needs to be cleared at the start of each monitoring interval.
 2018-06-18 14:25:05 +03:00
Esa Korhonen
2f987d0b10 MXS-1845 Only select a master if current master is no longer usable 
The purpose is to make the selected master server sticky. The master is reselected only
if the current master is no longer a valid master.
 2018-06-18 11:06:58 +03:00
Esa Korhonen
de37f1a5c4 Fix cycle find test 2018-06-14 10:28:10 +03:00
Esa Korhonen
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
Esa Korhonen
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
Markus Mäkelä
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
Markus Mäkelä
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
Markus Mäkelä
dd49d4faea
Check pending Synced status in Galeramon 
The pending status must be used, not the current.
 2018-06-08 14:41:11 +03:00
Markus Mäkelä
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
Johan Wikman
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
Esa Korhonen
2481de260f Move monitor-dependent code in MariaDBServer to MariaDBMonitor 
Removes Monitor-dependency from the MariaDBServer-class.
 2018-06-06 22:28:38 +03:00
Johan Wikman
b2a190c2b8 MXS-1775 Add switchover_on_low_disk_space parameter 2018-06-06 15:25:57 +03:00
Johan Wikman
dc47835ef6 MXS-1775 Add documentation for new monitor parameter 2018-06-06 15:25:57 +03:00
Johan Wikman
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
Johan Wikman
f600b3a769 MXS-1775 Check disk space in MariaDBMonitor 2018-06-06 15:25:57 +03:00
Johan Wikman
18ece193bb MXS-1775 MariaDBMonitor::main() removed 
Now uses MonitorInstance::main() as all other monitors.
 2018-06-06 15:25:57 +03:00
Johan Wikman
44b1e805a3 MXS-1775 Move MariaDBMonitor functionality to tick 
Now all is set for moving MariaDBMonitor on top of
MonitorInstance::main.
 2018-06-06 15:25:57 +03:00
Johan Wikman
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
Johan Wikman
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
Markus Mäkelä
70fdd0fc17
Merge branch '2.2' into develop 2018-06-06 08:56:31 +03:00
Markus Mäkelä
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
Esa Korhonen
17c9ac95bd MXS-1845 Add unit test for the cycle find algorithm (Tarjan SCC) 
Only a few test cases for now.
 2018-06-05 16:33:51 +03:00
Esa Korhonen
9a0445cd4e MXS-1845 Save cycle members 
The saved data may be useful later on. Also includes some cleanup.
 2018-06-05 16:25:04 +03:00
Esa Korhonen
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
Esa Korhonen
37841183b3 Cleanup server.h 
Renamed, rearranged and clarified status bits. Removed unused macros.
 2018-06-01 14:29:51 +03:00
Esa Korhonen
4d7aff4ab9 MXS-1845 Find strongly connected components with multiple slave connections 
Rewrote the algorithm for clarity.
 2018-06-01 14:04:50 +03:00
Johan Wikman
32c7ae2f9f MXS-1775 Inherit MariaDBMonitor from mxs::MonitorInstance 
Start/stop now provided by MonitorInstance. The thread main
function is now virtual and overriden by MariaDBMonitor. Some
additional refactoring is necessary in order to be able to allow
MonitorInstance to handle the main loop.
 2018-06-01 13:48:15 +03:00
Johan Wikman
5219245a04 MXS-1775 Reset server info in MariaDBMonitor::configure() 
That way, MariaDBMonitor no longer needs a custome start() function.
 2018-06-01 13:48:15 +03:00
Johan Wikman
be3bdc7bc9 MXS-1775 Rename MariaDBMonitor::main_loop() to main() 
To make it compatible with mxs::MonitorInstance.
 2018-06-01 13:48:15 +03:00
Johan Wikman
a82c5911e5 MXS-1775 Rename m_monitor_base to m_monitor 
To make it compatible with how the variable is named
in maxscale::MonitorInstance.
 2018-06-01 13:48:15 +03:00
Johan Wikman
f862939dd7 MXS-1775 Make MariaDBMon non-dependent on stop() return value 
To align it with the behavour or MonitorInstance::stop()
 2018-06-01 13:48:15 +03:00
Johan Wikman
62f3e89ae7 MXS-1775 Tilt MariaDbMon towards maxscale::MonitorInstance 
- m_status -> m_state
- m_keep_running -> m_shutdown
- load_config_params() -> configure()
 2018-06-01 13:48:15 +03:00
Johan Wikman
ebcb807438 MXS-1775 Add default implementations 2018-06-01 13:48:15 +03:00
Johan Wikman
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
Johan Wikman
0783af88ed MXS-1775 Make general cleanup 
Document and rearrrange so that things look nice and tidy.
 2018-06-01 13:48:15 +03:00
Johan Wikman
76cfe7291d MXS-1775 Move module entry point to the end of the file 
Now the same way in all monitors.
 2018-06-01 13:48:15 +03:00
Johan Wikman
b439857a84 MXS-1775 Remove destroy() 
Now the instance is deleted simply by deleting it.
 2018-06-01 13:48:15 +03:00