(accumulo) 01/01: Merge branch '2.1' into 3.1

Fri, 06 Dec 2024 05:22:46 -0800 

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

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

commit 318765562cbaf8cec3926078e6673e679fb99f81
Merge: a41356073e 93365b4f23
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Dec 6 13:19:54 2024 +0000

    Merge branch '2.1' into 3.1

 .../core/manager/balancer/BalanceParamsImpl.java   | 18 +++++++++++++----
 .../accumulo/core/spi/balancer/GroupBalancer.java  | 10 +++++++---
 .../spi/balancer/HostRegexTableLoadBalancer.java   | 14 ++++++++-----
 .../core/spi/balancer/TableLoadBalancer.java       |  7 +++++--
 .../accumulo/core/spi/balancer/TabletBalancer.java |  9 +++++++++
 .../BaseHostRegexTableLoadBalancerTest.java        |  8 ++++++++
 .../core/spi/balancer/GroupBalancerTest.java       | 11 +++++++----
 ...tRegexTableLoadBalancerReconfigurationTest.java | 12 +++++++----
 .../balancer/HostRegexTableLoadBalancerTest.java   | 23 ++++++++++++----------
 .../core/spi/balancer/SimpleLoadBalancerTest.java  |  7 +++++--
 .../core/spi/balancer/TableLoadBalancerTest.java   |  5 +++--
 .../java/org/apache/accumulo/manager/Manager.java  |  2 +-
 .../accumulo/test/ChaoticLoadBalancerTest.java     |  4 +++-
 13 files changed, 92 insertions(+), 38 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/manager/balancer/BalanceParamsImpl.java
index a7cc5226d3,97b9315c6e..c42892feaf
--- 
a/core/src/main/java/org/apache/accumulo/core/manager/balancer/BalanceParamsImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/manager/balancer/BalanceParamsImpl.java
@@@ -27,8 -27,9 +27,9 @@@ import java.util.stream.Collectors
  import org.apache.accumulo.core.data.TabletId;
  import org.apache.accumulo.core.dataImpl.KeyExtent;
  import org.apache.accumulo.core.dataImpl.TabletIdImpl;
 -import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 +import org.apache.accumulo.core.manager.thrift.TabletServerStatus;
  import org.apache.accumulo.core.metadata.TServerInstance;
+ import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
  import org.apache.accumulo.core.spi.balancer.TabletBalancer;
  import org.apache.accumulo.core.spi.balancer.data.TServerStatus;
  import org.apache.accumulo.core.spi.balancer.data.TabletMigration;
diff --cc 
core/src/test/java/org/apache/accumulo/core/spi/balancer/GroupBalancerTest.java
index 3dfd120e48,e55eb379d2..189af6ef6f
--- 
a/core/src/test/java/org/apache/accumulo/core/spi/balancer/GroupBalancerTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/spi/balancer/GroupBalancerTest.java
@@@ -116,10 -120,11 +118,11 @@@ public class GroupBalancerTest 
  
          for (TabletServerId tsi : tservers) {
            current.put(tsi, new TServerStatusImpl(
 -              new 
org.apache.accumulo.core.master.thrift.TabletServerStatus()));
 +              new 
org.apache.accumulo.core.manager.thrift.TabletServerStatus()));
          }
  
-         balancer.balance(new BalanceParamsImpl(current, migrations, 
migrationsOut));
+         balancer
+             .balance(new BalanceParamsImpl(current, migrations, 
migrationsOut, DataLevel.of(tid)));
  
          assertTrue(migrationsOut.size() <= (maxMigrations + 5),
              "Max Migration exceeded " + maxMigrations + " " + 
migrationsOut.size());
diff --cc 
core/src/test/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancerTest.java
index 5071ddea12,4d3162e02d..8d86e34210
--- 
a/core/src/test/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancerTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancerTest.java
@@@ -50,9 -53,8 +51,8 @@@ import org.apache.accumulo.core.spi.bal
  import org.apache.accumulo.core.spi.balancer.data.TabletMigration;
  import org.apache.accumulo.core.spi.balancer.data.TabletServerId;
  import org.apache.accumulo.core.spi.balancer.data.TabletStatistics;
 +import org.apache.accumulo.core.spi.common.ServiceEnvironment;
  import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
- import org.apache.accumulo.core.util.UtilWaitThread;
 -import org.apache.accumulo.core.util.ConfigurationImpl;
  import org.junit.jupiter.api.Test;
  
  public class HostRegexTableLoadBalancerTest extends 
BaseHostRegexTableLoadBalancerTest {
diff --cc 
core/src/test/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancerTest.java
index 9b7c2b7a56,055898928b..68d059f6ea
--- 
a/core/src/test/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancerTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancerTest.java
@@@ -41,7 -41,8 +41,8 @@@ import org.apache.accumulo.core.manager
  import org.apache.accumulo.core.manager.balancer.TServerStatusImpl;
  import org.apache.accumulo.core.manager.balancer.TabletServerIdImpl;
  import org.apache.accumulo.core.manager.balancer.TabletStatisticsImpl;
 -import org.apache.accumulo.core.master.thrift.TableInfo;
 +import org.apache.accumulo.core.manager.thrift.TableInfo;
+ import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
  import org.apache.accumulo.core.spi.balancer.data.TServerStatus;
  import org.apache.accumulo.core.spi.balancer.data.TabletMigration;
  import org.apache.accumulo.core.spi.balancer.data.TabletServerId;
diff --cc 
core/src/test/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancerTest.java
index 06a30d88ed,8e9aefd028..f36c80e33e
--- 
a/core/src/test/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancerTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancerTest.java
@@@ -42,7 -43,8 +42,8 @@@ import org.apache.accumulo.core.manager
  import org.apache.accumulo.core.manager.balancer.TServerStatusImpl;
  import org.apache.accumulo.core.manager.balancer.TabletServerIdImpl;
  import org.apache.accumulo.core.manager.balancer.TabletStatisticsImpl;
 -import org.apache.accumulo.core.master.thrift.TableInfo;
 +import org.apache.accumulo.core.manager.thrift.TableInfo;
+ import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
  import org.apache.accumulo.core.spi.balancer.data.TServerStatus;
  import org.apache.accumulo.core.spi.balancer.data.TabletMigration;
  import org.apache.accumulo.core.spi.balancer.data.TabletServerId;
diff --cc 
test/src/test/java/org/apache/accumulo/test/ChaoticLoadBalancerTest.java
index 8b803e7089,57fbd33247..65b3c44bc0
--- a/test/src/test/java/org/apache/accumulo/test/ChaoticLoadBalancerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ChaoticLoadBalancerTest.java
@@@ -39,7 -39,8 +39,8 @@@ import org.apache.accumulo.core.manager
  import org.apache.accumulo.core.manager.balancer.TServerStatusImpl;
  import org.apache.accumulo.core.manager.balancer.TabletServerIdImpl;
  import org.apache.accumulo.core.manager.balancer.TabletStatisticsImpl;
 -import org.apache.accumulo.core.master.thrift.TableInfo;
 +import org.apache.accumulo.core.manager.thrift.TableInfo;
+ import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
  import org.apache.accumulo.core.spi.balancer.data.TServerStatus;
  import org.apache.accumulo.core.spi.balancer.data.TabletMigration;
  import org.apache.accumulo.core.spi.balancer.data.TabletServerId;

Reply via email to