From 1f2d54972e2781f53e733a17bd1a21cb85a20621 Mon Sep 17 00:00:00 2001 From: Li Wang Date: Fri, 16 Dec 2016 06:43:14 +0000 Subject: [PATCH] JournalingObjectStore: remove misleading comments Prior to start journal commit, it always needs to wait the ongoing apply operation to finish, not only needed during journal replay. Between commit_start() and commit_started(), it always needs to prevent starting apply, not only needed during journal replay. Signed-off-by: Li Wang --- src/os/filestore/JournalingObjectStore.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/os/filestore/JournalingObjectStore.cc b/src/os/filestore/JournalingObjectStore.cc index 467991efd2b6..38e8616c18fe 100644 --- a/src/os/filestore/JournalingObjectStore.cc +++ b/src/os/filestore/JournalingObjectStore.cc @@ -119,7 +119,6 @@ uint64_t JournalingObjectStore::ApplyManager::op_apply_start(uint64_t op) { Mutex::Locker l(apply_lock); while (blocked) { - // note: this only happens during journal replay dout(10) << "op_apply_start blocked, waiting" << dendl; blocked_cond.Wait(apply_lock); } @@ -140,7 +139,7 @@ void JournalingObjectStore::ApplyManager::op_apply_finish(uint64_t op) --open_ops; assert(open_ops >= 0); - // signal a blocked commit_start (only needed during journal replay) + // signal a blocked commit_start if (blocked) { blocked_cond.Signal(); } -- 2.47.3