AMBARI-19638. Improve delete logging for topology artifacts. (swagle) Change-Id: I85d9f633c1ecf1a1974171c60663182cf575f5c6
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0ccc13b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0ccc13b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0ccc13b Branch: refs/heads/AMBARI-2.4.2.16 Commit: b0ccc13b79696f4255f847a509051a2214e2bd0b Parents: b5a47c4 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Mon Jan 23 10:43:30 2017 -0800 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Wed Mar 1 12:19:27 2017 -0800 ---------------------------------------------------------------------- .../controller/AmbariManagementControllerImpl.java | 17 +++++++---------- .../internal/ConfigGroupResourceProvider.java | 14 ++++++-------- .../controller/internal/HostResourceProvider.java | 3 +++ .../org/apache/ambari/server/state/Clusters.java | 3 +-- .../ambari/server/state/cluster/ClustersImpl.java | 3 +-- 5 files changed, 18 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b0ccc13b/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 28914db..dfe8149 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 @@ -3194,8 +3194,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle // FIXME throw correct error throw new AmbariException("Invalid arguments"); } - LOG.info("Received a delete cluster request" - + ", clusterName=" + request.getClusterName()); + LOG.info("Received a delete cluster request, clusterName = " + request.getClusterName()); if (request.getHostNames() != null) { // FIXME treat this as removing a host from a cluster? } else { @@ -3247,14 +3246,12 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle request.setServiceName(findServiceName(cluster, request.getComponentName())); } - if (LOG.isDebugEnabled()) { - LOG.debug("Received a hostComponent DELETE request" - + ", clusterName=" + request.getClusterName() - + ", serviceName=" + request.getServiceName() - + ", componentName=" + request.getComponentName() - + ", hostname=" + request.getHostname() - + ", request=" + request); - } + LOG.info("Received a hostComponent DELETE request" + + ", clusterName=" + request.getClusterName() + + ", serviceName=" + request.getServiceName() + + ", componentName=" + request.getComponentName() + + ", hostname=" + request.getHostname() + + ", request=" + request); Service service = cluster.getService(request.getServiceName()); ServiceComponent component = service.getServiceComponent(request.getComponentName()); http://git-wip-us.apache.org/repos/asf/ambari/blob/b0ccc13b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java index 96bb8f9..29accf3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java @@ -398,8 +398,8 @@ public class ConfigGroupResourceProvider extends for (String key : configs.keySet()) { if(!clusters.getCluster(clusterName).isConfigTypeExists(key)){ throw new AmbariException("Trying to add not existent config type to config group:"+ - " configType="+key+ - " cluster="+clusterName); + " configType = "+ key + + " cluster = " + clusterName); } } } @@ -446,10 +446,9 @@ public class ConfigGroupResourceProvider extends "exist", e); } - configLogger.info("Deleting Config group, " - + ", clusterName = " + cluster.getClusterName() - + ", id = " + request.getId() - + ", user = " + getManagementController().getAuthName()); + configLogger.info("User {} is deleting configuration group {} for tag {} in cluster {}", + getManagementController().getAuthName(), request.getGroupName(), request.getTag(), + cluster.getClusterName()); ConfigGroup configGroup = cluster.getConfigGroups().get(request.getId()); @@ -484,8 +483,7 @@ public class ConfigGroupResourceProvider extends request.getClusterName() + ", group name = " + request.getGroupName() + ", tag = " + request.getTag()); - throw new IllegalArgumentException("Cluster name, " + - "group name and tag need to be provided."); + throw new IllegalArgumentException("Cluster name, group name and tag need to be provided."); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/b0ccc13b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java index 9dea83c..8a9e3ac 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java @@ -923,6 +923,9 @@ public class HostResourceProvider extends AbstractControllerResourceProvider { List<ServiceComponentHost> list = cluster.getServiceComponentHosts(hostName); if (!list.isEmpty()) { + + LOG.info("Received Delete request for host {} from cluster {}.", hostName, clusterName); + List<String> componentsToRemove = new ArrayList<>(); for (ServiceComponentHost sch : list) { componentsToRemove.add(sch.getServiceComponentName()); http://git-wip-us.apache.org/repos/asf/ambari/blob/b0ccc13b/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java index 4939e0e..820936d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java @@ -240,8 +240,7 @@ public interface Clusters { * Removes a host. Inverts {@link #addHost(String)} * @param hostname */ - void deleteHost(String hostname) - throws AmbariException; + void deleteHost(String hostname) throws AmbariException; /** * Deletes hosts in bulk http://git-wip-us.apache.org/repos/asf/ambari/blob/b0ccc13b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java index b6f5505..c8afd70 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java @@ -101,8 +101,7 @@ import com.google.inject.persist.Transactional; @Singleton public class ClustersImpl implements Clusters { - private static final Logger LOG = LoggerFactory.getLogger( - ClustersImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(ClustersImpl.class); private ConcurrentHashMap<String, Cluster> clusters; private ConcurrentHashMap<Long, Cluster> clustersById;
