ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: AMBARI-15569. Ambari calculates stack downgrade as ABORTED under incorrect conditions. UI shows 'Downgrade paused' and button to resume downgrade even when progress is happening (alejandro)
Date Mon, 28 Mar 2016 23:22:10 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 54cbe9e7d -> 55df8f22d


AMBARI-15569. Ambari calculates stack downgrade as ABORTED under incorrect conditions. UI
shows 'Downgrade paused' and button to resume downgrade even when progress is happening (alejandro)


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

Branch: refs/heads/trunk
Commit: 55df8f22d7b8edbe4cfd0eef154fde07ec8f2f80
Parents: 54cbe9e
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Mon Mar 28 16:22:02 2016 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Mon Mar 28 16:22:02 2016 -0700

----------------------------------------------------------------------
 .../server/controller/internal/UpgradeResourceProvider.java   | 2 +-
 .../org/apache/ambari/server/orm/entities/UpgradeEntity.java  | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/55df8f22/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index e69bc90..714495f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -534,7 +534,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
     setResourceProperty(resource, UPGRADE_FROM_VERSION, entity.getFromVersion(), requestedIds);
     setResourceProperty(resource, UPGRADE_TO_VERSION, entity.getToVersion(), requestedIds);
     setResourceProperty(resource, UPGRADE_DIRECTION, entity.getDirection(), requestedIds);
-    setResourceProperty(resource, UPGRADE_SUSPENDED, entity.getSuspended(), requestedIds);
+    setResourceProperty(resource, UPGRADE_SUSPENDED, entity.isSuspended(), requestedIds);
     setResourceProperty(resource, UPGRADE_DOWNGRADE_ALLOWED, entity.isDowngradeAllowed(),
requestedIds);
     setResourceProperty(resource, UPGRADE_SKIP_FAILURES, entity.isComponentFailureAutoSkipped(),
requestedIds);
     setResourceProperty(resource, UPGRADE_SKIP_SC_FAILURES, entity.isServiceCheckFailureAutoSkipped(),
requestedIds);

http://git-wip-us.apache.org/repos/asf/ambari/blob/55df8f22/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
index b47860f..fd866a1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
@@ -198,13 +198,6 @@ public class UpgradeEntity {
   }
 
   /**
-   * @return if the upgrade is suspended
-   */
-  public boolean getSuspended() {
-    return suspended == 1;
-  }
-
-  /**
    * @param direction the direction of the upgrade
    */
   public void setDirection(Direction direction) {


Mime
View raw message