ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject ambari git commit: AMBARI-13593. Upgrade: UI should determine the ongoing skip failure flag based on Upgrade/skip_failures from the API.(xiwang)
Date Tue, 27 Oct 2015 23:15:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk f342ea960 -> 376f80fc2


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/376f80fc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/376f80fc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/376f80fc

Branch: refs/heads/trunk
Commit: 376f80fc20defbce8b369490a40f7f65fd2253da
Parents: f342ea9
Author: Xi Wang <xiwang@apache.org>
Authored: Tue Oct 27 14:59:37 2015 -0700
Committer: Xi Wang <xiwang@apache.org>
Committed: Tue Oct 27 15:29:33 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/global/cluster_controller.js | 6 +++++-
 ambari-web/app/utils/ajax/ajax.js                       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/376f80fc/ambari-web/app/controllers/global/cluster_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js
index fbed2f1..d9fba00 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/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'));

http://git-wip-us.apache.org/repos/asf/ambari/blob/376f80fc/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 411b3f0..30daace 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/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': {


Mime
View raw message