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 2023/05/05 19:40:53 UTC
[accumulo] branch main updated (d0e3f0ae0a -> a36a2fcb94)
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from d0e3f0ae0a Merge branch '2.1'
add b41427dc18 Used Retry to backoff when processing tablet locator failures (#3380)
new 73844448d3 Merge branch '2.1'
new a36a2fcb94 Merge remote-tracking branch 'upstream/main'
The 2 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/clientImpl/TabletServerBatchReaderIterator.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
[accumulo] 01/02: Merge branch '2.1'
Posted by dl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 73844448d38a6833d7fcf518f36d686eb804ef81
Merge: de73759c24 b41427dc18
Author: Dave Marion <dl...@apache.org>
AuthorDate: Fri May 5 19:33:16 2023 +0000
Merge branch '2.1'
.../TabletServerBatchReaderIterator.java | 10 +-
.../core/metadata/schema/TabletMetadata.java | 10 ++
.../accumulo/server/manager/state/Assignment.java | 14 ++-
.../server/manager/state/MetaDataStateStore.java | 8 +-
.../server/manager/state/UnassignedTablet.java | 84 +++++++++++++++++
.../server/manager/state/ZooTabletStateStore.java | 8 +-
.../accumulo/server/util/ManagerMetadataUtil.java | 14 +--
.../manager/state/RootTabletStateStoreTest.java | 4 +-
.../server/util/ManagerMetadataUtilTest.java | 102 +++++++++++++++++++++
.../java/org/apache/accumulo/manager/Manager.java | 9 +-
.../accumulo/manager/TabletGroupWatcher.java | 51 ++++++-----
.../apache/accumulo/tserver/AssignmentHandler.java | 3 +-
.../accumulo/test/functional/SplitRecoveryIT.java | 2 +-
.../apache/accumulo/test/manager/MergeStateIT.java | 2 +-
.../accumulo/test/performance/NullTserver.java | 2 +-
15 files changed, 274 insertions(+), 49 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
index 4dbfbffab8,963a9f2c4a..a2b549139b
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
@@@ -69,13 -71,15 +71,14 @@@ import org.apache.accumulo.core.securit
import org.apache.accumulo.core.spi.scan.ScanServerAttempt;
import org.apache.accumulo.core.spi.scan.ScanServerSelections;
import org.apache.accumulo.core.spi.scan.ScanServerSelector;
+import org.apache.accumulo.core.tabletscan.thrift.ScanServerBusyException;
+import org.apache.accumulo.core.tabletscan.thrift.TSampleNotPresentException;
+import org.apache.accumulo.core.tabletscan.thrift.TabletScanClientService;
import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
-import org.apache.accumulo.core.tabletserver.thrift.ScanServerBusyException;
-import org.apache.accumulo.core.tabletserver.thrift.TSampleNotPresentException;
-import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.ByteBufferUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.OpTimer;
+ import org.apache.accumulo.core.util.Retry;
import org.apache.thrift.TApplicationException;
import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransportException;
[accumulo] 02/02: Merge remote-tracking branch 'upstream/main'
Posted by dl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a36a2fcb946fc9b431d8cb699dac10ffe4a441ec
Merge: 73844448d3 d0e3f0ae0a
Author: Dave Marion <dl...@apache.org>
AuthorDate: Fri May 5 19:40:33 2023 +0000
Merge remote-tracking branch 'upstream/main'