Repository: ambari Updated Branches: refs/heads/trunk 03ce1907b -> d0d86edd5
AMBARI-16118. Additional logs required when posting ambari configuration failed with 400 response. (magyari_sandor) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d0d86edd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d0d86edd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d0d86edd Branch: refs/heads/trunk Commit: d0d86edd57cf5a0f50058bf7fa621f8874136bd3 Parents: 03ce190 Author: Sandor Magyari <[email protected]> Authored: Tue Apr 26 19:01:34 2016 +0200 Committer: Sandor Magyari <[email protected]> Committed: Wed Apr 27 14:23:53 2016 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/api/handlers/CreateHandler.java | 2 ++ .../org/apache/ambari/server/api/services/BaseService.java | 8 ++++++++ .../server/controller/internal/ClusterResourceProvider.java | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d0d86edd/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 d31f807..3498a90 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 @@ -52,6 +52,7 @@ public class CreateHandler extends BaseManagementHandler { result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.FORBIDDEN, e.getMessage())); } catch (UnsupportedPropertyException e) { result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.BAD_REQUEST, e.getMessage())); + LOG.error("Bad request received: " + e.getMessage()); } catch (NoSuchParentResourceException e) { //todo: is this the correct status code? result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.NOT_FOUND, e.getMessage())); @@ -63,6 +64,7 @@ public class CreateHandler extends BaseManagementHandler { } catch (ResourceAlreadyExistsException e) { result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.CONFLICT, e.getMessage())); } catch(IllegalArgumentException e) { + LOG.error("Bad request received: " + e.getMessage()); result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.BAD_REQUEST, e.getMessage())); } catch (RuntimeException e) { if (LOG.isErrorEnabled()) { http://git-wip-us.apache.org/repos/asf/ambari/blob/d0d86edd/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java index b7156bf..139cf43 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java @@ -31,6 +31,8 @@ import org.apache.ambari.server.audit.request.RequestAuditLogger; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.utils.RetryHelper; import org.eclipse.jetty.util.ajax.JSON; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; @@ -49,6 +51,11 @@ public abstract class BaseService { public final static MediaType MEDIA_TYPE_TEXT_CSV_TYPE = new MediaType("text", "csv"); /** + * Logger instance. + */ + protected final static Logger LOG = LoggerFactory.getLogger(BaseService.class); + + /** * Factory for creating resource instances. */ private ResourceInstanceFactory m_resourceFactory = new ResourceInstanceFactoryImpl(); @@ -128,6 +135,7 @@ public abstract class BaseService { } } catch (BodyParseException e) { result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.BAD_REQUEST, e.getMessage())); + LOG.error("Bad request received: " + e.getMessage()); requestAuditLogger.log(request, result); } catch (Throwable t) { requestAuditLogger.log(request, new ResultImpl(new ResultStatus(ResultStatus.STATUS.SERVER_ERROR, t.getMessage()))); http://git-wip-us.apache.org/repos/asf/ambari/blob/d0d86edd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java index cc36f75..cb30f2d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java @@ -541,7 +541,6 @@ public class ClusterResourceProvider extends AbstractControllerResourceProvider } catch (InvalidTopologyException e) { throw new IllegalArgumentException("Topology validation failed: " + e, e); } catch (AmbariException e) { - e.printStackTrace(); throw new SystemException("Unknown exception when asking TopologyManager to provision cluster", e); } }
