diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-04-06 15:54:59 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-04-07 08:45:01 +0300 |
| commit | 3c99a48db31c8601a5eb0a9465dc96d8f7f72999 (patch) | |
| tree | 711e6c51e6309e43466f52cda28a17c365ffe835 | |
| parent | 7355f7b1f5cec0f3db60053941d0c78288917c43 (diff) | |
| download | mariadb-git-3c99a48db31c8601a5eb0a9465dc96d8f7f72999.tar.gz | |
MDEV-28247 : Disable background ibuf merge during Galera SST
This failure was caused by MDEV-25975, which removed the parameter
innodb_disallow_writes.
Added a check for wsrep_sst_disable_writes to the function
ibuf_merge_in_background().
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index 60496f20230..f530ed75b61 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -27,6 +27,13 @@ Created 7/19/1997 Heikki Tuuri #include "ibuf0ibuf.h" #include "sync0sync.h" #include "btr0sea.h" +#ifdef WITH_WSREP +extern uint32 wsrep_sst_disable_writes; +# define wsrep_sst_disable_writes \ + my_atomic_load32_explicit(&wsrep_sst_disable_writes, MY_MEMORY_ORDER_RELAXED) +#else +# define wsrep_sst_disable_writes false +#endif using st_::span; @@ -2653,6 +2660,10 @@ ibuf_merge_in_background( } #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ + if (wsrep_sst_disable_writes) { + return(0); + } + if (full) { /* Caller has requested a full batch */ n_pages = PCT_IO(100); |