diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 22:10:07 +0530 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-04 07:53:00 +0200 |
| commit | 1e9c5f08f535ae74a795ec8adee088e14901de93 (patch) | |
| tree | 6f65816c7b261529d2a4e2ff86d49bd077218846 | |
| parent | eb1e3e5caa075c15651bf3469c5e5435a07ad311 (diff) | |
| download | mariadb-git-1e9c5f08f535ae74a795ec8adee088e14901de93.tar.gz | |
MENT-788 timeout when shrinking the log
log_checkpoint(): do write checkpoints when log resizing is in progress
| -rw-r--r-- | mysql-test/suite/innodb/disabled.def | 1 | ||||
| -rw-r--r-- | storage/innobase/log/log0log.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/disabled.def b/mysql-test/suite/innodb/disabled.def index 1258508b575..35c941f8af7 100644 --- a/mysql-test/suite/innodb/disabled.def +++ b/mysql-test/suite/innodb/disabled.def @@ -11,4 +11,3 @@ ############################################################################## create-index-debug : MDEV-13680 InnoDB may crash when btr_page_alloc() fails -innodb.innodb_log_size_online : MENT-788 timeout when shrinking the log diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 8514cea8a3d..9dfda793c85 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -1545,6 +1545,9 @@ bool log_checkpoint() logically empty (not even containing a MLOG_CHECKPOINT record) after a clean shutdown. Perform an extra checkpoint at shutdown. */ + } else if (log_sys.log.future_fd_exists.load( + std::memory_order_relaxed)) { + /* this ensures log resizing progress */ } else { /* Do nothing, because nothing was logged (other than a FILE_CHECKPOINT marker) since the previous checkpoint. */ |