AMBARI-13376 Prioritize point in time queries to JMX endpoints (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/922828e9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/922828e9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/922828e9 Branch: refs/heads/trunk Commit: 922828e95be49263741a76fddaa8a2c216db4d87 Parents: 5601b14 Author: Dmytro Sen <d...@apache.org> Authored: Mon Oct 12 19:22:05 2015 +0300 Committer: Dmytro Sen <d...@apache.org> Committed: Mon Oct 12 19:22:05 2015 +0300 ---------------------------------------------------------------------- .../server/configuration/Configuration.java | 4 +- .../internal/StackDefinedPropertyProvider.java | 25 - .../controller/jmx/JMXPropertyProvider.java | 2 - .../ambari/server/stack/StackManager.java | 2 +- .../ambari/server/state/stack/Metric.java | 11 + .../HBASE/0.96.0.2.0/metrics.json | 2 +- .../common-services/HDFS/2.1.0.2.0/metrics.json | 64 +- .../src/main/resources/jmx_properties.json | 4654 ++++++------------ .../stacks/HDP/2.3/services/HBASE/metrics.json | 2 +- .../server/api/services/AmbariMetaInfoTest.java | 162 +- .../services/KerberosServiceMetaInfoTest.java | 2 +- .../ambari/server/bootstrap/BootStrapTest.java | 4 +- .../AmbariManagementControllerTest.java | 10 +- .../StackDefinedPropertyProviderTest.java | 10 - .../metrics/JMXPropertyProviderTest.java | 95 - .../server/orm/InMemoryDefaultTestModule.java | 2 +- .../ambari/server/orm/JdbcPropertyTest.java | 2 +- .../authorization/AuthorizationTestModule.java | 2 +- ...thorizationTestModuleForLdapDNWithSpace.java | 2 +- .../ambari/server/state/ConfigHelperTest.java | 5 - .../ambari/server/upgrade/UpgradeTest.java | 3 +- 21 files changed, 1675 insertions(+), 3390 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java index 04c1c19..c653e1b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java +++ b/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); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java index d0d597e..8b15569 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java +++ b/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 { http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java index eeb0762..2748dd4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java +++ b/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"); http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java index 832370d..2a5e75b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java +++ b/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); } http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java index ef2e7c6..8ea7be2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java +++ b/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 + '\'' + + '}'; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json index 5e5e775..158f3d7 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json +++ b/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": { http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json index 7376d82..e71af2c 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json +++ b/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": {
