]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: starting or continuing backfill .. be more precise
authorSage Weil <sage@redhat.com>
Wed, 29 Jul 2015 14:43:38 +0000 (10:43 -0400)
committerSage Weil <sage@redhat.com>
Fri, 7 Aug 2015 14:16:06 +0000 (10:16 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PG.cc

index 62571083b9b858ce604fc19692add3ebb69634f7..2b657797e3bd32da62957ae87e8478707cb25108 100644 (file)
@@ -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;