Skip to content

Commit 6da41e1

Browse files
sciascidJan Lindström
authored andcommitted
MW-365 Do not load/dump innodb buffer pool with wsrep_recover
1 parent 3ef3c46 commit 6da41e1

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

storage/xtradb/buf/buf0dump.cc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ Created April 08, 2011 Vasil Dimov
4141
#include "sync0rw.h" /* rw_lock_s_lock() */
4242
#include "ut0byte.h" /* ut_ull_create() */
4343
#include "ut0sort.h" /* UT_SORT_FUNCTION_BODY */
44+
#ifdef WITH_WSREP
45+
extern my_bool wsrep_recovery;
46+
#endif /* WITH_WSREP */
4447

4548
enum status_severity {
4649
STATUS_INFO,
@@ -690,7 +693,13 @@ DECLARE_THREAD(buf_dump_thread)(
690693
buf_load_status(STATUS_INFO, "not started");
691694

692695
if (srv_buffer_pool_load_at_startup) {
696+
#ifdef WITH_WSREP
697+
if (!wsrep_recovery) {
698+
#endif /* WITH_WSREP */
693699
buf_load();
700+
#ifdef WITH_WSREP
701+
}
702+
#endif /* WITH_WSREP */
694703
}
695704

696705
while (!SHUTTING_DOWN()) {
@@ -714,8 +723,14 @@ DECLARE_THREAD(buf_dump_thread)(
714723
}
715724

716725
if (srv_buffer_pool_dump_at_shutdown && srv_fast_shutdown != 2) {
726+
#ifdef WITH_WSREP
727+
if (!wsrep_recovery) {
728+
#endif /* WITH_WSREP */
717729
buf_dump(FALSE /* ignore shutdown down flag,
718730
keep going even if we are in a shutdown state */);
731+
#ifdef WITH_WSREP
732+
}
733+
#endif /* WITH_WSREP */
719734
}
720735

721736
srv_buf_dump_thread_active = FALSE;

0 commit comments

Comments
 (0)