summaryrefslogtreecommitdiff
path: root/storage/innobase/fil
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-02-12 14:45:21 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-02-12 14:45:21 +0200
commit1a6f708ec594ac0ae2dd30db926ab07b100fa24b (patch)
tree94a3de08048179233b61d203376d251d7d3f5de2 /storage/innobase/fil
parent0448c614c8ffb44868619d5e7015caaee0f72b4c (diff)
downloadmariadb-git-1a6f708ec594ac0ae2dd30db926ab07b100fa24b.tar.gz
MDEV-15058: Deprecate and ignore innodb_buffer_pool_instances
Our benchmarking efforts indicate that the reasons for splitting the buf_pool in commit c18084f71b02ea707c6461353e6cfc15d7553bc6 have mostly gone away, possibly as a result of mysql/mysql-server@ce6109ebfdedfdf185e391a0c97dc6d33867ed78 or similar work. Only in one write-heavy benchmark where the working set size is ten times the buffer pool size, the buf_pool->mutex would be less contended with 4 buffer pool instances than with 1 instance, in buf_page_io_complete(). That contention could be alleviated further by making more use of std::atomic and by splitting buf_pool_t::mutex further (MDEV-15053). We will deprecate and ignore the following parameters: innodb_buffer_pool_instances innodb_page_cleaners There will be only one buffer pool and one page cleaner task. In a number of INFORMATION_SCHEMA views, columns that indicated the buffer pool instance will be removed: information_schema.innodb_buffer_page.pool_id information_schema.innodb_buffer_page_lru.pool_id information_schema.innodb_buffer_pool_stats.pool_id information_schema.innodb_cmpmem.buffer_pool_instance information_schema.innodb_cmpmem_reset.buffer_pool_instance
Diffstat (limited to 'storage/innobase/fil')
-rw-r--r--storage/innobase/fil/fil0crypt.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index 89c900e10bc..1b7862ae358 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -1200,7 +1200,7 @@ static bool fil_crypt_start_encrypting_space(fil_space_t* space)
do {
ulint n_pages = 0;
success = buf_flush_lists(ULINT_MAX, end_lsn, &n_pages);
- buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST);
+ buf_flush_wait_batch_end(BUF_FLUSH_LIST);
sum_pages += n_pages;
} while (!success);
@@ -2137,7 +2137,7 @@ fil_crypt_flush_space(
do {
success = buf_flush_lists(ULINT_MAX, end_lsn, &n_pages);
- buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST);
+ buf_flush_wait_batch_end(BUF_FLUSH_LIST);
sum_pages += n_pages;
} while (!success && !space->is_stopping());