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/12/23 13:37:43 UTC
(accumulo) branch 3.1 updated (8fc9ff9daf -> d739ab6ad9)
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 8fc9ff9daf Merge branch '2.1' into 3.1
add e510e84a66 Halt TabletServer on walog write and no TabletServer lock (#5170)
new d739ab6ad9 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:
.../org/apache/accumulo/tserver/log/TabletServerLogger.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
(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 d739ab6ad9a2888bf3ae8c1af76db133f97e2a46
Merge: 8fc9ff9daf e510e84a66
Author: Dave Marion <dl...@apache.org>
AuthorDate: Mon Dec 23 13:37:31 2024 +0000
Merge branch '2.1' into 3.1
.../org/apache/accumulo/tserver/log/TabletServerLogger.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index a5f6963da3,a124c634f3..2aa1e87aa8
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@@ -41,11 -39,8 +41,12 @@@ import java.util.concurrent.locks.Reent
import org.apache.accumulo.core.client.Durability;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
-import org.apache.accumulo.core.protobuf.ProtobufUtil;
+import org.apache.accumulo.core.file.blockfile.impl.BasicCacheProvider;
+import org.apache.accumulo.core.file.blockfile.impl.CacheProvider;
++import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.logging.LoggingBlockCache;
+import org.apache.accumulo.core.spi.cache.CacheType;
+import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.util.Halt;
import org.apache.accumulo.core.util.Retry;
import org.apache.accumulo.core.util.Retry.RetryFactory;