ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject ambari git commit: AMBARI-8674. Disable pre-upgrade checks until API is ready. (yusaku)
Date Thu, 11 Dec 2014 23:47:23 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 16f1b9cea -> cfc8fe180


AMBARI-8674. Disable pre-upgrade checks until API is ready. (yusaku)


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

Branch: refs/heads/trunk
Commit: cfc8fe180c27749a939f4d66f317f821515da2d8
Parents: 16f1b9c
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Thu Dec 11 15:41:05 2014 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Thu Dec 11 15:41:27 2014 -0800

----------------------------------------------------------------------
 ambari-web/app/config.js                            |  1 +
 .../main/admin/stack_and_upgrade_controller.js      | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/cfc8fe18/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 0f66017..504e427 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -57,6 +57,7 @@ App.isManagedMySQLForHiveEnabled = false;
 App.enableExperimental = false;
 
 App.supports = {
+  preUpgradeCheck: false,
   stackUpgrade: false,
   autoRollbackHA: false,
   alwaysEnableManagedMySQLForHive: false,

http://git-wip-us.apache.org/repos/asf/ambari/blob/cfc8fe18/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 2d73ab3..d9745ab 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -282,12 +282,16 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
    * @param version
    */
   runPreUpgradeCheck: function(version) {
-    App.ajax.send({
-      name: "admin.rolling_upgrade.pre_upgrade_check",
-      sender: this,
-      data: version,
-      success: "runPreUpgradeCheckSuccess"
-    })
+    if (App.supports.preUpgradeCheck) {
+      App.ajax.send({
+        name: "admin.rolling_upgrade.pre_upgrade_check",
+        sender: this,
+        data: version,
+        success: "runPreUpgradeCheckSuccess"
+      });
+    } else {
+      this.upgrade(version);
+    }
   },
 
   /**


Mime
View raw message