hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Johan Wikman
2018-01-05 09:58:10 +02:00
parent a91b857a43 583c63e7e1
commit bed0b850b1
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Release-Notes/MaxScale-2.1.13-Release-Notes.md
View File

@ -1,4 +1,4 @@
# MariaDB MaxScale 2.1.13 Release Notes # MariaDB MaxScale 2.1.13 Release Notes -- 2017-01-05
Release 2.1.13 is a GA release. Release 2.1.13 is a GA release.

5
maxscale-system-test/testconnections.cpp
View File

@ -316,7 +316,7 @@ TestConnections::~TestConnections()
copy_all_logs(); copy_all_logs();
/* Temporary commnted out due to Galera failure in case of revert /* Temporary disable snapshot revert due to Galera failures
if (global_result != 0 ) if (global_result != 0 )
{ {
if (no_vm_revert) if (no_vm_revert)
@ -328,7 +328,8 @@ TestConnections::~TestConnections()
tprintf("Reverting snapshot\n"); tprintf("Reverting snapshot\n");
revert_snapshot((char*) "clean"); revert_snapshot((char*) "clean");
} }
}*/ }
*/
delete repl; delete repl;
if (!no_galera) if (!no_galera)

17
server/core/log_manager.cc
View File

@ -2316,7 +2316,9 @@ static void* thr_filewriter_fun(void* data)
/** Inform log manager about the state. */ /** Inform log manager about the state. */
skygw_message_send(fwr->fwr_clientmes); skygw_message_send(fwr->fwr_clientmes);
while (!skygw_thread_must_exit(thr)) bool running = true;
do
{ {
/** /**
* Wait until new log arrival message appears. * Wait until new log arrival message appears.
@ -2342,14 +2344,23 @@ static void* thr_filewriter_fun(void* data)
} }
} }
bool send_message = false;
if (flushall_done_flag) if (flushall_done_flag)
{ {
flushall_done_flag = false; flushall_done_flag = false;
flushall_logfiles(false); flushall_logfiles(false);
skygw_message_send(fwr->fwr_clientmes); send_message = true;
} }
} /* while (!skygw_thread_must_exit) */ running = !skygw_thread_must_exit(thr);
if (running && send_message)
{
skygw_message_send(fwr->fwr_clientmes);
}
}
while (running);
ss_debug(skygw_thread_set_state(thr, THR_STOPPED)); ss_debug(skygw_thread_set_state(thr, THR_STOPPED));
/** Inform log manager that file writer thread has stopped. */ /** Inform log manager that file writer thread has stopped. */

2
server/core/skygw_utils.cc
View File

@ -318,7 +318,9 @@ bool skygw_thread_set_exitflag(skygw_thread_t* thr, skygw_message_t* sendmes,
skygw_message_wait(recmes); skygw_message_wait(recmes);
} }
ss_dassert(simple_mutex_lock(thr->sth_mutex, true) == 0);
ss_dassert(thr->sth_state == THR_STOPPED); ss_dassert(thr->sth_state == THR_STOPPED);
ss_dassert(simple_mutex_unlock(thr->sth_mutex) == 0);
return_succp: return_succp:
return succp; return succp;

2
server/core/test/test_log.cc
View File

@ -221,8 +221,6 @@ int main(int argc, char* argv[])
err = MXS_NOTICE("%s", logstr); err = MXS_NOTICE("%s", logstr);
ss_dassert(err == 0); ss_dassert(err == 0);
succp = mxs_log_init(NULL, "/tmp", MXS_LOG_TARGET_FS);
ss_dassert(succp);
skygw_log_enable(LOG_INFO); skygw_log_enable(LOG_INFO);
logstr = ("6.\tWrite to ERROR and thus also to MESSAGE and TRACE logs."); logstr = ("6.\tWrite to ERROR and thus also to MESSAGE and TRACE logs.");
err = MXS_ERROR("%s", logstr); err = MXS_ERROR("%s", logstr);