diff options
| author | jonmv <venstad@gmail.com> | 2024-05-21 17:39:18 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2024-05-21 17:39:18 +0200 |
| commit | f2806fadebd722399eae46dfd0f94ee7e722ccf4 (patch) | |
| tree | f489d0f853146bb67ce28e7f4d90716c66fd75b4 /vespa-feed-client-api | |
| parent | ec16b9b22481abf0959720fdec8a67c74bdce475 (diff) | |
Revert "Merge pull request #31266 from vespa-engine/revert-31228-jonmv/feed-retry-grace-period"
This reverts commit ec16b9b22481abf0959720fdec8a67c74bdce475, reversing
changes made to 3d65e159d42ff317ca52107960c19af1a431afd1.
Diffstat (limited to 'vespa-feed-client-api')
3 files changed, 10 insertions, 3 deletions
diff --git a/vespa-feed-client-api/abi-spec.json b/vespa-feed-client-api/abi-spec.json index 9065edad92a..7ac4a7619ed 100644 --- a/vespa-feed-client-api/abi-spec.json +++ b/vespa-feed-client-api/abi-spec.json @@ -186,7 +186,8 @@ "public void <init>(java.lang.Throwable)", "public void <init>(ai.vespa.feed.client.DocumentId, java.lang.Throwable)", "public void <init>(ai.vespa.feed.client.DocumentId, java.lang.String, java.lang.Throwable)", - "public java.util.Optional documentId()" + "public java.util.Optional documentId()", + "public java.lang.String getMessage()" ], "fields" : [ ] }, diff --git a/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedClient.java b/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedClient.java index d73d36e0f4e..7de7aae1350 100644 --- a/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedClient.java +++ b/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedClient.java @@ -2,6 +2,7 @@ package ai.vespa.feed.client; import java.io.Closeable; +import java.time.Duration; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -74,8 +75,8 @@ public interface FeedClient extends Closeable { /** Whether to retry operations of the given type. */ default boolean retry(OperationType type) { return true; } - /** Number of retries per operation for assumed transient, non-backpressure problems. */ - default int retries() { return 10; } + /** Maximum number of retries per operation for assumed transient, non-backpressure problems. */ + default int retries() { return Integer.MAX_VALUE; } } diff --git a/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedException.java b/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedException.java index 74f906149b2..dd1327f7ccf 100644 --- a/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedException.java +++ b/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedException.java @@ -44,4 +44,9 @@ public class FeedException extends RuntimeException { public Optional<DocumentId> documentId() { return Optional.ofNullable(documentId); } + @Override + public String getMessage() { + return documentId != null ? "(" + documentId + ") " + super.getMessage() : super.getMessage(); + } + } |