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
The following commit(s) were added to refs/heads/master by this push:
new e6b88d7 Fix name typo for DataPropagationLatencyGuage. (#513)
e6b88d7 is described below
commit e6b88d7d44a49b3d27b7d049ec2abafcb5ad4414
Author: Huizhi L <[email protected]>
AuthorDate: Thu Oct 17 17:15:59 2019 -0700
Fix name typo for DataPropagationLatencyGuage. (#513)
DataPropagationLatencyGuage has a typo which makes helix clients/products
confusing to use. Fix this name typo to make it clearer.
Change list:
Refactor the name DataPropagationLatencyGuage with
DataPropagationLatencyGauge.
Replace hard coded names DataPropagationLatencyGuage with enum name
DataPropagationLatencyGuage in unit tests.
---
.../monitoring/mbeans/ZkClientPathMonitor.java | 4 ++--
.../apache/helix/manager/zk/TestRawZkClient.java | 2 +-
.../monitoring/mbeans/TestZkClientMonitor.java | 23 ++++++++++++----------
3 files changed, 16 insertions(+), 13 deletions(-)
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 7881bba..4094d14 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
@@ -79,7 +79,7 @@ public class ZkClientPathMonitor extends DynamicMBeanProvider
{
/*
* The latency between a ZK data change happening in the server side and
the client side getting notification.
*/
- DataPropagationLatencyGuage
+ DataPropagationLatencyGauge
}
private SimpleDynamicMetric<Long> _readCounter;
@@ -140,7 +140,7 @@ public class ZkClientPathMonitor extends
DynamicMBeanProvider {
new Histogram(
new SlidingTimeWindowArrayReservoir(getResetIntervalInMs(),
TimeUnit.MILLISECONDS)));
_dataPropagationLatencyGauge =
- new
HistogramDynamicMetric(PredefinedMetricDomains.DataPropagationLatencyGuage.name(),
+ new
HistogramDynamicMetric(PredefinedMetricDomains.DataPropagationLatencyGauge.name(),
new Histogram(new
SlidingTimeWindowArrayReservoir(getResetIntervalInMs(),
TimeUnit.MILLISECONDS)));
}
diff --git
a/helix-core/src/test/java/org/apache/helix/manager/zk/TestRawZkClient.java
b/helix-core/src/test/java/org/apache/helix/manager/zk/TestRawZkClient.java
index 4cd87e2..95a55c4 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestRawZkClient.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestRawZkClient.java
@@ -298,7 +298,7 @@ public class TestRawZkClient extends ZkUnitTestBase {
zkClient.process(new WatchedEvent(Watcher.Event.EventType.NodeDataChanged,
null, TEST_PATH));
Assert.assertTrue(callbackFinish.await(10, TimeUnit.SECONDS));
Assert.assertTrue(
- (long) beanServer.getAttribute(rootname,
"DataPropagationLatencyGuage.Max") >= waitTime);
+ (long) beanServer.getAttribute(rootname,
"DataPropagationLatencyGauge.Max") >= waitTime);
_zkClient.delete(TEST_PATH);
}
diff --git
a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestZkClientMonitor.java
b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestZkClientMonitor.java
index a1d31f0..64a02fe 100644
---
a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestZkClientMonitor.java
+++
b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestZkClientMonitor.java
@@ -141,15 +141,16 @@ public class TestZkClientMonitor {
Assert.assertTrue(
(long) _beanServer.getAttribute(instancesName,
"WriteTotalLatencyCounter") >= 10);
- monitor
-
.recordDataPropagationLatency("TEST/INSTANCES/node_1/CURRENTSTATES/session_1/Resource",
5);
- Assert
- .assertEquals((long) _beanServer.getAttribute(rootName,
"DataPropagationLatencyGuage.Max"), 5);
+
monitor.recordDataPropagationLatency("TEST/INSTANCES/node_1/CURRENTSTATES/session_1/Resource",
+ 5);
+ String dataPropagationLatencyGaugeAttr =
+
ZkClientPathMonitor.PredefinedMetricDomains.DataPropagationLatencyGauge.name()
+ ".Max";
+ Assert.assertEquals((long) _beanServer.getAttribute(rootName,
dataPropagationLatencyGaugeAttr),
+ 5);
Assert.assertEquals(
- (long) _beanServer.getAttribute(currentStateName,
"DataPropagationLatencyGuage.Max"), 5);
- Assert
- .assertEquals((long) _beanServer.getAttribute(idealStateName,
"DataPropagationLatencyGuage.Max"),
- 0);
+ (long) _beanServer.getAttribute(currentStateName,
dataPropagationLatencyGaugeAttr), 5);
+ Assert.assertEquals(
+ (long) _beanServer.getAttribute(idealStateName,
dataPropagationLatencyGaugeAttr), 0);
}
@Test
@@ -159,6 +160,8 @@ public class TestZkClientMonitor {
final String TEST_TAG = "test_tag_x";
final String TEST_KEY = "test_key_x";
final String TEST_INSTANCE = "test_instance_x";
+ String dataPropagationLatencyGaugeAttr =
+
ZkClientPathMonitor.PredefinedMetricDomains.DataPropagationLatencyGauge.name()
+ ".Max";
ZkClientMonitor monitor = new ZkClientMonitor(TEST_TAG, TEST_KEY,
TEST_INSTANCE, false, null);
monitor.register();
@@ -168,14 +171,14 @@ public class TestZkClientMonitor {
monitor
.recordDataPropagationLatency("TEST/INSTANCES/node_1/CURRENTSTATES/session_1/Resource",
5);
Assert
- .assertEquals((long) _beanServer.getAttribute(rootName,
"DataPropagationLatencyGuage.Max"),
+ .assertEquals((long) _beanServer.getAttribute(rootName,
dataPropagationLatencyGaugeAttr),
5);
// The reservoir length is 10 ms, so the prev max of 5 is not valid
anymore.
Thread.sleep(10);
monitor
.recordDataPropagationLatency("TEST/INSTANCES/node_1/CURRENTSTATES/session_1/Resource",
4);
Assert
- .assertEquals((long) _beanServer.getAttribute(rootName,
"DataPropagationLatencyGuage.Max"),
+ .assertEquals((long) _beanServer.getAttribute(rootName,
dataPropagationLatencyGaugeAttr),
4);
}
}
