From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Jul 2015 14:43:38 +0000 (-0400)
Subject: osd/PG: starting or continuing backfill .. be more precise
X-Git-Tag: v9.1.0~346^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5a1709e247654717339b157e12fd718eec112f1;p=ceph.git

osd/PG: starting or continuing backfill .. be more precise

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 62571083b9b..2b657797e3b 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1618,6 +1618,12 @@ void PG::activate(ObjectStore::Transaction& t,
 
       if (pi.last_update == info.last_update) {
         // empty log
+	if (!pi.last_backfill.is_max())
+	  osd->clog->info() << info.pgid << " continuing backfill to osd."
+			    << peer
+			    << " from (" << pi.log_tail << "," << pi.last_update
+			    << "] " << pi.last_backfill
+			    << " to " << info.last_update;
 	if (!pi.is_empty() && activator_map) {
 	  dout(10) << "activate peer osd." << peer << " is up to date, queueing in pending_activators" << dendl;
 	  (*activator_map)[peer.osd].push_back(
@@ -1650,8 +1656,9 @@ void PG::activate(ObjectStore::Transaction& t,
 	 * behind.
 	 */
 	// backfill
-	osd->clog->info() << info.pgid << " restarting backfill on osd." << peer
-			 << " from (" << pi.log_tail << "," << pi.last_update << "] " << pi.last_backfill
+	osd->clog->info() << info.pgid << " starting backfill to osd." << peer
+			 << " from (" << pi.log_tail << "," << pi.last_update
+			  << "] " << pi.last_backfill
 			 << " to " << info.last_update;
 
 	pi.last_update = info.last_update;