From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Jul 2015 15:46:09 +0000 (-0400)
Subject: osd/ReplicatedPG: assert map and set sort order is correct during backfill
X-Git-Tag: v9.1.0~346^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cc861f2a2a0c08635cd246d52659f8c2863e9ed;p=ceph.git

osd/ReplicatedPG: assert map and set sort order is correct during backfill

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 1bfa68b22b63..34684ddabd47 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -9669,6 +9669,18 @@ int ReplicatedPG::recover_backfill(
       hobject_t::Comparator(get_sort_bitwise()));
   }
 
+  // sanity check sort orders
+  assert(backfill_info.sort_bitwise == get_sort_bitwise());
+  for (map<pg_shard_t, BackfillInterval>::iterator i =
+	 peer_backfill_info.begin();
+       i != peer_backfill_info.end();
+       ++i) {
+    assert(i->second.sort_bitwise == get_sort_bitwise());
+    assert(i->second.objects.key_comp().bitwise == get_sort_bitwise());
+  }
+  assert(backfills_in_flight.key_comp().bitwise == get_sort_bitwise());
+  assert(pending_backfill_updates.key_comp().bitwise == get_sort_bitwise());
+
   for (set<pg_shard_t>::iterator i = backfill_targets.begin();
        i != backfill_targets.end();
        ++i) {