AMBARI-19200 Turning OFF maintenance mode shows a popup on all hosts. (atkach)

ambari-web/app/controllers/global/cluster_controller.js

@@ -306,20 +306,19 @@ App.ClusterController = Em.Controller.extend(App.ReloadPopupMixin, {
       var dbUpgradeState = App.db.get('MainAdminStackAndUpgrade', 'upgradeState');
 
       //completed upgrade shouldn't be restored
-      if (lastUpgradeData && lastUpgradeData.Upgrade.request_status === "COMPLETED") {
-        return;
+      if (lastUpgradeData) {
+        if (lastUpgradeData.Upgrade.request_status !== "COMPLETED") {
+          upgradeController.restoreLastUpgrade(lastUpgradeData);
+        }
+      } else {
+        upgradeController.initDBProperties();
+        upgradeController.loadUpgradeData(true);
       }
 
       if (!Em.isNone(dbUpgradeState)) {
         App.set('upgradeState', dbUpgradeState);
       }
 
-      if (lastUpgradeData) {
-        upgradeController.restoreLastUpgrade(lastUpgradeData);
-      } else {
-        upgradeController.initDBProperties();
-        upgradeController.loadUpgradeData(true);
-      }
       upgradeController.loadStackVersionsToModel(true).done(function () {
         App.set('stackVersionsAvailable', App.StackVersion.find().content.length > 0);
       });

ambari-web/test/controllers/global/cluster_controller_test.js

@@ -533,8 +533,8 @@ describe('App.clusterController', function () {
         expect(upgradeController.restoreLastUpgrade.called).to.be.false;
       });
 
-      it('loadStackVersionsToModel should not be called', function () {
-        expect(upgradeController.loadStackVersionsToModel.called).to.be.false;
+      it('loadStackVersionsToModel should be called', function () {
+        expect(upgradeController.loadStackVersionsToModel).to.be.calledOnce;
       });
     });