PG: prefer log with longer tail

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index cf3565d274952b7b9bc30eb943a1ca462710f269..54966cfdd7e5b5f2b89bf90e8274f2da96d2a47b 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1342,7 +1342,9 @@ bool PG::choose_log_location(const PgPriorSet &prior_set,
     if (prior_set.cur.find(i->first) == prior_set.cur.end()) {
       continue;
     }
-    if (i->second.last_update > best_info->last_update) {
+    if (i->second.last_update > best_info->last_update ||
+       ((i->second.last_update == best_info->last_update) &&
+        (i->second.log_tail < best_info->log_tail))) {
       best_info = &(i->second);
       pull_from = i->first;
       newest_update = i->second.last_update;