This is an automated email from the ASF dual-hosted git repository.
dlmarion 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 86c81e42d2 Removed duplicate call to
Ample.deleteScanServerFileReferences in ScanServer (#4512)
86c81e42d2 is described below
commit 86c81e42d2bb8ee7ba45f977a2757adf706c327d
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Tue May 7 16:26:06 2024 -0400
Removed duplicate call to Ample.deleteScanServerFileReferences in
ScanServer (#4512)
Closes #4508
---
.../main/java/org/apache/accumulo/tserver/ScanServer.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index dabcc617d1..432d7c5ea4 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@ -519,6 +519,10 @@ public class ScanServer extends AbstractServer
extents);
Map<KeyExtent,TabletMetadata> tabletsMetadata = getTabletMetadata(extents);
+ if (!(tabletsMetadata instanceof HashMap)) {
+ // the map returned by getTabletMetadata may not be mutable
+ tabletsMetadata = new HashMap<>(tabletsMetadata);
+ }
for (KeyExtent extent : extents) {
var tabletMetadata = tabletsMetadata.get(extent);
@@ -531,10 +535,6 @@ public class ScanServer extends AbstractServer
LOG.info("RFFS {} extent unable to load {} as AssignmentHandler
returned false",
myReservationId, extent);
failures.add(extent);
- if (!(tabletsMetadata instanceof HashMap)) {
- // the map returned by getTabletMetadata may not be mutable
- tabletsMetadata = new HashMap<>(tabletsMetadata);
- }
tabletsMetadata.remove(extent);
}
}
@@ -618,14 +618,9 @@ public class ScanServer extends AbstractServer
for (KeyExtent extent : tabletsToCheck) {
TabletMetadata metadataAfter = tabletsToCheckMetadata.get(extent);
if (metadataAfter == null) {
- getContext().getAmple().deleteScanServerFileReferences(refs);
LOG.info("RFFS {} extent unable to load {} as metadata no longer
referencing files",
myReservationId, extent);
failures.add(extent);
- if (!(tabletsMetadata instanceof HashMap)) {
- // the map returned by getTabletMetadata may not be mutable
- tabletsMetadata = new HashMap<>(tabletsMetadata);
- }
tabletsMetadata.remove(extent);
} else {
// remove files that are still referenced
