mon: handle case where mon_globalid_prealloc > max_global_id

This triggers with the new larger mon_globalid_prealloc value.  It didn't
trigger on the existing cluster I tested on because it already had a very
large max.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bbaf582e5bb54ae35327ffd234e4ccf0f07317db)

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 359c2e101cf8c181b811a58bd9faf7fb65495a99..9e074e2c886a1ca1eeb9286e173846226286daa5 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -339,7 +339,8 @@ uint64_t AuthMonitor::assign_global_id(MAuth *m, bool should_increase_max)
 
   // bump the max?
   while (mon->is_leader() &&
-        next_global_id >= max_global_id - g_conf->mon_globalid_prealloc / 2) {
+        (max_global_id < g_conf->mon_globalid_prealloc ||
+         next_global_id >= max_global_id - g_conf->mon_globalid_prealloc / 2)) {
     increase_max_global_id();
   }