(accumulo) 01/01: Merge branch '2.1'

[ddanielr]

This is an automated email from the ASF dual-hosted git repository.

ddanielr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit f529c0336745a98d59db6aa0f999bfa9bfc6ad02
Merge: b5461fdbf8 1bdad6cdce
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Thu Nov 27 04:59:22 2025 +0000

    Merge branch '2.1'

 core/src/main/java/org/apache/accumulo/core/logging/TabletLogger.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc core/src/main/java/org/apache/accumulo/core/logging/TabletLogger.java
index 99b1e29462,747a352c6c..dc9396fc9d
--- a/core/src/main/java/org/apache/accumulo/core/logging/TabletLogger.java
+++ b/core/src/main/java/org/apache/accumulo/core/logging/TabletLogger.java
@@@ -135,30 -117,29 +135,34 @@@ public class TabletLogger 
     * Lazily converts TableFile to file names. The lazy part is really 
important because when it is
     * not called with log.isDebugEnabled().
     */
 -  private static Collection<String> asFileNames(Collection<CompactableFile> 
files) {
 -    return Collections2.transform(files, CompactableFile::getFileName);
 +  private static Collection<String> 
asMinimalString(Collection<CompactableFile> files) {
 +    return Collections2.transform(files,
 +        cf -> CompactableFileImpl.toStoredTabletFile(cf).toMinimalString());
    }
  
+   public static void renamed(KeyExtent extent, TabletFile src, TabletFile 
dest) {
+     fileLog.debug("{} renamed {} to {}", extent, src.getFileName(), 
dest.getFileName());
+   }
+ 
 -  public static void selected(KeyExtent extent, CompactionKind kind,
 -      Collection<? extends TabletFile> inputs) {
 -    fileLog.trace("{} changed compaction selection set for {} new set {}", 
extent, kind,
 -        Collections2.transform(inputs, TabletFile::getFileName));
 +  public static void selected(FateId fateId, KeyExtent extent,
 +      Collection<StoredTabletFile> inputs) {
 +    fileLog.trace("Selected files {} {} {}", extent, fateId,
 +        Collections2.transform(inputs, StoredTabletFile::toMinimalString));
    }
  
 -  public static void compacting(KeyExtent extent, CompactionJob job, 
CompactionConfig config) {
 +  public static void compacting(KeyExtent extent, FateId selectedFateId, 
ExternalCompactionId cid,
 +      String compactorAddress, CompactionJob job) {
      if (fileLog.isDebugEnabled()) {
 -      if (config == null) {
 -        fileLog.debug("Compacting {} on {} for {} from {} size {}", extent, 
job.getExecutor(),
 -            job.getKind(), asFileNames(job.getFiles()), 
getSize(job.getFiles()));
 +      if (job.getKind() == CompactionKind.USER) {
 +        fileLog.debug(
 +            "Compacting {} driver:{} id:{} group:{} compactor:{} priority:{} 
size:{} kind:{} files:{}",
 +            extent, selectedFateId, cid, job.getGroup(), compactorAddress, 
job.getPriority(),
 +            getSize(job.getFiles()), job.getKind(), 
asMinimalString(job.getFiles()));
        } else {
 -        fileLog.debug("Compacting {} on {} for {} from {} size {} config {}", 
extent,
 -            job.getExecutor(), job.getKind(), asFileNames(job.getFiles()), 
getSize(job.getFiles()),
 -            config);
 +        fileLog.debug(
 +            "Compacting {} id:{} group:{} compactor:{} priority:{} size:{} 
kind:{} files:{}",
 +            extent, cid, job.getGroup(), compactorAddress, job.getPriority(),
 +            getSize(job.getFiles()), job.getKind(), 
asMinimalString(job.getFiles()));
        }
      }
    }