(accumulo) branch 2.1 updated: removes overlapping from cache in OfflineTabletLocatorImpl (#6170)

[kturner]

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

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


The following commit(s) were added to refs/heads/2.1 by this push:
     new 28ac16d44a removes overlapping from cache in OfflineTabletLocatorImpl 
(#6170)
28ac16d44a is described below

commit 28ac16d44a0ac840152669040a048b5cabd5cd3f
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Wed Mar 4 11:19:32 2026 -0800

    removes overlapping from cache in OfflineTabletLocatorImpl (#6170)
---
 .../apache/accumulo/core/clientImpl/OfflineTabletLocatorImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineTabletLocatorImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineTabletLocatorImpl.java
index de7b592d26..5c0749ee1b 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineTabletLocatorImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineTabletLocatorImpl.java
@@ -214,10 +214,15 @@ public class OfflineTabletLocatorImpl extends 
TabletLocator {
           for (int i = 0; i < prefetch && iter.hasNext(); i++) {
             TabletMetadata t = iter.next();
             KeyExtent ke = t.getExtent();
+            // Its possible that ke could already exist in extents and the 
following would remove
+            // it, should be ok as this runs before adding ke.
+            for (KeyExtent overlapping : KeyExtent.findOverlapping(ke, 
extents)) {
+              cache.invalidate(overlapping);
+              extents.remove(overlapping);
+            }
             LOG.trace("Caching extent: {}", ke);
             cache.put(ke, ke);
             cacheCount.incrementAndGet();
-            TabletLocatorImpl.removeOverlapping(extents, ke);
             extents.add(ke);
             added++;
           }