AMBARI-9769. Exception when Ambari Metrics service is not installed. (mpapyrkovskyy)

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

@@ -248,9 +248,6 @@ public abstract class AbstractProviderModule implements ProviderModule,
     } catch (SystemException e) {
       LOG.error("Exception during checkInit.", e);
     }
-    if (clusterGangliaCollectorMap.isEmpty() && clusterMetricCollectorMap.isEmpty()) {
-      resetMetricProviderMap();
-    }
 
     if (!clusterMetricCollectorMap.isEmpty()) {
       return TIMELINE_METRICS;
@@ -260,68 +257,6 @@ public abstract class AbstractProviderModule implements ProviderModule,
     return null;
   }
 
-  private void resetMetricProviderMap() {
-    LOG.info("Resetting metric property provider.");
-    ResourceProvider provider = getResourceProvider(Resource.Type.Cluster);
-
-    Set<String> propertyIds = new HashSet<String>();
-    propertyIds.add(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID);
-
-    Map<String, String> requestInfoProperties = new HashMap<String, String>();
-    requestInfoProperties.put(ClusterResourceProvider.GET_IGNORE_PERMISSIONS_PROPERTY_ID, "true");
-
-    Request request = PropertyHelper.getReadRequest(propertyIds,
-      requestInfoProperties, null, null, null);
-
-    try {
-      Set<Resource> clusters = provider.getResources(request, null);
-
-      if (clusters != null && !clusters.isEmpty()) {
-        for (Resource cluster : clusters) {
-          String clusterName = (String) cluster.getPropertyValue(CLUSTER_NAME_PROPERTY_ID);
-
-          request = PropertyHelper.getReadRequest(HOST_COMPONENT_HOST_NAME_PROPERTY_ID,
-            HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID);
-
-          Predicate predicate =
-            new PredicateBuilder().property(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID)
-              .equals(clusterName).and().property(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)
-              .equals(GANGLIA_SERVER).toPredicate();
-
-          provider = getResourceProvider(Resource.Type.HostComponent);
-          Set<Resource> hostComponents = provider.getResources(request, predicate);
-
-          if (hostComponents != null && !hostComponents.isEmpty()) {
-            Resource hostComponent = hostComponents.iterator().next();
-            String hostName = (String) hostComponent.getPropertyValue(HOST_COMPONENT_HOST_NAME_PROPERTY_ID);
-            clusterGangliaCollectorMap.put(clusterName, hostName);
-          }
-
-          predicate = new PredicateBuilder().property(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID)
-            .equals(clusterName).and().property(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)
-            .equals(METRIC_SERVER).toPredicate();
-
-          hostComponents = provider.getResources(request, predicate);
-          if (hostComponents != null && !hostComponents.isEmpty()) {
-            Resource hostComponent = hostComponents.iterator().next();
-            String hostName = (String) hostComponent.getPropertyValue(HOST_COMPONENT_HOST_NAME_PROPERTY_ID);
-            clusterMetricCollectorMap.put(clusterName, hostName);
-          }
-        }
-      }
-
-    } catch (SystemException e) {
-      LOG.warn("Error finding metrics provider.", e);
-    } catch (UnsupportedPropertyException e) {
-      LOG.warn("Error finding metrics provider.", e);
-    } catch (NoSuchResourceException e) {
-      LOG.warn("Error finding metrics provider.", e);
-    } catch (NoSuchParentResourceException e) {
-      LOG.warn("Error finding metrics provider.", e);
-    }
-
-  }
-
   // ----- MetricsHostProvider ------------------------------------------------
 
   @Override

ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java

@@ -27,16 +27,6 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.apache.ambari.server.controller.internal.ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID;
-import static org.apache.ambari.server.controller.internal.HostComponentResourceProvider.HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID;
-import static org.apache.ambari.server.controller.internal.HostComponentResourceProvider.HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID;
-import static org.apache.ambari.server.controller.internal.HostComponentResourceProvider.HOST_COMPONENT_HOST_NAME_PROPERTY_ID;
-import static org.apache.ambari.server.controller.metrics.MetricsServiceProvider.MetricsService;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -45,79 +35,6 @@ import static org.mockito.Mockito.when;
 
 public class MetricsServiceProviderTest {
 
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testResetMetricProviderMap() throws Exception {
-    TestMetricProviderModule providerModule = new TestMetricProviderModule();
-
-    ResourceProvider clusterResourceProvider = providerModule.getResourceProvider(Resource.Type.Cluster);
-
-    final Resource cluster = mock(Resource.class);
-    final Set<Resource> resources = new HashSet<Resource>() {{ add(cluster); }};
-    when(clusterResourceProvider.getResources((Request) any(),
-      (Predicate) any())).thenReturn(resources);
-    when(cluster.getPropertyValue(CLUSTER_NAME_PROPERTY_ID)).thenReturn("c1");
-
-    // Assert requests and predicates used
-    ResourceProvider hostComponentResourceProvider = providerModule
-      .getResourceProvider(Resource.Type.HostComponent);
-
-    Set<String> propertyIds = new HashSet<String>();
-    propertyIds.add(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID);
-    propertyIds.add(HOST_COMPONENT_HOST_NAME_PROPERTY_ID);
-
-    Request expectedRequest = PropertyHelper.getReadRequest(propertyIds);
-
-    Predicate expectedPredicate1 =
-      new PredicateBuilder().property(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID)
-        .equals("c1").and().property(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)
-        .equals("GANGLIA_SERVER").toPredicate();
-
-    Predicate expectedPredicate2 =
-      new PredicateBuilder().property(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID)
-        .equals("c1").and().property(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)
-        .equals("METRICS_COLLECTOR").toPredicate();
-
-    ArgumentCaptor<Request> requestCapture = ArgumentCaptor.forClass(Request.class);
-    ArgumentCaptor<Predicate> predicateCapture = ArgumentCaptor.forClass(Predicate.class);
-
-    when(hostComponentResourceProvider.getResources(any(Request.class),
-      any(Predicate.class))).thenReturn(Collections.<Resource>emptySet());
-
-    // Assert default null
-    MetricsService service = providerModule.getMetricsServiceType();
-    verify(hostComponentResourceProvider, times(3)).getResources(requestCapture
-      .capture(), predicateCapture.capture());
-
-    List<Request> requests = requestCapture.getAllValues();
-    Request request1 = requests.get(requests.size() - 2); // GANGLIA check
-    Request request2 = requests.get(requests.size() - 1); // COLLECTOR check
-
-    List<Predicate> predicates = predicateCapture.getAllValues();
-    Predicate predicate1 = predicates.get(predicates.size() - 2);
-    Predicate predicate2 = predicates.get(predicates.size() - 1);
-
-    Assert.assertEquals(expectedRequest, request1);
-    Assert.assertEquals(expectedRequest, request2);
-    Assert.assertEquals(expectedPredicate1, predicate1);
-    Assert.assertEquals(expectedPredicate2, predicate2);
-
-    Assert.assertEquals(null, service);
-
-    // Assert change to actual service
-
-    final Resource hostComponent = mock(Resource.class);
-    Set<Resource> hostComponents = new HashSet<Resource>() {{ add(hostComponent); }};
-    when(hostComponentResourceProvider.getResources(any(Request.class),
-      any(Predicate.class))).thenReturn(hostComponents);
-    when(hostComponent.getPropertyValue
-      (HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)).thenReturn("METRICS_COLLECTOR");
-    when(hostComponent.getPropertyValue(HOST_COMPONENT_HOST_NAME_PROPERTY_ID)).thenReturn("h1");
-
-    service = providerModule.getMetricsServiceType();
-    Assert.assertEquals(MetricsService.TIMELINE_METRICS, service);
-  }
-
   private static class TestMetricProviderModule extends AbstractProviderModule {
     ResourceProvider clusterResourceProvider = mock(ClusterResourceProvider.class);