AMBARI-20068. Getting Internal Server Error (500) on services API while trying to start all services with atleast one component in INSTALL_FAILED state (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/efbd66b5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/efbd66b5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/efbd66b5 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: efbd66b56fa363462ff70660ec1d487457120337 Parents: 6baf387 Author: Lisnichenko Dmitro <[email protected]> Authored: Wed Feb 22 12:54:55 2017 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Wed Feb 22 12:54:55 2017 +0200 ---------------------------------------------------------------------- .../server/controller/internal/ServiceResourceProvider.java | 2 +- .../server/controller/internal/UpgradeResourceProvider.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/efbd66b5/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java index 99a81c1..a1c53a7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java @@ -781,7 +781,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider if ( ambariMetaInfo.getComponent( sid.getStackName(), sid.getStackVersion(), sc.getServiceName(), sch.getServiceComponentName()).isMaster()) { - throw new AmbariException(error); + throw new IllegalArgumentException(error); } else { LOG.warn("Ignoring: " + error); continue; http://git-wip-us.apache.org/repos/asf/ambari/blob/efbd66b5/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 9ecb774..13a6c36 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 @@ -1984,8 +1984,8 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider if( null != existingUpgrade ){ throw new AmbariException( String.format("Unable to perform %s as another %s (request ID %s) is in progress.", - direction.getText(false), direction.getText(false), - existingUpgrade.getRequestId().longValue())); + direction.getText(false), existingUpgrade.getDirection().getText(false), + existingUpgrade.getRequestId())); } // skip this check if it's a downgrade or we are instructed to skip it
