Commit 3ef3c467 authored by Daniele Sciascia's avatar Daniele Sciascia Committed by Jan Lindström

MW-365 Do not load/dump innodb buffer pool with wsrep_recover

parent 90642637
...@@ -41,6 +41,9 @@ Created April 08, 2011 Vasil Dimov ...@@ -41,6 +41,9 @@ Created April 08, 2011 Vasil Dimov
#include "sync0rw.h" /* rw_lock_s_lock() */ #include "sync0rw.h" /* rw_lock_s_lock() */
#include "ut0byte.h" /* ut_ull_create() */ #include "ut0byte.h" /* ut_ull_create() */
#include "ut0sort.h" /* UT_SORT_FUNCTION_BODY */ #include "ut0sort.h" /* UT_SORT_FUNCTION_BODY */
#ifdef WITH_WSREP
extern my_bool wsrep_recovery;
#endif /* WITH_WSREP */
enum status_severity { enum status_severity {
STATUS_INFO, STATUS_INFO,
...@@ -689,7 +692,13 @@ DECLARE_THREAD(buf_dump_thread)( ...@@ -689,7 +692,13 @@ DECLARE_THREAD(buf_dump_thread)(
buf_load_status(STATUS_INFO, "not started"); buf_load_status(STATUS_INFO, "not started");
if (srv_buffer_pool_load_at_startup) { if (srv_buffer_pool_load_at_startup) {
#ifdef WITH_WSREP
if (!wsrep_recovery) {
#endif /* WITH_WSREP */
buf_load(); buf_load();
#ifdef WITH_WSREP
}
#endif /* WITH_WSREP */
} }
while (!SHUTTING_DOWN()) { while (!SHUTTING_DOWN()) {
...@@ -713,8 +722,14 @@ DECLARE_THREAD(buf_dump_thread)( ...@@ -713,8 +722,14 @@ DECLARE_THREAD(buf_dump_thread)(
} }
if (srv_buffer_pool_dump_at_shutdown && srv_fast_shutdown != 2) { if (srv_buffer_pool_dump_at_shutdown && srv_fast_shutdown != 2) {
#ifdef WITH_WSREP
if (!wsrep_recovery) {
#endif /* WITH_WSREP */
buf_dump(FALSE /* ignore shutdown down flag, buf_dump(FALSE /* ignore shutdown down flag,
keep going even if we are in a shutdown state */); keep going even if we are in a shutdown state */);
#ifdef WITH_WSREP
}
#endif /* WITH_WSREP */
} }
srv_buf_dump_thread_active = FALSE; srv_buf_dump_thread_active = FALSE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment