]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: check for pg change in ~FlushState
authorSamuel Just <sam.just@inktank.com>
Fri, 19 Apr 2013 17:51:08 +0000 (10:51 -0700)
committerSamuel Just <sam.just@inktank.com>
Sat, 20 Apr 2013 00:10:27 +0000 (17:10 -0700)
Fixes: #4662
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/PG.cc

index 0cc504e265b81cffe1a5ea02d7120db3f403abeb..6f157eb6680d0430a0640abc3cc9f046111de800 100644 (file)
@@ -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();
   }
 };