You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2024/06/11 21:45:28 UTC
(accumulo) branch elasticity updated (3c254d5161 -> 1008be681a)
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a change to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 3c254d5161 Merge branch 'main' into elasticity
add 9ce9ff9d74 ExternalCompactionProgressIT - verify only after compaction completes (#4661)
add 751c549108 updates WriteAfterCloseIT to also use ConditionalWriter (#4662)
add b6954a7a39 Merge branch '2.1'
new 1008be681a Merge branch 'main' into elasticity
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:
.../accumulo/core/client/ConditionalWriter.java | 2 +-
.../core/clientImpl/ConditionalWriterImpl.java | 11 ++-
.../accumulo/tserver/TabletClientHandler.java | 56 ++++++++-----
.../apache/accumulo/test/WriteAfterCloseIT.java | 95 ++++++++++++++--------
.../compaction/ExternalCompactionProgressIT.java | 6 +-
5 files changed, 107 insertions(+), 63 deletions(-)
(accumulo) 01/01: Merge branch 'main' into elasticity
Posted by kt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 1008be681a9770f8aa16e15f131e10de6b26588b
Merge: 3c254d5161 b6954a7a39
Author: Keith Turner <kt...@apache.org>
AuthorDate: Tue Jun 11 17:26:42 2024 -0400
Merge branch 'main' into elasticity
.../accumulo/core/client/ConditionalWriter.java | 2 +-
.../core/clientImpl/ConditionalWriterImpl.java | 11 ++-
.../accumulo/tserver/TabletClientHandler.java | 56 ++++++++-----
.../apache/accumulo/test/WriteAfterCloseIT.java | 95 ++++++++++++++--------
.../compaction/ExternalCompactionProgressIT.java | 6 +-
5 files changed, 107 insertions(+), 63 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
index bf650a077f,3137a19f00..bec607cb28
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
@@@ -89,8 -91,10 +91,10 @@@ import org.slf4j.LoggerFactory
import com.google.common.net.HostAndPort;
-class ConditionalWriterImpl implements ConditionalWriter {
+public class ConditionalWriterImpl implements ConditionalWriter {
+ private static final Logger log = LoggerFactory.getLogger(ConditionalWriterImpl.class);
+
private static final int MAX_SLEEP = 30000;
private Authorizations auths;