Skip to content

Update scan server metrics for file reservations #4522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EdColeman merged 1 commit into from
May 3, 2024
Merged

Update scan server metrics for file reservations #4522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,8 @@ protected ScanReservation reserveFiles(Map<KeyExtent,List<TRange>> extents)
return new ScanReservation(tabletsMetadata, myReservationId, failures);
}

private ScanReservation reserveFilesInstrumented(long scanId) throws NoSuchScanIDException {
@VisibleForTesting
ScanReservation reserveFilesInstrumented(long scanId) throws NoSuchScanIDException {
long start = System.nanoTime();
try {
return reserveFiles(scanId);
Expand Down Expand Up @@ -934,7 +935,7 @@ public ScanResult continueScan(TInfo tinfo, long scanID, long busyTimeout)
TSampleNotPresentException, TException {
LOG.trace("continue scan: {}", scanID);

try (ScanReservation reservation = reserveFiles(scanID)) {
try (ScanReservation reservation = reserveFilesInstrumented(scanID)) {
Preconditions.checkState(reservation.getFailures().isEmpty());
return delegate.continueScan(tinfo, scanID, busyTimeout);
} catch (ScanServerBusyException be) {
Expand Down Expand Up @@ -1002,7 +1003,7 @@ public MultiScanResult continueMultiScan(TInfo tinfo, long scanID, long busyTime
throws NoSuchScanIDException, TSampleNotPresentException, TException {
LOG.trace("continue multi scan: {}", scanID);

try (ScanReservation reservation = reserveFiles(scanID)) {
try (ScanReservation reservation = reserveFilesInstrumented(scanID)) {
Preconditions.checkState(reservation.getFailures().isEmpty());
return delegate.continueMultiScan(tinfo, scanID, busyTimeout);
} catch (ScanServerBusyException be) {
Expand Down
5 changes: 5 additions & 0 deletions server/tserver/src/test/java/org/apache/accumulo/tserver/ScanServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ protected ScanReservation reserveFiles(long scanId) throws NoSuchScanIDException
ScanReservation reserveFilesInstrumented(Map<KeyExtent,List<TRange>> extents) {
return reservation;
}

@Override
ScanReservation reserveFilesInstrumented(long scanId) {
return reservation;
}
}

private ThriftScanClientHandler handler;
Expand Down