You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2024/08/29 16:46:09 UTC
(accumulo) branch 3.1 updated (1d365a9089 -> a49009c608)
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 1d365a9089 Add UTF-8 charsets to String/Byte conversions in main (#4847)
add 1aa9a1b370 Modified InstanceOperations.getActiveCompactions for Compactors (#4845)
new a49009c608 Merge branch '2.1' into 3.1
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/client/admin/InstanceOperations.java | 19 +++--
.../accumulo/core/clientImpl/ClientContext.java | 9 +++
.../core/clientImpl/InstanceOperationsImpl.java | 46 ++++++++---
.../accumulo/core/clientImpl/TabletLocator.java | 6 +-
.../core/clientImpl/TabletServerBatchWriter.java | 6 +-
.../core/clientImpl/ZookeeperLockChecker.java | 5 ++
.../shell/commands/ListCompactionsCommand.java | 3 +-
.../test/compaction/ExternalCompaction_1_IT.java | 91 ++++++++++++++++++++++
.../accumulo/test/functional/CompactionIT.java | 81 +++++++++++++++++++
9 files changed, 239 insertions(+), 27 deletions(-)
(accumulo) 01/01: Merge branch '2.1' into 3.1
Posted by dl...@apache.org.
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 a49009c608cdbec48df1572b01628eb024c7caad
Merge: 1d365a9089 1aa9a1b370
Author: Dave Marion <dl...@apache.org>
AuthorDate: Thu Aug 29 16:45:55 2024 +0000
Merge branch '2.1' into 3.1
.../core/client/admin/InstanceOperations.java | 19 +++--
.../accumulo/core/clientImpl/ClientContext.java | 9 +++
.../core/clientImpl/InstanceOperationsImpl.java | 46 ++++++++---
.../accumulo/core/clientImpl/TabletLocator.java | 6 +-
.../core/clientImpl/TabletServerBatchWriter.java | 6 +-
.../core/clientImpl/ZookeeperLockChecker.java | 5 ++
.../shell/commands/ListCompactionsCommand.java | 3 +-
.../test/compaction/ExternalCompaction_1_IT.java | 91 ++++++++++++++++++++++
.../accumulo/test/functional/CompactionIT.java | 81 +++++++++++++++++++
9 files changed, 239 insertions(+), 27 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocator.java
index 29298644d0,c4c1dcdcd9..cded45881d
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocator.java
@@@ -140,15 -140,14 +140,15 @@@ public abstract class TabletLocator
if (tl == null) {
MetadataLocationObtainer mlo = new MetadataLocationObtainer();
- if (RootTable.ID.equals(tableId)) {
+ if (AccumuloTable.ROOT.tableId().equals(tableId)) {
- tl = new RootTabletLocator(new ZookeeperLockChecker(context));
+ tl = new RootTabletLocator(context.getTServerLockChecker());
- } else if (MetadataTable.ID.equals(tableId)) {
- tl = new TabletLocatorImpl(MetadataTable.ID, getLocator(context, RootTable.ID), mlo,
+ } else if (AccumuloTable.METADATA.tableId().equals(tableId)) {
+ tl = new TabletLocatorImpl(AccumuloTable.METADATA.tableId(),
+ getLocator(context, AccumuloTable.ROOT.tableId()), mlo,
- new ZookeeperLockChecker(context));
+ context.getTServerLockChecker());
} else {
- tl = new TabletLocatorImpl(tableId, getLocator(context, MetadataTable.ID), mlo,
- context.getTServerLockChecker());
+ tl = new TabletLocatorImpl(tableId, getLocator(context, AccumuloTable.METADATA.tableId()),
- mlo, new ZookeeperLockChecker(context));
++ mlo, context.getTServerLockChecker());
}
locators.put(key, tl);
}
diff --cc core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
index 6872b4bf3f,46fce95cfc..52219c2de8
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
@@@ -73,12 -72,13 +72,11 @@@ import org.apache.accumulo.core.dataImp
import org.apache.accumulo.core.dataImpl.TabletIdImpl;
import org.apache.accumulo.core.dataImpl.thrift.TMutation;
import org.apache.accumulo.core.dataImpl.thrift.UpdateErrors;
- import org.apache.accumulo.core.lock.ServiceLock;
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
+import org.apache.accumulo.core.tabletingest.thrift.TabletIngestClientService;
import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
-import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.trace.thrift.TInfo;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.Retry;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.core.util.threads.Threads;
diff --cc test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
index f712777e85,fd50fd199e..1b03592d64
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
@@@ -49,10 -46,11 +49,12 @@@ import java.util.EnumSet
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
+ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+ import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@@ -105,6 -108,6 +113,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
++import com.google.common.net.HostAndPort;
public class ExternalCompaction_1_IT extends SharedMiniClusterBase {
diff --cc test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index 3e69c84897,56e57bac33..bdf04d0805
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@@ -44,7 -37,7 +44,8 @@@ import java.util.Map
import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.Objects;
+import java.util.Set;
+ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
@@@ -111,7 -103,8 +114,8 @@@ import org.slf4j.LoggerFactory
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
++import com.google.common.net.HostAndPort;
-@SuppressWarnings("removal")
public class CompactionIT extends AccumuloClusterHarness {
public static class TestFilter extends Filter {