From: Sage Weil <sage@inktank.com>
Date: Tue, 17 Dec 2013 23:58:21 +0000 (-0800)
Subject: osd/ReplicatedPG: fix hit_set_setup() on_activate()
X-Git-Tag: v0.75~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F967%2Fhead;p=ceph.git

osd/ReplicatedPG: fix hit_set_setup() on_activate()

Didn't read that if carefully the first time around!

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index acf32e4f0e2c..e68e7f0563ec 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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();
 }