Skip to content

Commit a8631bd

Browse files
authored
ZOOKEEPER-4934: Add metrics for TTL node creation (#2287)
* ZOOKEEPER-4934: Add metrics for TTL node creation * Trigger CI
1 parent c91f611 commit a8631bd

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

zookeeper-server/src/main/java/org/apache/zookeeper/server/DataTree.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ public void createNode(final String path, byte[] data, List<ACL> acl, long ephem
486486
containers.add(path);
487487
} else if (ephemeralType == EphemeralType.TTL) {
488488
ttls.add(path);
489+
ServerMetrics.getMetrics().TTL_NODE_CREATED_COUNT.add(1);
489490
} else if (ephemeralOwner != 0) {
490491
HashSet<String> list = ephemerals.computeIfAbsent(ephemeralOwner, k -> new HashSet<>());
491492
synchronized (list) {

zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerMetrics.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ private ServerMetrics(MetricsProvider metricsProvider) {
271271
QUOTA_EXCEEDED_ERROR_PER_NAMESPACE = metricsContext.getCounterSet(QuotaMetricsUtils.QUOTA_EXCEEDED_ERROR_PER_NAMESPACE);
272272

273273
TTL_NODE_DELETED_COUNT = metricsContext.getCounter("ttl_node_deleted_count");
274+
TTL_NODE_CREATED_COUNT = metricsContext.getCounter("ttl_node_created_count");
274275
}
275276

276277
/**
@@ -550,9 +551,10 @@ private ServerMetrics(MetricsProvider metricsProvider) {
550551
public final CounterSet QUOTA_EXCEEDED_ERROR_PER_NAMESPACE;
551552

552553
/**
553-
* Count of deleted TTL nodes
554+
* Count of created and deleted TTL nodes
554555
*/
555556
public final Counter TTL_NODE_DELETED_COUNT;
557+
public final Counter TTL_NODE_CREATED_COUNT;
556558

557559
private final MetricsProvider metricsProvider;
558560

zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateTTLTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ public void testCreate() throws KeeperException, InterruptedException {
9595
containerManager.checkContainers();
9696
assertNull(zk.exists("/foo", false), "Ttl node should have been deleted");
9797

98-
// validate deleted TTL nodes count
98+
// validate created and deleted TTL nodes count
9999
Map<String, Object> metrics = MetricsUtils.currentServerMetrics();
100+
assertTrue((long) metrics.get("ttl_node_created_count") >= 1);
100101
assertTrue((long) metrics.get("ttl_node_deleted_count") >= 1);
101102
}
102103

0 commit comments

Comments
 (0)