Skip to content

Commit 3ef3c46

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

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

storage/innobase/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,
@@ -689,7 +692,13 @@ DECLARE_THREAD(buf_dump_thread)(
689692
buf_load_status(STATUS_INFO, "not started");
690693

691694
if (srv_buffer_pool_load_at_startup) {
695+
#ifdef WITH_WSREP
696+
if (!wsrep_recovery) {
697+
#endif /* WITH_WSREP */
692698
buf_load();
699+
#ifdef WITH_WSREP
700+
}
701+
#endif /* WITH_WSREP */
693702
}
694703

695704
while (!SHUTTING_DOWN()) {
@@ -713,8 +722,14 @@ DECLARE_THREAD(buf_dump_thread)(
713722
}
714723

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

720735
srv_buf_dump_thread_active = FALSE;

0 commit comments

Comments
 (0)