AMBARI-19638. Improve delete logging for topology artifacts. (swagle)

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

@@ -3339,8 +3339,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 {
@@ -3364,7 +3363,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
         }
         Cluster cluster = clusters.getCluster(request.getClusterName());
 
-        if(!AuthorizationHelper.isAuthorized(ResourceType.CLUSTER, cluster.getResourceId(),
+        if (!AuthorizationHelper.isAuthorized(ResourceType.CLUSTER, cluster.getResourceId(),
             EnumSet.of(RoleAuthorization.SERVICE_ADD_DELETE_SERVICES,RoleAuthorization.HOST_ADD_DELETE_COMPONENTS))) {
           throw new AuthorizationException("The authenticated user is not authorized to delete service components from hosts");
         }
@@ -3393,14 +3392,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());

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java

@@ -405,8 +405,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);
       }
     }
   }
@@ -453,10 +453,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());
 
@@ -491,8 +490,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.");
 
     }
   }

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java

@@ -351,7 +351,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
       }
     });
 
-    if(!request.isDryRunRequest()) {
+    if (!request.isDryRunRequest()) {
       notifyDelete(Resource.Type.Host, predicate);
     }
 
@@ -882,9 +882,12 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
       if (hostRequest.getClusterName() != null) {
         hostsClusters.add(hostRequest.getClusterName());
       }
+
+      LOG.info("Received Delete request for host {} from cluster {}.", hostname, hostRequest.getClusterName());
+
       // delete all host components
       Set<ServiceComponentHostRequest> schrs = new HashSet<>();
-      for(Cluster cluster : clusters.getClustersForHost(hostname)) {
+      for (Cluster cluster : clusters.getClustersForHost(hostname)) {
         List<ServiceComponentHost> list = cluster.getServiceComponentHosts(hostname);
         for (ServiceComponentHost sch : list) {
           ServiceComponentHostRequest schr = new ServiceComponentHostRequest(cluster.getClusterName(),
@@ -896,7 +899,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
         }
       }
       DeleteStatusMetaData componentDeleteStatus = null;
-      if(schrs.size() > 0) {
+      if (schrs.size() > 0) {
         try {
           componentDeleteStatus = getManagementController().deleteHostComponents(schrs);
         } catch (Exception ex) {

ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java

@@ -239,8 +239,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;
 
   /**
    * Publish event set of hosts were removed

ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java

@@ -99,8 +99,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 final ConcurrentHashMap<String, Cluster> clusters = new ConcurrentHashMap<String, Cluster>();
   private final ConcurrentHashMap<Long, Cluster> clustersById = new ConcurrentHashMap<Long, Cluster>();