mirror of
https://github.com/google/nomulus.git
synced 2025-05-13 16:07:15 +02:00
Remove the reduntant 'afterFinalFailure' from Retrier
'afterFinalFailure' is called just before rethrowing a non-retrying error from the retrier. This can happen either because the exception shouldn't be retried, or because we exceeded the maximum number of retries. The same thing can be done by catching that thrown error outside of the retrier: retrier.callWithRetry( callable, new FailureReporter() { @Override void afterFinalFailure(Throwable thrown, int failures) { // do something with thrown } }, RetriableException.class); is (almost) the same as: try { retrier.callWithRetry(callable, RetriableException.class); } catch (Throwable thrown) { // do something with thrown throw thrown; } ("almost" because the retrier might wrap the Throwable in a RuntimeException, so you might need to getCause or getRootCause. Also - there is the "beforeRetry" I ignored for the example) Removing "afterFinalFailure" also makes the FailureReporter in line with Java 8 functional interface - meaning we can more easily create it when we do need to override "beforeRetry". ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=189972101
This commit is contained in:
parent
63785e5149
commit
552940a816
6 changed files with 135 additions and 177 deletions
|
@ -138,19 +138,9 @@ class CommitLogManifestReader extends InputReader<Key<CommitLogManifest>> {
|
|||
try {
|
||||
return retrier.callWithRetry(
|
||||
() -> queryIterator.next(),
|
||||
new Retrier.FailureReporter() {
|
||||
@Override
|
||||
public void beforeRetry(Throwable thrown, int failures, int maxAttempts) {
|
||||
checkNotNull(currentCursor, "Can't retry because cursor is null. Giving up.");
|
||||
queryIterator = query().startAt(currentCursor).keys().iterator();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterFinalFailure(Throwable thrown, int failures) {
|
||||
logger.severefmt(
|
||||
"Max retry attempts reached trying to read item %d/%d. Giving up.",
|
||||
loaded, total);
|
||||
}
|
||||
(thrown, failures, maxAttempts) -> {
|
||||
checkNotNull(currentCursor, "Can't retry because cursor is null. Giving up.");
|
||||
queryIterator = query().startAt(currentCursor).keys().iterator();
|
||||
},
|
||||
DatastoreTimeoutException.class);
|
||||
} finally {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue