From 9974c2268997a1a77792b8f58fdb3306e3708136 Mon Sep 17 00:00:00 2001 From: Ivan Khanas Date: Sat, 22 Aug 2026 22:48:24 +0200 Subject: [PATCH] ZOOKEEPER-5080: Fix flaky metric assertion in SnapshotAndRestoreCommandTest Time.currentElapsedTime counts whole milliseconds, so a snapshot of the ten znodes this test creates can finish before the clock moves and leave avg_snapshottime at 0.0 on a fast runner. Assert cnt_snapshottime instead, and the same for avg_restore_time. --- .../zookeeper/server/admin/SnapshotAndRestoreCommandTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/SnapshotAndRestoreCommandTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/SnapshotAndRestoreCommandTest.java index 8e189188f78..96e60186fc1 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/SnapshotAndRestoreCommandTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/SnapshotAndRestoreCommandTest.java @@ -395,14 +395,14 @@ private void validateSnapshotMetrics() { Map metrics = MetricsUtils.currentServerMetrics(); assertEquals(0, (long) metrics.get("snapshot_error_count")); assertEquals(0, (long) metrics.get("snapshot_rate_limited_count")); - assertTrue((Double) metrics.get("avg_snapshottime") > 0.0); + assertEquals(1L, (long) metrics.get("cnt_snapshottime")); } private void validateRestoreMetrics() { Map metrics = MetricsUtils.currentServerMetrics(); assertEquals(0, (long) metrics.get("restore_error_count")); assertEquals(0, (long) metrics.get("restore_rate_limited_count")); - assertTrue((Double) metrics.get("avg_restore_time") > 0.0); + assertEquals(1L, (long) metrics.get("cnt_restore_time")); } public static File takeSnapshotAndValidate(final int jettyAdminPort, final File dataDir) throws Exception {