diff options
| author | Kefu Chai <tchaikov@gmail.com> | 2017-10-19 07:53:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 07:53:15 +0200 |
| commit | 0d32658ecfb3e804010a2e03cbf5ebe6ef972dbb (patch) | |
| tree | 4363fc6b8ed0f78a9f73144b5f80d88a4e4c59b1 /src/os | |
| parent | Merge pull request #18256 from liewegas/wip-bluestore-superblock (diff) | |
| parent | os/Filestore: fix wbthrottle assert. (diff) | |
| download | ceph-0d32658ecfb3e804010a2e03cbf5ebe6ef972dbb.tar.xz ceph-0d32658ecfb3e804010a2e03cbf5ebe6ef972dbb.zip | |
Merge pull request #14213 from xiaoxichen/fix_wbthrottle_assert
os/Filestore: fix wbthrottle assert.
Reviewed-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/filestore/WBThrottle.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/filestore/WBThrottle.cc b/src/os/filestore/WBThrottle.cc index c45f90ca5e8..eee8e12a88a 100644 --- a/src/os/filestore/WBThrottle.cc +++ b/src/os/filestore/WBThrottle.cc @@ -135,7 +135,7 @@ bool WBThrottle::get_next_should_flush( { assert(lock.is_locked()); assert(next); - while (!stopping && !beyond_limit()) + while (!stopping && (!beyond_limit() || pending_wbs.empty())) cond.Wait(lock); if (stopping) return false; |