ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: Revert "AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> HDP-2.3 (jluniya)"
Date Tue, 03 Nov 2015 06:08:58 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b38be7fc9 -> 8098e39de


Revert "AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> HDP-2.3
(jluniya)"

This reverts commit b38be7fc9abcd72ccc1cbe61b7ba0d071a213f0b.


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

Branch: refs/heads/trunk
Commit: 8098e39dedc2035f4e97adfe646965a9a326b128
Parents: b38be7f
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Mon Nov 2 22:08:32 2015 -0800
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Mon Nov 2 22:08:32 2015 -0800

----------------------------------------------------------------------
 .../ambari/server/api/handlers/CreateHandler.java       |  2 +-
 .../internal/ClusterStackVersionResourceProvider.java   | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8098e39d/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
index 9690bcd..c1bd91b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
@@ -54,7 +54,7 @@ public class CreateHandler extends BaseManagementHandler {
       result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.NOT_FOUND, e.getMessage()));
     } catch (SystemException e) {
       if (LOG.isErrorEnabled()) {
-        LOG.error("Caught a system exception while attempting to create a resource: {}",
e.getMessage());
+        LOG.error("Caught a system exception while attempting to create a resource", e.getMessage());
       }
       result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.SERVER_ERROR, e.getMessage()));
     } catch (ResourceAlreadyExistsException e) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8098e39d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 22212bf..adae105 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -383,10 +383,10 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
       // Create next stage
       String stageName;
       if (batchCount > 1) {
+        stageName = INSTALL_PACKAGES_FULL_NAME;
+      } else {
         stageName = String.format(INSTALL_PACKAGES_FULL_NAME + ". Batch %d of %d", batchId,
             batchCount);
-      } else {
-        stageName = INSTALL_PACKAGES_FULL_NAME;
       }
 
       Stage stage = stageFactory.createNew(req.getId(), "/tmp/ambari", cluster.getClusterName(),
@@ -414,6 +414,7 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
         } else {
           directTransitions.add(host);
         }
+
       }
     }
 
@@ -549,11 +550,8 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
         componentInfo = ami.getComponent(stackId.getStackName(),
                 stackId.getStackVersion(), component.getServiceName(), component.getServiceComponentName());
       } catch (AmbariException e) {
-        // It is possible that the component has been removed from the new stack
-        // (example: STORM_REST_API has been removed from HDP-2.2)
-        LOG.warn(String.format("Exception while accessing component %s of service %s for
stack %s",
-            component.getServiceComponentName(), component.getServiceName(), stackId));
-        continue;
+        throw new SystemException(String.format("Exception while accessing component %s of
service %s for stack %s",
+                component.getServiceName(), component.getServiceComponentName(), stackId));
       }
       if (componentInfo.isVersionAdvertised()) {
         return true;


Mime
View raw message