This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 20bfabab5b1e07437a6f54ec4a51e3228ae9e4df
Merge: eb4ff2eec9 a6f22a32ce
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Dec 21 05:28:05 2023 -0500
Merge branch 'main' into elasticity
.github/ISSUE_TEMPLATE/post_vote_checklist.md | 5 +-
.github/workflows/maven-full-its.yaml | 18 ++--
.github/workflows/maven-on-demand.yaml | 8 +-
.github/workflows/maven.yaml | 21 +++--
.github/workflows/scripts.yaml | 6 +-
assemble/pom.xml | 5 --
core/pom.xml | 4 -
.../accumulo/core/tabletserver/log/LogEntry.java | 25 ++++--
.../org/apache/accumulo/core/trace/TraceUtil.java | 8 +-
.../core/tabletserver/log/LogEntryTest.java | 13 +--
pom.xml | 99 ++++++++--------------
.../org/apache/accumulo/server/fs/VolumeUtil.java | 2 +-
.../accumulo/server/util/RestoreZookeeper.java | 7 +-
.../accumulo/gc/GarbageCollectWriteAheadLogs.java | 11 +--
.../accumulo/manager/recovery/RecoveryManager.java | 15 ++--
server/monitor/pom.xml | 6 ++
16 files changed, 112 insertions(+), 141 deletions(-)
diff --cc
core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
index 3343d750fc,6bd5ba57b4..57820065b0
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
@@@ -153,7 -158,12 +158,11 @@@ public final class LogEntry
/**
* Get the Text that should be used as the column qualifier to store this
as a metadata entry.
*/
- @VisibleForTesting
- Text getColumnQualifier() {
+ public Text getColumnQualifier() {
+ return columnQualifier == null ? newCQ() : new Text(columnQualifier);
+ }
+
+ private Text newCQ() {
return new Text("-/" + getPath());
}
diff --cc
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 4b4d35918b,d6f3c63851..7e55a5274c
---
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@@ -294,9 -283,8 +290,8 @@@ public class GarbageCollectWriteAheadLo
}
// Tablet is being recovered and has WAL references, remove all the
WALs for the dead server
// that made the WALs.
- for (LogEntry wals : tabletMetadata.getLogs()) {
- String wal = wals.getPath();
- UUID walUUID = path2uuid(new Path(wal));
- for (LogEntry wal : state.walogs) {
++ for (LogEntry wal : tabletMetadata.getLogs()) {
+ UUID walUUID = wal.getUniqueID();
TServerInstance dead = result.get(walUUID);
// There's a reference to a log file, so skip that server's logs
Set<UUID> idsToIgnore = candidates.remove(dead);
diff --cc
server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
index 7c66d84a2f,530fd6e1c7..7ed9d845b6
---
a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
@@@ -39,10 -39,8 +39,9 @@@ import org.apache.accumulo.core.conf.Pr
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.fate.zookeeper.ZooCache;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
+import org.apache.accumulo.core.util.cache.Caches.CacheName;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.manager.Manager;
- import org.apache.accumulo.server.fs.VolumeManager.FileType;
import org.apache.accumulo.server.fs.VolumeUtil;
import org.apache.accumulo.server.log.SortedLogState;
import org.apache.accumulo.server.manager.recovery.HadoopLogCloser;
