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

[ctubbsii]

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

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

commit fea968d598c9358e0807ff12e309df50d8b3a347
Merge: bc128fcc5c 26b3e4d149
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Mon Sep 30 19:30:59 2024 -0400

    Merge branch '3.1'

 core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/Bulk.java | 3 +++
 core/src/main/java/org/apache/accumulo/core/lock/ServiceLockData.java | 1 +
 .../java/org/apache/accumulo/server/metadata/RootGcCandidates.java    | 1 +
 .../apache/accumulo/server/util/fateCommand/FateSummaryReport.java    | 1 +
 .../org/apache/accumulo/server/util/fateCommand/FateTxnDetails.java   | 1 +
 .../accumulo/server/util/serviceStatus/ServiceStatusReport.java       | 1 +
 .../org/apache/accumulo/server/util/serviceStatus/StatusSummary.java  | 1 +
 .../tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java | 2 +-
 .../main/java/org/apache/accumulo/tserver/log/ResolvedSortedLog.java  | 4 ----
 .../main/java/org/apache/accumulo/tserver/session/SessionManager.java | 2 +-
 .../main/java/org/apache/accumulo/tserver/tablet/SnapshotTablet.java  | 4 ----
 11 files changed, 11 insertions(+), 10 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateSummaryReport.java
index f53c11ccb4,174c70e907..f17695265a
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateSummaryReport.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateSummaryReport.java
@@@ -60,14 -56,12 +60,15 @@@ public class FateSummaryReport 
    private transient Map<String,String> idsToNameMap;
  
    // Gson requires a default constructor when JDK Unsafe usage is disabled
+   @SuppressWarnings("unused")
    private FateSummaryReport() {}
  
 -  public FateSummaryReport(Map<String,String> idsToNameMap,
 -      EnumSet<ReadOnlyTStore.TStatus> statusFilter) {
 +  public FateSummaryReport(Map<String,String> idsToNameMap, Set<FateId> 
fateIdFilter,
 +      EnumSet<ReadOnlyFateStore.TStatus> statusFilter, 
EnumSet<FateInstanceType> typesFilter) {
      this.idsToNameMap = idsToNameMap;
 +    if (fateIdFilter != null) {
 +      fateIdFilter.forEach(f -> this.fateIdFilter.add(f.canonical()));
 +    }
      if (statusFilter != null) {
        statusFilter.forEach(f -> this.statusFilterNames.add(f.name()));
      }