(accumulo) branch elasticity updated: fixes timeout in CompactionPriorityQueueMetricsIT (#4583)

[kturner]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/elasticity by this push:
     new aa85bf2b0e fixes timeout in CompactionPriorityQueueMetricsIT (#4583)
aa85bf2b0e is described below

commit aa85bf2b0ec57c7bc53cabc293be993d648c15a6
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Tue May 21 15:27:13 2024 -0400

    fixes timeout in CompactionPriorityQueueMetricsIT (#4583)
    
    CompactionPriorityQueueMetricsIT was waiting up to 30s
    for a dead compactor process to be absent in zookeeper.
    The default zookeeper timeout is 30s, so there was a good
    chance it would timeout.  Modified the zookeeper timeout
    in the test to 10s rather then increase the time to wait
    for the ZK entry to be absent.
---
 .../test/compaction/CompactionPriorityQueueMetricsIT.java         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java
 
b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java
index 7af245fde3..40f6ddc107 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java
@@ -152,7 +152,9 @@ public class CompactionPriorityQueueMetricsIT extends 
SharedMiniClusterBase {
   @AfterEach
   public void teardownMetricsTest() throws Exception {
     shutdownTailer.set(true);
-    metricsTailer.join();
+    if (metricsTailer != null) {
+      metricsTailer.join();
+    }
   }
 
   private String getDir(String testName) throws Exception {
@@ -197,6 +199,10 @@ public class CompactionPriorityQueueMetricsIT extends 
SharedMiniClusterBase {
       cfg.setProperty(Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE, 
"6");
       cfg.getClusterServerConfiguration().addCompactorResourceGroup(QUEUE1, 0);
 
+      // This test waits for dead compactors to be absent in zookeeper. The 
following setting will
+      // make entries in ZK related to dead compactor processes expire sooner.
+      cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT.getKey(), "10");
+
       // use raw local file system
       conf.set("fs.file.impl", RawLocalFileSystem.class.getName());
       // Tell the server processes to use a StatsDMeterRegistry that will be 
configured