bced61c6d8
MXS-1875 Log in correct branch
...
Also use different error message to make it plain where it is
logged.
2018-05-22 08:42:48 +03:00
f166b50b37
MXS-1875 Add fd and make note of DCB simultaneously
...
The fact that a client dcb was immediately added to the epoll-
instance of the relevant worker (possible, since that is thread-
safe), but was added to the book-keeping via the message mechanism
(necessary, since that is not thread-safe), meant that if the
connection was closed before the message was delivered, the handling
of the message then caused an access error.
Now the fd is also added to the epoll-instance via the messaging
mechanism, so the problem can no longer occur. The only fds this
affects are connections made to maxadmin or maxinfo as they are
always handled by the main thread due to deadlock issues.
2018-05-21 20:04:13 +03:00
043232990c
MXS-1859 Correct merge bug
...
Version comparison was wrong.
2018-05-21 15:58:12 +03:00
0f8bf9b6e2
Implement mxs::[l|r]trim(std::string&);
...
Also remove the non-used implementation in httprequest.cc
2018-05-21 10:18:42 +03:00
096f5e4dc6
Update 2.2 version number
2018-05-21 10:16:58 +03:00
2e8c19f6be
Merge branch '2.2' into develop
2018-05-21 10:06:20 +03:00
76f32a38ac
Update release date
2018-05-21 10:05:58 +03:00
540df997fb
Remove unused templates file
...
The file has not been used since the templates.h header was added.
2018-05-21 09:50:44 +03:00
7af9a500ac
MXS-1853: Treat MySQL 8.0 as 5.7 in authenticators
...
Using the MySQL 5.7 syntax is required to get the authenticators to work
with 8.0.
2018-05-21 09:50:44 +03:00
bdde3c44d9
Document slave_selection_criteria and weightby interaction
...
Documented how the slave_selection_criteria and server weights work.
2018-05-21 09:50:43 +03:00
4788c4947d
Merge branch 'read_only' into develop
...
develop was updated before a merge was pushed, requiring a second merge.
2018-05-18 16:51:38 +03:00
709c076000
Merge branch '2.2' into develop
2018-05-18 16:31:49 +03:00
f88f0ffe47
MXS-173 switched to use maxscale::Worker::delayed_call()
...
Using delayed_call rather than usleep. This caused a fair amount of changes to
the timing ascpects (or delaying). Also some other small changes; more config
and all durations in milliseconds.
2018-05-18 16:24:45 +03:00
f3973b331f
Fix rebase error.
2018-05-18 16:00:05 +03:00
9d526332d8
MXS-1775 Ensure MonitorInstance::start() returns correct value
...
Since we need to call mysql_thread_init(), which can fail, in
the monitor thread, we need to wait for the outcome of that
before we can return from start().
2018-05-18 16:00:05 +03:00
650a739c92
MXS-1775 Move monitor loop to MonitorInstance
2018-05-18 16:00:05 +03:00
db30ea96f2
MXS-1775 m_master is now a member variable of MonitorInstance
2018-05-18 16:00:05 +03:00
5aa30e8613
MXS-1775 AurorMon now hangs up as the other monitors do
2018-05-18 16:00:05 +03:00
6eef6f52db
MXS-1775 Wait the same way in all monitors
2018-05-18 16:00:05 +03:00
2396b555f8
MXS-1775 Monitor loop and monitoring separated
...
In preparation for moving the monitor loop to MonitorInstance.
2018-05-18 16:00:05 +03:00
6fff5a4f23
MXS-1775 Preparatory work for moving main loop to MonitorInstance
2018-05-18 16:00:05 +03:00
6db4ce54a9
MXS-1775 MonitorInstance now calls mysql_thread_[init|finish]()
2018-05-18 16:00:05 +03:00
15e3a2887c
MXS-1775 Move status management to MonitorInstance
2018-05-18 16:00:05 +03:00
1e084b78b1
MXS-1775 MonitorInstance::m_script is now a std::string
2018-05-18 16:00:05 +03:00
c7eb0a9958
MXS-1775 Thread starting is now handled by MonitorInstance
2018-05-18 16:00:05 +03:00
adb7f156d6
MXS-1775 Introduce MonitorInstance::has_sufficient_permissions()
...
With this function in place, it is now possible to move the thread
starting to MonitorInstance.
2018-05-18 16:00:05 +03:00
3606a5ed1c
MXS-1775 Introduce MonitorInstance::configure() function
...
The configuring of the monitor instance is now performed in a
separate function. That is in preparation for the moving of the
start function to maxscale::MonitorInstance.
2018-05-18 16:00:05 +03:00
bcb7d09a15
MXS-1775 Monitor stopping moved to maxscale::MonitorInstance
2018-05-18 16:00:05 +03:00
1304fd6147
MXS-1775 Move thread main function to maxscale::MonitorInstance
2018-05-18 16:00:05 +03:00
3c277f4e5e
MXS-1775 Introduce maxscale::MonitorInstance
...
- All monitors (but MariaDBMon for the time being) inherit
from that.
- All common member variables moved to that class. Still
manipulated in derived classes.
In subsequent commits common functionality will be moved to
that class.
2018-05-18 16:00:05 +03:00
787a0b50ef
MXS-1775 Cleanup monitor class headers
...
- All classes now declared in separate header file
- Header files have .hh-suffix
2018-05-18 16:00:05 +03:00
90f1784d21
MXS-1775 Turn NDBC monitor into a class.
...
A mechanical change, without any functional modifications.
2018-05-18 16:00:05 +03:00
4b236a79db
MXS-1775 Turn Galera monitor into a class.
...
A mechanical change, without any functional modifications.
2018-05-18 16:00:05 +03:00
cd233fe594
MXS-1775 Turn MM monitor into a class
...
A mechanical change, without any functional modifications.
2018-05-18 16:00:05 +03:00
cc7a154e7d
MXS-1775 Turn Aurora monitor into a class.
...
A mechanical change, without any functional modifications.
2018-05-18 16:00:05 +03:00
d5871e48ae
MXS-1775 Change assumption of Monitor::destroy() function
...
Used to be assumed to be a static member function, now assumed
to be a regular member function.
2018-05-18 16:00:05 +03:00
b72a7a8926
Update 2.2.6 release notes
2018-05-18 15:36:16 +03:00
fb56de641a
MXS-1859 Add options for enforcing read_only on slaves
...
If the feature is enabled (default off), at the end of a monitor loop
(once server states are known), read_only is enabled on slaves servers
without it.
2018-05-18 15:29:56 +03:00
a31549221b
MXS-1845 Print all slave connections at 'show monitors'
...
The format has changed.
2018-05-18 13:48:08 +03:00
45da5a08d9
MXS-1845 Cleanup monitor backend updating
...
Now detects errors and prints them.
2018-05-18 13:48:08 +03:00
765806a633
Merge branch '2.2' into develop
2018-05-18 13:40:27 +03:00
7c0ea3220c
set memory size for build VM to 4096
2018-05-18 12:51:33 +03:00
df7c46fbdd
Merge branch '2.2' into develop
2018-05-18 12:45:15 +03:00
9d10642cd7
Merge branch '2.2' of github.com:mariadb-corporation/MaxScale into 2.2
2018-05-18 12:42:24 +03:00
001ae8e29a
MXS-1874 Handle SET STATEMENT ... FOR ...
...
The SET STATEMENT ... FOR part can be ignored and the type
of the statement be whatever the type of the part following
FOR is.
2018-05-18 12:35:44 +03:00
b12f037b24
MXS-1874 Fix leak in qc_mysqlembedded
2018-05-18 12:35:44 +03:00
f665125f1c
MXS-1874 Add test that reveals problem
2018-05-18 12:35:44 +03:00
e911c897f6
fix cnf name in add_server_setting()
2018-05-18 12:32:23 +03:00
3cb389a3b5
MXS-1866: Add support for COM_STMT_BULK_EXECUTE
...
Readwritesplit now detects the COM_STMT_BULK_EXECUTE command and handles
it correctly.
2018-05-18 12:30:24 +03:00
4b8206ee1d
MXS-1873: Test large session commands
...
The test generates a large session command and makes sure queries after it
work correctly.
2018-05-18 12:29:47 +03:00
