dlmarion commented on code in PR #3150:
URL: https://github.com/apache/accumulo/pull/3150#discussion_r1064592161
##########
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java:
##########
@@ -592,11 +602,12 @@ private Map<KeyExtent,TabletMetadata>
reserveFilesInner(Collection<KeyExtent> ex
getContext().getAmple().deleteScanServerFileReferences(refs);
LOG.info("RFFS {} extent unable to load {} as metadata no longer
referencing files",
myReservationId, extent);
- throw new NotServingTabletException(extent.toThrift());
+ failures.add(extent);
Review Comment:
Addressed in 381dac3
##########
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java:
##########
@@ -633,17 +644,24 @@ private Map<KeyExtent,TabletMetadata>
reserveFilesInner(Collection<KeyExtent> ex
}
}
- protected ScanReservation reserveFiles(Collection<KeyExtent> extents)
- throws NotServingTabletException, AccumuloException {
+ protected ScanReservation reserveFiles(Map<KeyExtent,List<TRange>> extents)
+ throws AccumuloException {
long myReservationId = nextScanReservationId.incrementAndGet();
- Map<KeyExtent,TabletMetadata> tabletsMetadata = reserveFilesInner(extents,
myReservationId);
+ Set<KeyExtent> failedReservations = new HashSet<>();
+ Map<KeyExtent,TabletMetadata> tabletsMetadata =
+ reserveFilesInner(extents.keySet(), myReservationId,
failedReservations);
while (tabletsMetadata == null) {
- tabletsMetadata = reserveFilesInner(extents, myReservationId);
+ tabletsMetadata = reserveFilesInner(extents.keySet(), myReservationId,
failedReservations);
Review Comment:
Addressed in 381dac3
##########
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java:
##########
@@ -633,17 +644,24 @@ private Map<KeyExtent,TabletMetadata>
reserveFilesInner(Collection<KeyExtent> ex
}
}
- protected ScanReservation reserveFiles(Collection<KeyExtent> extents)
- throws NotServingTabletException, AccumuloException {
+ protected ScanReservation reserveFiles(Map<KeyExtent,List<TRange>> extents)
+ throws AccumuloException {
long myReservationId = nextScanReservationId.incrementAndGet();
- Map<KeyExtent,TabletMetadata> tabletsMetadata = reserveFilesInner(extents,
myReservationId);
+ Set<KeyExtent> failedReservations = new HashSet<>();
+ Map<KeyExtent,TabletMetadata> tabletsMetadata =
+ reserveFilesInner(extents.keySet(), myReservationId,
failedReservations);
while (tabletsMetadata == null) {
- tabletsMetadata = reserveFilesInner(extents, myReservationId);
+ tabletsMetadata = reserveFilesInner(extents.keySet(), myReservationId,
failedReservations);
}
+ // Convert failures
Review Comment:
Addressed in 381dac3
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
