(accumulo) branch main updated: fixes resource group IT (#6233)

[kturner]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new f241a11099 fixes resource group IT (#6233)
f241a11099 is described below

commit f241a11099bfe5affdc11395a6fc11dc427b0983
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Mar 23 11:43:39 2026 -0700

    fixes resource group IT (#6233)
    
    Resource group IT had two test that used the same resource group names
    and could see each others property changes.  One of the test was
    recently and changed and this caused the other test to break.  Modified
    the test to use unique names.
---
 .../accumulo/test/conf/ResourceGroupConfigIT.java  | 39 ++++++++++++++++++----
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git 
a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java 
b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java
index 4448c0dfed..cc418195fe 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java
@@ -65,6 +65,7 @@ import org.apache.accumulo.test.util.Wait;
 import org.apache.hadoop.conf.Configuration;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
@@ -96,6 +97,16 @@ public class ResourceGroupConfigIT extends 
SharedMiniClusterBase {
     SharedMiniClusterBase.stopMiniCluster();
   }
 
+  @BeforeEach
+  public void beforeTest() throws Exception {
+    var rgops = getCluster().getServerContext().resourceGroupOperations();
+    for (var rgid : rgops.list()) {
+      if (!rgid.equals(ResourceGroupId.DEFAULT)) {
+        rgops.remove(rgid);
+      }
+    }
+  }
+
   @Test
   public void testProperties() throws Exception {
 
@@ -321,9 +332,9 @@ public class ResourceGroupConfigIT extends 
SharedMiniClusterBase {
   @Test
   public void testMultipleProperties() throws Exception {
 
-    final String FIRST = "FIRST";
-    final String SECOND = "SECOND";
-    final String THIRD = "THIRD";
+    final String FIRST = "FIRST_MP";
+    final String SECOND = "SECOND_MP";
+    final String THIRD = "THIRD_MP";
 
     final ResourceGroupId first = ResourceGroupId.of(FIRST);
     final ResourceGroupId second = ResourceGroupId.of(SECOND);
@@ -356,6 +367,10 @@ public class ResourceGroupConfigIT extends 
SharedMiniClusterBase {
       rgops.create(second);
       rgops.create(third);
 
+      assertEquals(Map.of(), rgops.getProperties(first));
+      assertEquals(Map.of(), rgops.getProperties(second));
+      assertEquals(Map.of(), rgops.getProperties(third));
+
       rgops.modifyProperties(first, (map) -> map.putAll(firstProps));
       rgops.modifyProperties(second, (map) -> map.putAll(secondProps));
       rgops.modifyProperties(third, (map) -> map.putAll(thirdProps));
@@ -381,15 +396,18 @@ public class ResourceGroupConfigIT extends 
SharedMiniClusterBase {
       assertEquals(defaultProps, rgops.getProperties(ResourceGroupId.DEFAULT));
       assertThrows(ResourceGroupNotFoundException.class, 
()->rgops.getProperties(third));
       assertEquals(Set.of(ResourceGroupId.DEFAULT, first, second), 
rgops.list());
+
+      rgops.remove(first);
+      rgops.remove(second);
     }
   }
 
   @Test
   public void testMultipleConfigurations() throws Exception {
 
-    final String FIRST = "FIRST";
-    final String SECOND = "SECOND";
-    final String THIRD = "THIRD";
+    final String FIRST = "FIRST_MC";
+    final String SECOND = "SECOND_MC";
+    final String THIRD = "THIRD_MC";
 
     final ResourceGroupId first = ResourceGroupId.of(FIRST);
     final ResourceGroupId second = ResourceGroupId.of(SECOND);
@@ -436,6 +454,10 @@ public class ResourceGroupConfigIT extends 
SharedMiniClusterBase {
       rgops.create(second);
       rgops.create(third);
 
+      assertEquals(Map.of(), rgops.getProperties(first));
+      assertEquals(Map.of(), rgops.getProperties(second));
+      assertEquals(Map.of(), rgops.getProperties(third));
+
       
getCluster().getConfig().getClusterServerConfiguration().setNumDefaultCompactors(1);
       
getCluster().getConfig().getClusterServerConfiguration().addCompactorResourceGroup(FIRST,
 1);
       
getCluster().getConfig().getClusterServerConfiguration().addCompactorResourceGroup(SECOND,
 1);
@@ -497,6 +519,11 @@ public class ResourceGroupConfigIT extends 
SharedMiniClusterBase {
       Wait.waitFor(() -> cc.getServerPaths()
           .getTabletServer(ResourceGroupPredicate.exact(third), 
AddressSelector.all(), true).size()
           == 0);
+
+      rgops.remove(first);
+      rgops.remove(second);
+      rgops.remove(third);
+
     }
   }