(accumulo) branch elasticity updated: Fixes WaitForBalanceIT (#3906)

[dlmarion]

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

dlmarion 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 300b39f734 Fixes WaitForBalanceIT (#3906)
300b39f734 is described below

commit 300b39f7344a1adf4793b1a4007c5062d33276db
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Tue Oct 31 12:48:41 2023 -0400

    Fixes WaitForBalanceIT (#3906)
    
    It appears that Manager.waitForBalance may return and then the
    isBalanced method returns false. I think this is due to the fact
    that the current location for the Tablet is set in the TabletServer
    AssignmentHandler, which leaves a gap where
    InstanceOperations.waitForBalance returns but the locations are not
    yet set.
    
    
    Co-authored-by: Dom G. <domgargu...@apache.org>
---
 .../main/java/org/apache/accumulo/test/WaitForBalanceIT.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java 
b/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
index 1c0b33ce37..a528d967c4 100644
--- a/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
@@ -31,6 +31,8 @@ import java.util.TreeSet;
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.admin.NewTableConfiguration;
+import org.apache.accumulo.core.client.admin.TabletHostingGoal;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.metadata.MetadataTable;
@@ -40,11 +42,10 @@ import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Cu
 import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.test.functional.ConfigurableMacBase;
+import org.apache.accumulo.test.util.Wait;
 import org.apache.hadoop.io.Text;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-@Disabled // ELASTICITY_TODO
 public class WaitForBalanceIT extends ConfigurableMacBase {
 
   private static final int NUM_SPLITS = 50;
@@ -64,7 +65,9 @@ public class WaitForBalanceIT extends ConfigurableMacBase {
       c.instanceOperations().waitForBalance();
       assertTrue(isBalanced(c));
       final String tableName = getUniqueNames(1)[0];
-      c.tableOperations().create(tableName);
+      NewTableConfiguration ntc = new NewTableConfiguration();
+      ntc.withInitialHostingGoal(TabletHostingGoal.ALWAYS);
+      c.tableOperations().create(tableName, ntc);
       c.instanceOperations().waitForBalance();
       final SortedSet<Text> partitionKeys = new TreeSet<>();
       for (int i = 0; i < NUM_SPLITS; i++) {
@@ -73,7 +76,7 @@ public class WaitForBalanceIT extends ConfigurableMacBase {
       c.tableOperations().addSplits(tableName, partitionKeys);
       assertFalse(isBalanced(c));
       c.instanceOperations().waitForBalance();
-      assertTrue(isBalanced(c));
+      Wait.waitFor(() -> isBalanced(c));
     }
   }