mon/MgrMonitor: promote standby when unsetting down flag

In the same epoch, to simplify testing.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit e0441402d6691f68c3ea95ce60b6e3ba101a0a1e)

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 74cfa7113860058f72598bea28dd18ae1bfc43e2..e6fc50521643ddceccd2e32ef9156ecf250d9182 100644 (file)
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -1231,6 +1231,9 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op)
         }
       } else {
         pending_map.flags &= ~(MgrMap::FLAG_DOWN);
+        if (pending_map.active_gid == 0) {
+          promote_standby();
+        }
       }
     } else {
       return -EINVAL;