Browse Source

AMBARI-13376 Prioritize point in time queries to JMX endpoints (dsen)

Dmytro Sen 10 năm trước cách đây
mục cha
commit
922828e95b
21 tập tin đã thay đổi với 1571 bổ sung3251 xóa
  1. 2 2
      ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
  2. 0 25
      ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
  3. 0 2
      ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
  4. 1 1
      ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
  5. 11 0
      ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
  6. 1 1
      ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
  7. 32 32
      ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
  8. 1384 3027
      ambari-server/src/main/resources/jmx_properties.json
  9. 1 1
      ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json
  10. 126 36
      ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
  11. 1 1
      ambari-server/src/test/java/org/apache/ambari/server/api/services/KerberosServiceMetaInfoTest.java
  12. 2 2
      ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java
  13. 5 5
      ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
  14. 0 10
      ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
  15. 0 95
      ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
  16. 1 1
      ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java
  17. 1 1
      ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java
  18. 1 1
      ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java
  19. 1 1
      ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModuleForLdapDNWithSpace.java
  20. 0 5
      ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
  21. 1 2
      ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java

+ 2 - 2
ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java

@@ -112,7 +112,7 @@ public class Configuration {
   public static final String SRVR_DISABLED_CIPHERS = "security.server.disabled.ciphers";
   public static final String SRVR_DISABLED_PROTOCOLS = "security.server.disabled.protocols";
   public static final String RESOURCES_DIR_KEY = "resources.dir";
-  public static final String METADETA_DIR_PATH = "metadata.path";
+  public static final String METADATA_DIR_PATH = "metadata.path";
   public static final String COMMON_SERVICES_DIR_PATH = "common.services.path";
   public static final String SERVER_VERSION_FILE = "server.version.file";
   public static final String SERVER_VERSION_KEY = "version";
@@ -981,7 +981,7 @@ public class Configuration {
    * @return String
    */
   public String getMetadataPath() {
-    return properties.getProperty(METADETA_DIR_PATH);
+    return properties.getProperty(METADATA_DIR_PATH);
   }
 
   /**

+ 0 - 25
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java

@@ -67,7 +67,6 @@ public class StackDefinedPropertyProvider implements PropertyProvider {
   @Inject
   private static Injector injector = null;
 
-
   private Resource.Type type = null;
   private String clusterNamePropertyId = null;
   private String hostNamePropertyId = null;
@@ -81,7 +80,6 @@ public class StackDefinedPropertyProvider implements PropertyProvider {
 
   private final MetricHostProvider metricHostProvider;
   private final MetricsServiceProvider metricsServiceProvider;
-  private MetricsService metricsService = MetricsService.GANGLIA;
   private TimelineMetricCacheProvider cacheProvider;
 
   /**
@@ -131,29 +129,6 @@ public class StackDefinedPropertyProvider implements PropertyProvider {
     cacheProvider = injector.getInstance(TimelineMetricCacheProvider.class);
   }
 
-
-  public StackDefinedPropertyProvider(Resource.Type type,
-                                      MetricsService metricsService,
-                                      JMXHostProvider jmxHostProvider,
-                                      MetricHostProvider metricHostProvider,
-                                      MetricsServiceProvider serviceProvider,
-                                      StreamProvider streamProvider,
-                                      String clusterPropertyId,
-                                      String hostPropertyId,
-                                      String componentPropertyId,
-                                      String jmxStatePropertyId,
-                                      PropertyProvider defaultJmxPropertyProvider,
-                                      PropertyProvider defaultGangliaPropertyProvider) {
-
-    this(type, jmxHostProvider, metricHostProvider, serviceProvider,
-      streamProvider, clusterPropertyId, hostPropertyId, componentPropertyId,
-      jmxStatePropertyId, defaultJmxPropertyProvider, defaultGangliaPropertyProvider);
-
-    this.metricsService = metricsService;
-    cacheProvider = injector.getInstance(TimelineMetricCacheProvider.class);
-  }
-
-
   @Override
   public Set<Resource> populateResources(Set<Resource> resources,
       Request request, Predicate predicate) throws SystemException {

+ 0 - 2
ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java

@@ -61,8 +61,6 @@ public class JMXPropertyProvider extends ThreadPoolEnabledPropertyProvider {
   static {
     DEFAULT_JMX_PORTS.put("NAMENODE",           "50070");
     DEFAULT_JMX_PORTS.put("DATANODE",           "50075");
-    DEFAULT_JMX_PORTS.put("JOBTRACKER",         "50030");
-    DEFAULT_JMX_PORTS.put("TASKTRACKER",        "50060");
     DEFAULT_JMX_PORTS.put("HBASE_MASTER",       "60010");
     DEFAULT_JMX_PORTS.put("HBASE_REGIONSERVER", "60030");
     DEFAULT_JMX_PORTS.put("RESOURCEMANAGER",     "8088");

+ 1 - 1
ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java

@@ -273,7 +273,7 @@ public class StackManager {
     }
 
     if (!stackRoot.isDirectory() && !stackRoot.exists()) {
-      throw new AmbariException("" + Configuration.METADETA_DIR_PATH
+      throw new AmbariException("" + Configuration.METADATA_DIR_PATH
           + " should be a directory with stack"
           + ", stackRoot = " + stackRootAbsPath);
     }

+ 11 - 0
ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java

@@ -58,4 +58,15 @@ public class Metric {
   public String getUnit() {
     return unit;
   }
+
+  @Override
+  public String toString() {
+    return "Metric{" +
+      "metric='" + metric + '\'' +
+      ", pointInTime=" + pointInTime +
+      ", temporal=" + temporal +
+      ", amsHostMetric=" + amsHostMetric +
+      ", unit='" + unit + '\'' +
+      '}';
+  }
 }

+ 1 - 1
ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json

@@ -6752,7 +6752,7 @@
             },
             "metrics/master/AssignmentManger/ritCount": {
               "metric":"master.AssignmentManger.ritCount",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/master/AssignmentManger/ritCountOverThreshold": {

+ 32 - 32
ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json

@@ -236,7 +236,7 @@
             },
             "metrics/rpcdetailed/renewLease_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseNumOps",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/rpcdetailed/getFileInfo_avg_time": {
@@ -713,7 +713,7 @@
             },
             "metrics/dfs/FSNamesystem/UnderReplicatedBlocks": {
               "metric": "dfs.FSNamesystem.UnderReplicatedBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/rpcdetailed/sendHeartbeat_avg_time": {
@@ -758,7 +758,7 @@
             },
             "metrics/rpcdetailed/renewLease_avg_time": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseAvgTime",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/default/StartupProgress/ElapsedTime": {
@@ -853,67 +853,67 @@
             },
             "metrics/dfs/FSNamesystem/ExpiredHeartbeats": {
               "metric": "dfs.FSNamesystem.ExpiredHeartbeats",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/LastCheckpointTime": {
               "metric": "dfs.FSNamesystem.LastCheckpointTime",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/LastWrittenTransactionId": {
               "metric": "dfs.FSNamesystem.LastWrittenTransactionId",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/MillisSinceLastLoadedEdits": {
               "metric": "dfs.FSNamesystem.MillisSinceLastLoadedEdits",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/MissingReplOneBlocks": {
               "metric": "dfs.FSNamesystem.MissingReplOneBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/PendingDataNodeMessageCount": {
               "metric": "dfs.FSNamesystem.PendingDataNodeMessageCount",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/PostponedMisreplicatedBlocks": {
               "metric": "dfs.FSNamesystem.PostponedMisreplicatedBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/Snapshots": {
               "metric": "dfs.FSNamesystem.Snapshots",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/SnapshottableDirectories": {
               "metric": "dfs.FSNamesystem.SnapshottableDirectories",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/StaleDataNodes": {
               "metric": "dfs.FSNamesystem.StaleDataNodes",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TotalFiles": {
               "metric": "dfs.FSNamesystem.TotalFiles",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TransactionsSinceLastCheckpoint": {
               "metric": "dfs.FSNamesystem.TransactionsSinceLastCheckpoint",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TransactionsSinceLastLogRoll": {
               "metric": "dfs.FSNamesystem.TransactionsSinceLastLogRoll",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/namenode/AllowSnapshotOps": {
@@ -1253,7 +1253,7 @@
               "pointInTime": true,
               "temporal": false
             },
-            "metrics/dfs/FSNamesystem/TransactionsSinceLastCheckpointvvvv": {
+            "metrics/dfs/FSNamesystem/TransactionsSinceLastCheckpoint": {
               "metric": "Hadoop:service=NameNode,name=FSNamesystem.TransactionsSinceLastCheckpoint",
               "pointInTime": true,
               "temporal": false
@@ -2240,7 +2240,7 @@
             },
             "metrics/rpcdetailed/renewLease_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseNumOps",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/rpcdetailed/getFileInfo_avg_time": {
@@ -2777,7 +2777,7 @@
             },
             "metrics/rpcdetailed/renewLease_avg_time": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseAvgTime",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/default/StartupProgress/ElapsedTime": {
@@ -2872,67 +2872,67 @@
             },
             "metrics/dfs/FSNamesystem/ExpiredHeartbeats": {
               "metric": "dfs.FSNamesystem.ExpiredHeartbeats",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/LastCheckpointTime": {
               "metric": "dfs.FSNamesystem.LastCheckpointTime",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/LastWrittenTransactionId": {
               "metric": "dfs.FSNamesystem.LastWrittenTransactionId",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/MillisSinceLastLoadedEdits": {
               "metric": "dfs.FSNamesystem.MillisSinceLastLoadedEdits",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/MissingReplOneBlocks": {
               "metric": "dfs.FSNamesystem.MissingReplOneBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/PendingDataNodeMessageCount": {
               "metric": "dfs.FSNamesystem.PendingDataNodeMessageCount",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/PostponedMisreplicatedBlocks": {
               "metric": "dfs.FSNamesystem.PostponedMisreplicatedBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/Snapshots": {
               "metric": "dfs.FSNamesystem.Snapshots",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/SnapshottableDirectories": {
               "metric": "dfs.FSNamesystem.SnapshottableDirectories",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/StaleDataNodes": {
               "metric": "dfs.FSNamesystem.StaleDataNodes",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TotalFiles": {
               "metric": "dfs.FSNamesystem.TotalFiles",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TransactionsSinceLastCheckpoint": {
               "metric": "dfs.FSNamesystem.TransactionsSinceLastCheckpoint",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TransactionsSinceLastLogRoll": {
               "metric": "dfs.FSNamesystem.TransactionsSinceLastLogRoll",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/namenode/AllowSnapshotOps": {

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1384 - 3027
ambari-server/src/main/resources/jmx_properties.json


+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json

@@ -6702,7 +6702,7 @@
             },
             "metrics/master/AssignmentManger/ritCount": {
               "metric":"master.AssignmentManger.ritCount",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/master/AssignmentManger/ritCountOverThreshold": {

+ 126 - 36
ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java

@@ -27,6 +27,7 @@ import junit.framework.Assert;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.StackAccessException;
 import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
 import org.apache.ambari.server.metadata.ActionMetadata;
 import org.apache.ambari.server.metadata.AmbariServiceAlertDefinitions;
@@ -62,13 +63,14 @@ import org.apache.ambari.server.state.alert.SourceType;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptorFactory;
+import org.apache.ambari.server.state.stack.Metric;
 import org.apache.ambari.server.state.stack.MetricDefinition;
 import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -80,8 +82,10 @@ import java.io.File;
 import java.io.FileReader;
 import java.lang.reflect.Field;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -106,9 +110,9 @@ public class AmbariMetaInfoTest {
   private static final String EXT_STACK_NAME = "2.0.6";
   private static final String STACK_VERSION_HDP_02 = "0.2";
   private static final String STACK_MINIMAL_VERSION_HDP = "0.0";
-  private static String SERVICE_NAME_HDFS = "HDFS";
-  private static String SERVICE_NAME_MAPRED2 = "MAPREDUCE2";
-  private static String SERVICE_COMPONENT_NAME = "NAMENODE";
+  private static final String SERVICE_NAME_HDFS = "HDFS";
+  private static final String SERVICE_NAME_MAPRED2 = "MAPREDUCE2";
+  private static final String SERVICE_COMPONENT_NAME = "NAMENODE";
   private static final String OS_TYPE = "centos5";
   private static final String HDP_REPO_NAME = "HDP";
   private static final String HDP_REPO_ID = "HDP-2.1.1";
@@ -123,7 +127,7 @@ public class AmbariMetaInfoTest {
   private static final int PROPERTIES_CNT = 62;
   private static final int OS_CNT = 4;
 
-  private AmbariMetaInfo metaInfo = null;
+  private static AmbariMetaInfo metaInfo = null;
   private final static Logger LOG =
       LoggerFactory.getLogger(AmbariMetaInfoTest.class);
   private static final String FILE_NAME = "hbase-site.xml";
@@ -138,15 +142,15 @@ public class AmbariMetaInfoTest {
   @Rule
   public TemporaryFolder tmpFolder = new TemporaryFolder();
 
-  @Before
-  public void before() throws Exception {
+  @BeforeClass
+  public static void beforeClass() throws Exception {
     File stacks = new File("src/test/resources/stacks");
     File version = new File("src/test/resources/version");
     if (System.getProperty("os.name").contains("Windows")) {
       stacks = new File(ClassLoader.getSystemClassLoader().getResource("stacks").getPath());
       version = new File(new File(ClassLoader.getSystemClassLoader().getResource("").getPath()).getParent(), "version");
     }
-    metaInfo = createAmbariMetaInfo(stacks, version, true);
+    metaInfo = createAmbariMetaInfo(stacks, version);
   }
 
   public class MockModule extends AbstractModule {
@@ -192,7 +196,7 @@ public class AmbariMetaInfoTest {
     // Scenario: user has internet and does nothing to repos via api
     // use the latest
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    AmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    AmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
     // The current stack already has (HDP, 2.1.1, redhat6) with valid latest
     // url
     ambariMetaInfo.init();
@@ -215,7 +219,7 @@ public class AmbariMetaInfoTest {
     // Scenario: user has no internet and does nothing to repos via api
     // use the default
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    AmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    AmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
     // The current stack already has (HDP, 2.1.1, redhat6).
 
     // Deleting the json file referenced by the latestBaseUrl to simulate No
@@ -247,7 +251,7 @@ public class AmbariMetaInfoTest {
     // Scenario: user has internet and but calls to set repos via api
     // use whatever they set
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
     // The current stack already has (HDP, 2.1.1, redhat6)
 
     // Updating the baseUrl
@@ -308,7 +312,7 @@ public class AmbariMetaInfoTest {
     // use whatever they set
     String stackVersion = "0.2";
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
 
     // Updating the baseUrl
     String newBaseUrl = "http://myprivate-repo-1.hortonworks.com/HDP-Utils/centos6/2.x/updates/2.0.6.0";
@@ -351,7 +355,7 @@ public class AmbariMetaInfoTest {
     // use whatever they set
     String newBaseUrl = "http://myprivate-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0";
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
     // The current stack already has (HDP, 2.1.1, redhat6).
 
     // Deleting the json file referenced by the latestBaseUrl to simulate No
@@ -425,7 +429,7 @@ public class AmbariMetaInfoTest {
   @Test
   public void testServiceNameUsingComponentName() throws AmbariException {
     String serviceName = metaInfo.getComponentToService(STACK_NAME_HDP,
-        STACK_VERSION_HDP, "NAMENODE");
+        STACK_VERSION_HDP, SERVICE_COMPONENT_NAME);
     assertEquals("HDFS", serviceName);
   }
 
@@ -552,7 +556,7 @@ public class AmbariMetaInfoTest {
     }
     File stackRootTmp = new File(buildDir + "/ambari-metaInfo"); stackRootTmp.mkdir();
     FileUtils.copyDirectory(stackRoot, stackRootTmp);
-    AmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRootTmp, version, true);
+    AmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRootTmp, version);
     //todo
     //ambariMetaInfo.injector = injector;
     File f1, f2, f3;
@@ -850,7 +854,7 @@ public class AmbariMetaInfoTest {
     LOG.info("Stacks file " + stackRoot.getAbsolutePath());
 
 
-    TestAmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRoot, version, true);
+    TestAmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRoot, version);
     Assert.assertEquals(1, ambariMetaInfo.getStackManager().getStacks().size());
     Assert.assertEquals(false, ambariMetaInfo.getStackManager().getStack("HDP", "0.1").isValid());
     Assert.assertEquals(2, ambariMetaInfo.getStackManager().getStack("HDP", "0.1").getErrors().size());
@@ -867,22 +871,107 @@ public class AmbariMetaInfoTest {
     Assert.assertNotNull(svc);
     Assert.assertNotNull(svc.getMetricsFile());
 
-    List<MetricDefinition> list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "NAMENODE", "Component");
+    List<MetricDefinition> list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", SERVICE_COMPONENT_NAME, Resource.Type.Component.name());
     Assert.assertNotNull(list);
 
-    list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "DATANODE", "Component");
+    list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "DATANODE", Resource.Type.Component.name());
     Assert.assertNull(list);
 
-    List<MetricDefinition> list0 = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "DATANODE", "Component");
+    List<MetricDefinition> list0 = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "DATANODE", Resource.Type.Component.name());
     Assert.assertNull(list0);
     Assert.assertTrue("Expecting subsequent calls to use a cached value for the definition", list == list0);
 
-
     // not explicitly defined, uses 2.0.5
-    list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.6", "HDFS", "DATANODE", "Component");
+    list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.6", "HDFS", "DATANODE", Resource.Type.Component.name());
     Assert.assertNull(list);
   }
 
+  @Test
+  public void testCrossCheckJmxToGangliaMetrics() throws Exception {
+
+    File stacks = new File("src/main/resources/stacks");
+    File version = new File("src/test/resources/version");
+    File commonServicesRoot = new File("src/main/resources/common-services");
+    if (System.getProperty("os.name").contains("Windows")) {
+      stacks = new File(ClassLoader.getSystemClassLoader().getResource("stacks").getPath());
+      version = new File(new File(ClassLoader.getSystemClassLoader().getResource("").getPath()).getParent(), "version");
+      commonServicesRoot = new File(ClassLoader.getSystemClassLoader().getResource("common-services").getPath());
+    }
+
+    Properties properties = new Properties();
+    properties.setProperty(Configuration.METADATA_DIR_PATH, stacks.getPath());
+    properties.setProperty(Configuration.COMMON_SERVICES_DIR_PATH, commonServicesRoot.getPath());
+    properties.setProperty(Configuration.SERVER_VERSION_FILE, version.getPath());
+    Configuration configuration = new Configuration(properties);
+
+    TestAmbariMetaInfo ambariMetaInfo = new TestAmbariMetaInfo(configuration);
+    ambariMetaInfo.replayAllMocks();
+
+    try {
+      ambariMetaInfo.init();
+    } catch(Exception e) {
+      LOG.info("Error in metainfo initializing ", e);
+      throw e;
+    }
+    waitForAllReposToBeResolved(ambariMetaInfo);
+    String[] metricsTypes = {
+      Resource.Type.Component.name(),
+      Resource.Type.HostComponent.name()
+    };
+
+    for (StackInfo stackInfo: ambariMetaInfo.getStacks(STACK_NAME_HDP)) {
+      for (ServiceInfo serviceInfo: stackInfo.getServices()) {
+        for (ComponentInfo componentInfo: serviceInfo.getComponents()) {
+          for (String metricType: metricsTypes) {
+            List<MetricDefinition> list =
+              ambariMetaInfo.getMetrics(stackInfo.getName(), stackInfo.getVersion(),
+                serviceInfo.getName(), componentInfo.getName(), metricType);
+            String currentComponentInfo =  stackInfo.getName() + "-" +
+              stackInfo.getVersion() + ", " + serviceInfo.getName() + ", " +
+              componentInfo.getName()+ ", " + metricType;
+            if (list == null) {
+              LOG.info("No metrics found for " + currentComponentInfo);
+              continue;
+            }
+            LOG.info("Cross-checking JMX-to-Ganglia metrics for " + currentComponentInfo);
+
+            Map<String, Metric> jmxMetrics = Collections.emptyMap();
+            for (MetricDefinition metricDefinition : list) {
+
+              if ("jmx".equals(metricDefinition.getType())) {
+                // all jmx should be point-in-time and not temporal
+                jmxMetrics = metricDefinition.getMetrics();
+                for (Metric metric : jmxMetrics.values()) {
+                  Assert.assertTrue(metric.isPointInTime());
+                  Assert.assertFalse(metric.isTemporal());
+                }
+              }
+            }
+            LinkedList<String> failedMetrics = new LinkedList<String>();
+            for (MetricDefinition metricDefinition : list) {
+              if ("ganglia".equals(metricDefinition.getType())) {
+                //all ams metrics should be temporal
+                for (Map.Entry<String, Metric> metricEntry : metricDefinition.getMetrics().entrySet()) {
+                  Assert.assertTrue(metricEntry.getValue().isTemporal());
+                  // some ams metrics may be point-in-time
+                  // if they aren't provided by JMX
+                  if (metricEntry.getValue().isPointInTime() &&
+                    jmxMetrics.containsKey(metricEntry.getKey())) {
+                    failedMetrics.add(metricEntry.getKey());
+                  }
+                }
+
+              }
+            }
+            Assert.assertEquals(failedMetrics.toString() +
+                " metrics defined with pointInTime=true for both jmx and ganglia types.",
+              0, failedMetrics.size());
+          }
+        }
+      }
+    }
+  }
+
   @Test
   public void testKerberosJson() throws Exception {
     ServiceInfo svc;
@@ -1864,7 +1953,7 @@ public class AmbariMetaInfoTest {
   }
 
 
-  private TestAmbariMetaInfo setupTempAmbariMetaInfo(String buildDir, boolean replayMocks) throws Exception {
+  private TestAmbariMetaInfo setupTempAmbariMetaInfo(String buildDir) throws Exception {
     File stackRootTmp = new File(buildDir + "/ambari-metaInfo");
     File stackRoot = new File("src/test/resources/stacks");
     File version = new File("src/test/resources/version");
@@ -1876,34 +1965,35 @@ public class AmbariMetaInfoTest {
 
     stackRootTmp.mkdir();
     FileUtils.copyDirectory(stackRoot, stackRootTmp);
-    TestAmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRootTmp, version, replayMocks);
+    TestAmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRootTmp, version);
 
     return ambariMetaInfo;
   }
 
-  private TestAmbariMetaInfo createAmbariMetaInfo(File stackRoot, File versionFile, boolean replayMocks) throws Exception {
+  private static TestAmbariMetaInfo createAmbariMetaInfo(File stackRoot,
+    File versionFile) throws Exception {
+
     Properties properties = new Properties();
-    properties.setProperty(Configuration.METADETA_DIR_PATH, stackRoot.getPath());
+    properties.setProperty(Configuration.METADATA_DIR_PATH, stackRoot.getPath());
     properties.setProperty(Configuration.SERVER_VERSION_FILE, versionFile.getPath());
     Configuration configuration = new Configuration(properties);
 
     TestAmbariMetaInfo metaInfo = new TestAmbariMetaInfo(configuration);
-    if (replayMocks) {
-      metaInfo.replayAllMocks();
-
-      try {
-        metaInfo.init();
-      } catch(Exception e) {
-        LOG.info("Error in initializing ", e);
-        throw e;
-      }
-      waitForAllReposToBeResolved(metaInfo);
+
+    metaInfo.replayAllMocks();
+
+    try {
+      metaInfo.init();
+    } catch(Exception e) {
+      LOG.info("Error in initializing ", e);
+      throw e;
     }
+    waitForAllReposToBeResolved(metaInfo);
 
     return metaInfo;
   }
 
-  private void waitForAllReposToBeResolved(AmbariMetaInfo metaInfo) throws Exception {
+  private static void waitForAllReposToBeResolved(AmbariMetaInfo metaInfo) throws Exception {
     int maxWait = 45000;
     int waitTime = 0;
     StackManager sm = metaInfo.getStackManager();

+ 1 - 1
ambari-server/src/test/java/org/apache/ambari/server/api/services/KerberosServiceMetaInfoTest.java

@@ -198,7 +198,7 @@ public class KerberosServiceMetaInfoTest {
 
   private TestAmbariMetaInfo createAmbariMetaInfo(File stackRoot, File commonServicesRoot, File versionFile, boolean replayMocks) throws Exception {
     Properties properties = new Properties();
-    properties.setProperty(Configuration.METADETA_DIR_PATH, stackRoot.getPath());
+    properties.setProperty(Configuration.METADATA_DIR_PATH, stackRoot.getPath());
     properties.setProperty(Configuration.COMMON_SERVICES_DIR_PATH, commonServicesRoot.getPath());
     properties.setProperty(Configuration.SERVER_VERSION_FILE, versionFile.getPath());
     Configuration configuration = new Configuration(properties);

+ 2 - 2
ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java

@@ -74,7 +74,7 @@ public class BootStrapTest extends TestCase {
     properties.setProperty(Configuration.BOOTSTRAP_DIR, bootdir);
     properties.setProperty(Configuration.BOOTSTRAP_SCRIPT, prepareEchoCommand(bootdir));
     properties.setProperty(Configuration.SRVR_KSTR_DIR_KEY, "target" + File.separator + "classes");
-    properties.setProperty(Configuration.METADETA_DIR_PATH, metadetadir);
+    properties.setProperty(Configuration.METADATA_DIR_PATH, metadetadir);
     properties.setProperty(Configuration.SERVER_VERSION_FILE, serverVersionFilePath);
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, sharedResourcesDir);
 
@@ -149,7 +149,7 @@ public class BootStrapTest extends TestCase {
     properties.setProperty(Configuration.BOOTSTRAP_DIR, bootdir);
     properties.setProperty(Configuration.BOOTSTRAP_SCRIPT, prepareEchoCommand(bootdir));
     properties.setProperty(Configuration.SRVR_KSTR_DIR_KEY, serverKSTRDir);
-    properties.setProperty(Configuration.METADETA_DIR_PATH, metadetadir);
+    properties.setProperty(Configuration.METADATA_DIR_PATH, metadetadir);
     properties.setProperty(Configuration.SERVER_VERSION_FILE, serverVersionFilePath);
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, sharedResourcesDir);
     Configuration conf = new Configuration(properties);

+ 5 - 5
ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java

@@ -8323,7 +8323,7 @@ public class AmbariManagementControllerTest {
     // verify change with new meta info
     Configuration configuration = injector.getInstance(Configuration.class);
     Properties properties = configuration.getProperties();
-    properties.setProperty(Configuration.METADETA_DIR_PATH, "src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH, "src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE, "src/test/resources/version");
     Configuration newConfiguration = new Configuration(properties);
 
@@ -8864,7 +8864,7 @@ public class AmbariManagementControllerTest {
       protected void configure() {
         Properties properties = new Properties();
         properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-        properties.setProperty(Configuration.METADETA_DIR_PATH,"src/test/resources/stacks");
+        properties.setProperty(Configuration.METADATA_DIR_PATH,"src/test/resources/stacks");
         properties.setProperty(Configuration.SERVER_VERSION_FILE,"src/test/resources/version");
         properties.setProperty(Configuration.OS_VERSION_KEY,"centos6");
         properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");
@@ -8937,7 +8937,7 @@ public class AmbariManagementControllerTest {
         Properties properties = new Properties();
         properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
 
-        properties.setProperty(Configuration.METADETA_DIR_PATH,
+        properties.setProperty(Configuration.METADATA_DIR_PATH,
             "src/test/resources/stacks");
         properties.setProperty(Configuration.SERVER_VERSION_FILE,
             "../version");
@@ -9047,7 +9047,7 @@ public class AmbariManagementControllerTest {
       protected void configure() {
         Properties properties = new Properties();
         properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY,"in-memory");
-        properties.setProperty(Configuration.METADETA_DIR_PATH,"src/test/resources/stacks");
+        properties.setProperty(Configuration.METADATA_DIR_PATH,"src/test/resources/stacks");
         properties.setProperty(Configuration.SERVER_VERSION_FILE,"src/test/resources/version");
         properties.setProperty(Configuration.OS_VERSION_KEY,"centos5");
         properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");
@@ -9386,7 +9386,7 @@ public class AmbariManagementControllerTest {
         Properties properties = new Properties();
         properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
 
-        properties.setProperty(Configuration.METADETA_DIR_PATH,
+        properties.setProperty(Configuration.METADATA_DIR_PATH,
             "src/test/resources/stacks");
         properties.setProperty(Configuration.SERVER_VERSION_FILE,
             "../version");

+ 0 - 10
ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java

@@ -138,7 +138,6 @@ public class StackDefinedPropertyProviderTest {
   @Test
   public void testPopulateHostComponentResources() throws Exception {
     JMXPropertyProviderTest.TestJMXHostProvider tj = new JMXPropertyProviderTest.TestJMXHostProvider(true);
-    TestGangliaHostProvider tg = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider tm = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -328,7 +327,6 @@ public class StackDefinedPropertyProviderTest {
 
     StreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(true);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -391,7 +389,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HDP2_params() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -445,7 +442,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HDP2_params_singleProperty() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -484,7 +480,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HDP2_params_category() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -538,7 +533,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HDP2_params_category2() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -598,7 +592,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_jmx_JournalNode() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -767,7 +760,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_NoRegionServer() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -805,7 +797,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HBaseMaster2() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -1021,7 +1012,6 @@ public class StackDefinedPropertyProviderTest {
         new org.apache.ambari.server.controller.metrics.ganglia.TestStreamProvider("yarn_ganglia_data.txt");
 
     JMXPropertyProviderTest.TestJMXHostProvider jmxHostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(true);
-    JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaHostProvider hostProvider = new TestGangliaHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 

+ 0 - 95
ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java

@@ -109,99 +109,8 @@ public class JMXPropertyProviderTest {
     Assert.assertEquals(21933376, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
 
 
-    // jobtracker
-    resource = new ResourceImpl(Resource.Type.HostComponent);
-
-    resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-14-ee-b3.compute-1.internal");
-    resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "JOBTRACKER");
-
     // only ask for specific properties
     Set<String> properties = new HashSet<String>();
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "threadsWaiting"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_submitted"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_completed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_failed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_launched"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_completed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_failed"));
-
-    request = PropertyHelper.getReadRequest(properties);
-
-    propertyProvider.populateResources(Collections.singleton(resource), request, null);
-
-    Assert.assertEquals(propertyProvider.getSpec("http", "domu-12-31-39-14-ee-b3.compute-1.internal", "50030", "/jmx"), streamProvider.getLastSpec());
-
-    // see test/resources/mapreduce_jobtracker_jmx.json for values
-    Assert.assertEquals(13, PropertyHelper.getProperties(resource).size());
-    Assert.assertEquals(59, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "threadsWaiting")));
-    Assert.assertEquals(1052770304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax")));
-    Assert.assertEquals(43580400, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed")));
-    Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax")));
-    Assert.assertEquals(29602888, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
-    Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_submitted")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_completed")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_failed")));
-    Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_launched")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_completed")));
-    Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_failed")));
-
-    Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount")));
-
-    // tasktracker
-    resource = new ResourceImpl(Resource.Type.HostComponent);
-
-    resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-14-ee-b3.compute-1.internal");
-    resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "TASKTRACKER");
-
-    // only ask for specific properties
-    properties = new HashSet<String>();
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_exceptions_caught"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "maps_running"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduces_running"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "mapTaskSlots"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduceTaskSlots"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "failedDirs"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_completed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_timeout"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_ping"));
-
-    request = PropertyHelper.getReadRequest(properties);
-
-    propertyProvider.populateResources(Collections.singleton(resource), request, null);
-
-    Assert.assertEquals(propertyProvider.getSpec("http", "domu-12-31-39-14-ee-b3.compute-1.internal", "50060", "/jmx"), streamProvider.getLastSpec());
-
-    Assert.assertEquals(18, PropertyHelper.getProperties(resource).size());
-    Assert.assertEquals(954466304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax")));
-    Assert.assertEquals(18330984, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed")));
-    Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax")));
-    Assert.assertEquals(24235104, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
-    Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_exceptions_caught")));
-    Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs")));
-    Assert.assertEquals(1841, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "maps_running")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduces_running")));
-    Assert.assertEquals(4, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "mapTaskSlots")));
-    Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduceTaskSlots")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "failedDirs")));
-    Assert.assertEquals(4, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_completed")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_timeout")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_ping")));
-
-
-    Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount")));
 
     // hbase master
     resource = new ResourceImpl(Resource.Type.HostComponent);
@@ -499,10 +408,6 @@ public class JMXPropertyProviderTest {
         return "50070";
       else if (componentName.equals("DATANODE"))
         return "50075";
-      else if (componentName.equals("JOBTRACKER"))
-        return "50030";
-      else if (componentName.equals("TASKTRACKER"))
-        return "50060";
       else if (componentName.equals("HBASE_MASTER"))
         return null == clusterName ? "60010" : "60011";
       else  if (componentName.equals("JOURNALNODE"))

+ 1 - 1
ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java

@@ -70,7 +70,7 @@ public class InMemoryDefaultTestModule extends AbstractModule {
     }
 
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-    properties.setProperty(Configuration.METADETA_DIR_PATH, stacks);
+    properties.setProperty(Configuration.METADATA_DIR_PATH, stacks);
     properties.setProperty(Configuration.SERVER_VERSION_FILE, version);
     properties.setProperty(Configuration.OS_VERSION_KEY, "centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, sharedResourcesDir);

+ 1 - 1
ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java

@@ -39,7 +39,7 @@ public class JdbcPropertyTest {
   public void configure() {
     properties = new Properties();
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-    properties.setProperty(Configuration.METADETA_DIR_PATH, "src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH, "src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE, "src/test/resources/version");
     properties.setProperty(Configuration.OS_VERSION_KEY, "centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");

+ 1 - 1
ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java

@@ -30,7 +30,7 @@ public class AuthorizationTestModule extends AbstractModule {
     Properties properties = new Properties();
     properties.setProperty(Configuration.CLIENT_SECURITY_KEY, "ldap");
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-    properties.setProperty(Configuration.METADETA_DIR_PATH,"src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH,"src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE,"src/test/resources/version");
     properties.setProperty(Configuration.OS_VERSION_KEY,"centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");

+ 1 - 1
ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModuleForLdapDNWithSpace.java

@@ -30,7 +30,7 @@ public class AuthorizationTestModuleForLdapDNWithSpace extends AbstractModule {
     Properties properties = new Properties();
     properties.setProperty(Configuration.CLIENT_SECURITY_KEY, "ldap");
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-    properties.setProperty(Configuration.METADETA_DIR_PATH,"src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH,"src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE,"src/test/resources/version");
     properties.setProperty(Configuration.OS_VERSION_KEY,"centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");

+ 0 - 5
ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java

@@ -69,17 +69,14 @@ import com.google.inject.persist.PersistService;
 import com.google.inject.persist.Transactional;
 
 
-
 @RunWith(Enclosed.class)
 public class ConfigHelperTest {
   public static class RunWithInMemoryDefaultTestModule {
     private Clusters clusters;
-    private AmbariMetaInfo metaInfo;
     private Injector injector;
     private String clusterName;
     private Cluster cluster;
     private ConfigGroupFactory configGroupFactory;
-    private ConfigFactory configFactory;
     private ConfigHelper configHelper;
     private AmbariManagementController managementController;
 
@@ -88,8 +85,6 @@ public class ConfigHelperTest {
       injector = Guice.createInjector(new InMemoryDefaultTestModule());
       injector.getInstance(GuiceJpaInitializer.class);
       clusters = injector.getInstance(Clusters.class);
-      metaInfo = injector.getInstance(AmbariMetaInfo.class);
-      configFactory = injector.getInstance(ConfigFactory.class);
       configGroupFactory = injector.getInstance(ConfigGroupFactory.class);
       configHelper = injector.getInstance(ConfigHelper.class);
       managementController = injector.getInstance(AmbariManagementController.class);

+ 1 - 2
ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java

@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.SQLNonTransientConnectionException;
-import java.sql.SQLSyntaxErrorException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -97,7 +96,7 @@ public class UpgradeTest {
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "remote");
     properties.setProperty(Configuration.SERVER_JDBC_URL_KEY, Configuration.JDBC_IN_MEMORY_URL);
     properties.setProperty(Configuration.SERVER_JDBC_DRIVER_KEY, Configuration.JDBC_IN_MEMROY_DRIVER);
-    properties.setProperty(Configuration.METADETA_DIR_PATH, "src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH, "src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE, "src/test/resources/version");
     properties.setProperty(Configuration.OS_VERSION_KEY, "centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác