This is an automated email from the ASF dual-hosted git repository. hulee pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/helix.git
commit d30fefba6c1d1bb900c1e94205fe28c2dd139eb0 Author: chenboat <[email protected]> AuthorDate: Mon Aug 12 22:55:22 2019 -0700 Use the system property value as the sliding window length. #382 --- .../apache/helix/monitoring/mbeans/ClusterEventMonitor.java | 1 - .../helix/monitoring/mbeans/HelixCallbackMonitor.java | 1 - .../java/org/apache/helix/monitoring/mbeans/JobMonitor.java | 1 - .../helix/monitoring/mbeans/MessageLatencyMonitor.java | 1 - .../org/apache/helix/monitoring/mbeans/ResourceMonitor.java | 13 +++---------- .../monitoring/mbeans/RoutingTableProviderMonitor.java | 1 - .../helix/monitoring/mbeans/StateTransitionStatMonitor.java | 2 -- .../apache/helix/monitoring/mbeans/ZkClientPathMonitor.java | 1 - 8 files changed, 3 insertions(+), 18 deletions(-) diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterEventMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterEventMonitor.java index 9691597..417f020 100644 --- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterEventMonitor.java +++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterEventMonitor.java @@ -26,7 +26,6 @@ import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider; import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric; -import org.apache.helix.util.HelixUtil; import javax.management.JMException; import java.util.ArrayList; diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/HelixCallbackMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/HelixCallbackMonitor.java index 9053daf..c256c41 100644 --- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/HelixCallbackMonitor.java +++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/HelixCallbackMonitor.java @@ -27,7 +27,6 @@ import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider; import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric; -import org.apache.helix.util.HelixUtil; import javax.management.JMException; import java.util.ArrayList; diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/JobMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/JobMonitor.java index 75fd77b..3a69947 100644 --- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/JobMonitor.java +++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/JobMonitor.java @@ -31,7 +31,6 @@ import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric; import org.apache.helix.task.TaskState; -import org.apache.helix.util.HelixUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageLatencyMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageLatencyMonitor.java index e056e1d..0bca7ab 100644 --- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageLatencyMonitor.java +++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageLatencyMonitor.java @@ -27,7 +27,6 @@ import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider; import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric; -import org.apache.helix.util.HelixUtil; import javax.management.JMException; import java.util.ArrayList; diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ResourceMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ResourceMonitor.java index e32e012..07d2e78 100644 --- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ResourceMonitor.java +++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ResourceMonitor.java @@ -38,7 +38,6 @@ import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider; import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric; -import org.apache.helix.util.HelixUtil; public class ResourceMonitor extends DynamicMBeanProvider { @@ -141,20 +140,14 @@ public class ResourceMonitor extends DynamicMBeanProvider { _partitionTopStateHandoffDurationGauge = new HistogramDynamicMetric("PartitionTopStateHandoffDurationGauge", new Histogram( - new SlidingTimeWindowArrayReservoir(HelixUtil - .getSystemPropertyAsLong(RESET_INTERVAL_SYSTEM_PROPERTY_KEY, - DEFAULT_RESET_INTERVAL_MS), TimeUnit.MILLISECONDS))); + new SlidingTimeWindowArrayReservoir(getResetIntervalInMs(), TimeUnit.MILLISECONDS))); _partitionTopStateHandoffHelixLatencyGauge = new HistogramDynamicMetric("PartitionTopStateHandoffHelixLatencyGauge", new Histogram( - new SlidingTimeWindowArrayReservoir(HelixUtil - .getSystemPropertyAsLong(RESET_INTERVAL_SYSTEM_PROPERTY_KEY, - DEFAULT_RESET_INTERVAL_MS), TimeUnit.MILLISECONDS))); + new SlidingTimeWindowArrayReservoir(getResetIntervalInMs(), TimeUnit.MILLISECONDS))); _partitionTopStateNonGracefulHandoffDurationGauge = new HistogramDynamicMetric("PartitionTopStateNonGracefulHandoffGauge", new Histogram( - new SlidingTimeWindowArrayReservoir(HelixUtil - .getSystemPropertyAsLong(RESET_INTERVAL_SYSTEM_PROPERTY_KEY, - DEFAULT_RESET_INTERVAL_MS), TimeUnit.MILLISECONDS))); + new SlidingTimeWindowArrayReservoir(getResetIntervalInMs(), TimeUnit.MILLISECONDS))); _totalMessageReceived = new SimpleDynamicMetric("TotalMessageReceived", 0L); _maxSinglePartitionTopStateHandoffDuration = diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/RoutingTableProviderMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/RoutingTableProviderMonitor.java index 4875099..158dfdd 100644 --- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/RoutingTableProviderMonitor.java +++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/RoutingTableProviderMonitor.java @@ -26,7 +26,6 @@ import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider; import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric; -import org.apache.helix.util.HelixUtil; import javax.management.JMException; import javax.management.MalformedObjectNameException; diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/StateTransitionStatMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/StateTransitionStatMonitor.java index bf40b39..efe4f09 100644 --- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/StateTransitionStatMonitor.java +++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/StateTransitionStatMonitor.java @@ -27,14 +27,12 @@ import java.util.List; import java.util.concurrent.TimeUnit; import javax.management.JMException; import javax.management.ObjectName; -import org.apache.helix.monitoring.StatCollector; import org.apache.helix.monitoring.StateTransitionContext; import org.apache.helix.monitoring.StateTransitionDataPoint; import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider; import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric; -import org.apache.helix.util.HelixUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java index 1b67c29..7881bba 100644 --- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java +++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java @@ -31,7 +31,6 @@ import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider; import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric; -import org.apache.helix.util.HelixUtil; public class ZkClientPathMonitor extends DynamicMBeanProvider { public static final String MONITOR_PATH = "PATH";
