]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: fix hit_set_setup() on_activate() 967/head
authorSage Weil <sage@inktank.com>
Tue, 17 Dec 2013 23:58:21 +0000 (15:58 -0800)
committerSage Weil <sage@inktank.com>
Tue, 17 Dec 2013 23:58:21 +0000 (15:58 -0800)
Didn't read that if carefully the first time around!

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/ReplicatedPG.cc

index acf32e4f0e2ca4739e09478d849aa9e17cc23586..e68e7f0563ec42dae7dfba25fa861110a63f8aa7 100644 (file)
@@ -7436,12 +7436,12 @@ void ReplicatedPG::on_shutdown()
 void ReplicatedPG::on_activate()
 {
   int backfill_target = get_backfill_target();
-  if (backfill_target == -1)
-    return;
-  last_backfill_started = peer_info[backfill_target].last_backfill;
-  assert(last_backfill_started != hobject_t::get_max());
-  dout(10) << " chose backfill target osd." << backfill_target
-          << " from " << last_backfill_started << dendl;
+  if (backfill_target != -1) {
+    last_backfill_started = peer_info[backfill_target].last_backfill;
+    assert(last_backfill_started != hobject_t::get_max());
+    dout(10) << " chose backfill target osd." << backfill_target
+            << " from " << last_backfill_started << dendl;
+  }
 
   hit_set_setup();
 }