Merge pull request #17846 from jecluis/wip-21300

mon/MgrMonitor: read cmd descs if empty on update_from_paxos() Reviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Sep 29, 2017 · fd04ff8 · fd04ff8
2 parents 1aef50a + 3d06079
commit fd04ff8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
@@ -93,8 +93,9 @@ void MgrMonitor::update_from_paxos(bool *need_bootstrap)
     check_subs();
 
     if (version == 1
-	|| (map.get_available()
-	    && (!old_available || old_gid != map.get_active_gid()))) {
+        || command_descs.empty()
+        || (map.get_available()
+            && (!old_available || old_gid != map.get_active_gid()))) {
       dout(4) << "mkfs or daemon transitioned to available, loading commands"
 	      << dendl;
       bufferlist loaded_commands;