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

[kturner]

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

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

commit bfae79df5cb7e5744f23bbaccb6ef7e4d35ac018
Merge: a83f29ea1e 7d51553dfb
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Fri Feb 7 16:45:47 2025 +0000

    Merge branch '2.1' into 3.1

 .../core/clientImpl/TabletLocatorImpl.java         | 37 +++++++++++++++-------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocatorImpl.java
index 6e6ccbb023,d46f7c9ef4..a4478858e6
--- 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocatorImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocatorImpl.java
@@@ -747,6 -739,26 +740,26 @@@ public class TabletLocatorImpl extends 
          removeOverlapping(metaCache, be);
        }
  
+       if (!badServers.isEmpty()) {
+         int removedCount = 0;
+         var locationIterator = metaCache.values().iterator();
+         while (locationIterator.hasNext()) {
+           TabletLocation cacheEntry = locationIterator.next();
 -          if (badServers.contains(cacheEntry.tablet_location)) {
++          if (badServers.contains(cacheEntry.getTserverLocation())) {
+             locationIterator.remove();
 -            lookups.add(cacheEntry.tablet_extent.toMetaRange());
++            lookups.add(cacheEntry.getExtent().toMetaRange());
+             removedCount++;
+           }
+         }
+ 
+         if (log.isTraceEnabled()) {
+           log.trace("Invalidated {} cache entries for table {} related to 
servers {}", removedCount,
+               tableId, badServers);
+         }
+ 
+         badServers.clear();
+       }
+ 
        lookups = Range.mergeOverlapping(lookups);
  
        Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();