From: Samuel Just Date: Mon, 13 May 2013 16:50:14 +0000 (-0700) Subject: OSD: We need to wait on CLEARING_DIR, not DELETED_DIR X-Git-Tag: v0.63~36 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9bb58b2ac9e4f72d91eb2008cd706cbb4eca7819;p=ceph.git OSD: We need to wait on CLEARING_DIR, not DELETED_DIR Signed-off-by: Samuel Just Reviewed-by: Sage Weil --- diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 905af9cfb2a3..b14592880aac 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -208,15 +208,15 @@ public: Mutex::Locker l(lock); stop_deleting = true; /** - * If we are in DELETING_DIR or DELETED_DIR, there are in progress + * If we are in DELETING_DIR or CLEARING_DIR, there are in progress * operations we have to wait for before continuing on. States * DELETED_DIR, QUEUED, and CANCELED either check for stop_deleting * prior to performing any operations or signify the end of the * deleting process. We don't want to wait to leave the QUEUED - * state, because this might block the caller behind entire pg - * removals. + * state, because this might block the caller behind an entire pg + * removal. */ - while (status == DELETING_DIR || status == DELETED_DIR) + while (status == DELETING_DIR || status == CLEARING_DIR) cond.Wait(lock); return status != DELETED_DIR; } ///< @return true if we don't need to recreate the collection