Просмотр исходного кода

AMBARI-13593. Upgrade: UI should determine the ongoing skip failure flag based on Upgrade/skip_failures from the API.(xiwang)

Xi Wang 9 лет назад
Родитель
Сommit
376f80fc20

+ 5 - 1
ambari-web/app/controllers/global/cluster_controller.js

@@ -308,7 +308,11 @@ App.ClusterController = Em.Controller.extend(App.ReloadPopupMixin, {
           isDowngrade: lastUpgradeData.Upgrade.direction === 'DOWNGRADE',
           upgradeState: lastUpgradeData.Upgrade.request_status,
           upgradeType: lastUpgradeData.Upgrade.upgrade_type,
-          downgradeAllowed: lastUpgradeData.Upgrade.downgrade_allowed
+          downgradeAllowed: lastUpgradeData.Upgrade.downgrade_allowed,
+          failuresTolerance: Em.Object.create({
+            skipComponentFailures: lastUpgradeData.Upgrade.skip_failures,
+            skipSCFailures: lastUpgradeData.Upgrade.skip_service_check_failures
+          })
         });
         upgradeController.loadRepoVersionsToModel().done(function () {
           upgradeController.setDBProperty('upgradeVersion', App.RepositoryVersion.find().findProperty('repositoryVersion', lastUpgradeData.Upgrade.to_version).get('displayName'));

+ 1 - 1
ambari-web/app/utils/ajax/ajax.js

@@ -1291,7 +1291,7 @@ var urls = {
     'mock': '/data/clusters/info.json'
   },
   'cluster.load_last_upgrade': {
-    'real': '/clusters/{clusterName}/upgrades?fields=Upgrade/request_status,Upgrade/request_id,Upgrade/to_version,Upgrade/direction,Upgrade/upgrade_type,Upgrade/downgrade_allowed',
+    'real': '/clusters/{clusterName}/upgrades?fields=Upgrade/request_status,Upgrade/request_id,Upgrade/to_version,Upgrade/direction,Upgrade/upgrade_type,Upgrade/downgrade_allowed,Upgrade/skip_failures,Upgrade/skip_service_check_failures',
     'mock': '/data/stack_versions/upgrades.json'
   },
   'cluster.update_upgrade_version': {