crush/CrushWrapper: fix finalize clobbering of max_devices

This hides device names when they don't appear in the hierarchy,
e.g. after setting a name and class for a new device that hasn't
yet been put in the tree.

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

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index ed13ff26d67c5ee3d83f114ecf9dea457841c488..5bd5c47a576680a755f9873f5d61b2dd76ba5f25 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -1251,6 +1251,10 @@ public:
   void finalize() {
     assert(crush);
     crush_finalize(crush);
+    if (!name_map.empty() &&
+       name_map.rbegin()->first >= crush->max_devices) {
+      crush->max_devices = name_map.rbegin()->first + 1;
+    }
     have_uniform_rules = !has_legacy_rule_ids();
   }
   int bucket_set_alg(int id, int alg);