update sources to v12.2.3

[ceph.git] / ceph / src / osd / PGBackend.cc

diff --git a/ceph/src/osd/PGBackend.cc b/ceph/src/osd/PGBackend.cc
index 468e29297d0de41e14bad096c23d4ee82d2219ed..9663729d5471318c20b0b99625e216b33892626c 100644 (file)
--- a/ceph/src/osd/PGBackend.cc
+++ b/ceph/src/osd/PGBackend.cc
@@ -768,7 +768,7 @@ map<pg_shard_t, ScrubMap *>::const_iterator
   eversion_t auth_version;
   bufferlist first_bl;
 
-  // Create list of shards with primary last so it will be auth copy all
+  // Create list of shards with primary first so it will be auth copy all
   // other things being equal.
   list<pg_shard_t> shards;
   for (map<pg_shard_t, ScrubMap *>::const_iterator j = maps.begin();
@@ -778,7 +778,7 @@ map<pg_shard_t, ScrubMap *>::const_iterator
       continue;
     shards.push_back(j->first);
   }
-  shards.push_back(get_parent()->whoami_shard());
+  shards.push_front(get_parent()->whoami_shard());
 
   map<pg_shard_t, ScrubMap *>::const_iterator auth = maps.end();
   for (auto &l : shards) {
@@ -988,6 +988,7 @@ void PGBackend::be_compare_scrubmaps(
          // Track possible shard to use as authoritative, if needed
          // There are errors, without identifying the shard
          object_errors.insert(j->first);
+         errorstream << pgid << " : soid " << *k << " " << ss.str() << "\n";
        } else {
          // XXX: The auth shard might get here that we don't know
          // that it has the "correct" data.