Repository: ambari Updated Branches: refs/heads/branch-2.4 243cafa89 -> 0e01a3554
AMBARI-18560. Add more logging to track what condition resulted in skipping agent commands. (stoader) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0e01a355 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e01a355 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e01a355 Branch: refs/heads/branch-2.4 Commit: 0e01a3554edea119acf3b68008631a334195b685 Parents: 243cafa Author: Toader, Sebastian <[email protected]> Authored: Mon Oct 10 16:06:55 2016 +0200 Committer: Toader, Sebastian <[email protected]> Committed: Mon Oct 10 16:14:26 2016 +0200 ---------------------------------------------------------------------- .../AmbariManagementControllerImpl.java | 2 +- .../controller/ServiceComponentHostRequest.java | 4 +- .../internal/HostComponentResourceProvider.java | 44 ++++++++++---------- 3 files changed, 27 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0e01a355/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java index 3e4de3d..28914db 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java @@ -2447,7 +2447,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle if ((changedServices == null || changedServices.isEmpty()) && (changedComps == null || changedComps.isEmpty()) && (changedScHosts == null || changedScHosts.isEmpty())) { - LOG.debug("Created 0 stages"); + LOG.info("Created 0 stages"); return requestStages; } http://git-wip-us.apache.org/repos/asf/ambari/blob/0e01a355/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java index 73cedb4..4a07804 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java @@ -182,7 +182,9 @@ public class ServiceComponentHostRequest { .append(", state=").append(state) .append(", desiredStackId=").append(desiredStackId) .append(", staleConfig=").append(staleConfig) - .append(", adminState=").append(adminState).append("}"); + .append(", adminState=").append(adminState) + .append(", maintenanceState=").append(maintenanceState) + .append("}"); return sb.toString(); } http://git-wip-us.apache.org/repos/asf/ambari/blob/0e01a355/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java index df2b476..bc3f632 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java @@ -575,7 +575,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro } if (newState == null) { - logComponentInfo("Nothing to do for new updateServiceComponentHost", request, oldState, null); + LOG.info(getServiceComponentRequestInfoLogMessage("Nothing to do for new updateServiceComponentHost", request, oldState, null)); continue; } @@ -589,7 +589,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro if (sc.isClientComponent() && newState == State.STARTED && !requestProperties.containsKey(sch.getServiceComponentName().toLowerCase())) { ignoredScHosts.add(sch); - logComponentInfo("Ignoring ServiceComponentHost", request, sch.getState(), newState); + LOG.info(getServiceComponentRequestInfoLogMessage("Ignoring ServiceComponentHost as STARTED new desired state for client components is not valid", request, sch.getState(), newState)); continue; } @@ -605,13 +605,13 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro !requestProperties.containsKey(sch.getServiceComponentName().toLowerCase())) { ignoredScHosts.add(sch); - logComponentInfo("Ignoring ServiceComponentHost", request, oldState, newState); + LOG.info(getServiceComponentRequestInfoLogMessage("Ignoring ServiceComponentHost as the current state matches the new desired state", request, oldState, newState)); continue; } if (! maintenanceStateHelper.isOperationAllowed(reqOpLvl, sch)) { ignoredScHosts.add(sch); - logComponentInfo("Ignoring ServiceComponentHost", request, oldState, newState); + LOG.info(getServiceComponentRequestInfoLogMessage("Ignoring ServiceComponentHost as operation is not allowed", request, oldState, newState)); continue; } @@ -627,7 +627,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro } if (isDirectTransition(oldSchState, newState)) { - logComponentInfo("Handling direct transition update to host component", request, oldState, newState); + LOG.info(getServiceComponentRequestInfoLogMessage("Handling direct transition update to host component", request, oldState, newState)); directTransitionScHosts.put(sch, newState); } else { if (!changedScHosts.containsKey(sc.getName())) { @@ -638,7 +638,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro changedScHosts.get(sc.getName()).put(newState, new ArrayList<ServiceComponentHost>()); } - logComponentInfo("Handling update to host component", request, oldState, newState); + LOG.info(getServiceComponentRequestInfoLogMessage("Handling update to host component", request, oldState, newState)); changedScHosts.get(sc.getName()).get(newState).add(sch); } } @@ -932,22 +932,24 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro } /** - * Logs component info. - * - * @param msg base log msg - * @param request the request to log - * @param oldState current state - * @param newDesiredState new desired state + * Constructs INFO level log message for {@link ServiceComponentHostRequest} + * @param msg base message + * @param request the request to construct the log message for + * @param oldState current state of the service host component that the request is for. + * @param newDesiredState new desired state for the service host component */ - private void logComponentInfo(String msg, ServiceComponentHostRequest request, State oldState, State newDesiredState) { - LOG.debug("{}, clusterName={}, serviceName={}, componentName={}, hostname={}, currentState={}, newDesiredState={}", - msg, - request.getClusterName(), - request.getServiceName(), - request.getComponentName(), - request.getHostname(), - oldState == null ? "null" : oldState, - newDesiredState == null ? "null" : newDesiredState); + private String getServiceComponentRequestInfoLogMessage(String msg, ServiceComponentHostRequest request, State oldState, State newDesiredState) { + StringBuilder sb = new StringBuilder(); + + sb.append(msg) + .append(", clusterName=").append(request.getClusterName()) + .append(", serviceName=").append(request.getServiceName()) + .append(", componentName=").append(request.getComponentName()) + .append(", hostname=").append(request.getHostname()) + .append(", currentState=").append(oldState == null ? "null" : oldState) + .append(", newDesiredState=").append(newDesiredState == null ? "null" : newDesiredState); + + return sb.toString(); } /**
