From: Samuel Just <sam.just@inktank.com>
Date: Fri, 19 Apr 2013 17:51:08 +0000 (-0700)
Subject: PG: check for pg change in ~FlushState
X-Git-Tag: v0.61~136^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ef0f162df82dfcdaf43fef8f997d695df47907b;p=ceph.git

PG: check for pg change in ~FlushState

Fixes: #4662
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 0cc504e265b8..6f157eb6680d 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4901,7 +4901,8 @@ struct FlushState {
   FlushState(PG *pg, epoch_t epoch) : pg(pg), epoch(epoch) {}
   ~FlushState() {
     pg->lock();
-    pg->queue_flushed(epoch);
+    if (!pg->pg_has_reset_since(epoch))
+      pg->queue_flushed(epoch);
     pg->unlock();
   }
 };