]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: A backfill osd can have last_complete < log_tail
authorSamuel Just <samuel.just@dreamhost.com>
Tue, 13 Dec 2011 18:11:37 +0000 (10:11 -0800)
committerSamuel Just <samuel.just@dreamhost.com>
Wed, 14 Dec 2011 19:32:22 +0000 (11:32 -0800)
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
src/osd/PG.cc

index 23750b914cdfe5354c160ade2501dd393775f780..1da29a270ecd15158b99fced66f849d889d6b268 100644 (file)
@@ -4042,11 +4042,11 @@ boost::statechart::result PG::RecoveryState::Stray::react(const MInfoRec& infoev
     pg->log.clear();
     pg->log.head = pg->info.last_update;
     pg->log.tail = pg->info.last_update;
+  } else {
+    assert(pg->log.tail <= pg->info.last_complete);
+    assert(pg->log.head == pg->info.last_update);
   }
 
-  assert(pg->log.tail <= pg->info.last_complete);
-  assert(pg->log.head == pg->info.last_update);
-
   post_event(Activate());
   return discard_event();
 }