(accumulo) branch main updated: TODO Cleanup (#6509)

[domgarguilo]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new db4686ac8c TODO Cleanup (#6509)
db4686ac8c is described below

commit db4686ac8cc7bacfba98464cb797902181cc2034
Author: Amanda Villarreal <48224036+amem...@users.noreply.github.com>
AuthorDate: Wed Sep 23 15:51:18 2026 -0500

    TODO Cleanup (#6509)
    
    * Obscure keyExtents in outstanding migrations output to remove TODO
    
    * Remove potentially irrelevant TODO over inconsistent exception
    
    * Remove resolved TODO from Value.java
    
    * Add Table to the obscured Key Extent output
    
    ---------
    
    Co-authored-by: Dom G. <domgargu...@apache.org>
---
 .../org/apache/accumulo/core/clientImpl/ClientContext.java    |  5 -----
 .../core/clientImpl/TabletServerBatchReaderIterator.java      |  1 -
 core/src/main/java/org/apache/accumulo/core/data/Value.java   |  1 -
 .../spi/balancer/util/ThrottledBalancerProblemReporter.java   | 11 +++++------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index cb8f9e5ec3..64af0dbfce 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -334,11 +334,6 @@ public class ClientContext implements AccumuloClient {
     });
 
     zkLockChecker = memoize(() -> {
-      // make this use its own ZooSession and ZooCache, because this is used 
by the
-      // tablet location cache, which is a static singleton reused by multiple 
clients
-      // so, it can't rely on being able to continue to use the same client's 
ZooCache,
-      // because that client could be closed, and its ZooSession also closed
-      // this needs to be fixed; TODO 
https://github.com/apache/accumulo/issues/2301
       var zk = 
info.getZooKeeperSupplier(ZookeeperLockChecker.class.getSimpleName(),
           ZooUtil.getRoot(getInstanceID())).get();
       return new ZookeeperLockChecker(new ZooCache(zk, 
Set.of(Constants.ZTSERVERS)));
diff --git 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
index 0918e71a7d..27c18723d3 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
@@ -307,7 +307,6 @@ public final class TabletServerBatchReaderIterator 
implements Iterator<Entry<Key
         }
 
         if (retryCountDownTimer.isExpired()) {
-          // TODO exception used for timeout is inconsistent
           throw new TimedOutException(
               "Failed to find servers to process scans before timeout was 
exceeded.");
         }
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Value.java 
b/core/src/main/java/org/apache/accumulo/core/data/Value.java
index 8c63967126..aba8db2242 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Value.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Value.java
@@ -92,7 +92,6 @@ public class Value implements WritableComparable<Object> {
    * @param bytes May not be null
    */
   public Value(ByteBuffer bytes) {
-    /* TODO ACCUMULO-2509 right now this uses the entire backing array, which 
must be accessible. */
     this(toBytes(bytes), false);
   }
 
diff --git 
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/util/ThrottledBalancerProblemReporter.java
 
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/util/ThrottledBalancerProblemReporter.java
index 41dd35f52c..5198ea6bbb 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/util/ThrottledBalancerProblemReporter.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/util/ThrottledBalancerProblemReporter.java
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import org.apache.accumulo.core.data.TabletId;
+import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,13 +78,11 @@ public class ThrottledBalancerProblemReporter {
       @Override
       public void report() {
         log.warn("Not balancing due to {} outstanding migrations.", 
migrations.size());
-        /*
-         * TODO ACCUMULO-2938 redact key extents in this output to avoid 
leaking protected
-         * information.
-         */
         if (log.isDebugEnabled()) {
-          log.debug("Sample up to 10 outstanding migrations: {}",
-              
migrations.stream().limit(10).map(String::valueOf).collect(Collectors.joining(",
 ")));
+          // convert each tabletId in migrations to keyExtent for redacting
+          log.debug("Sample up to 10 outstanding migrations: {}", 
migrations.stream().limit(10).map(
+              tabletId -> tabletId.getTable() + ";" + 
KeyExtent.fromTabletId(tabletId).obscured())
+              .collect(Collectors.joining(", ")));
         }
         // Now that we've reported, clear out the migrations list so we don't 
hold it in memory.
         migrations = Collections.emptySet();