diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2024-05-21 17:09:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-21 17:09:25 +0200 |
commit | ec16b9b22481abf0959720fdec8a67c74bdce475 (patch) | |
tree | 7895e6fee91d4c3728feb664c7ee4b3387eb5138 /vespa-feed-client-api/src/main/java/ai | |
parent | 3d65e159d42ff317ca52107960c19af1a431afd1 (diff) | |
parent | 19d3c4448090576bc37f611794c5ee5799cde9f5 (diff) |
Merge pull request #31266 from vespa-engine/revert-31228-jonmv/feed-retry-grace-periodv8.345.20
Revert "Retry requests within retry count limit OR grace period (default 10s)" MERGEOK
Diffstat (limited to 'vespa-feed-client-api/src/main/java/ai')
-rw-r--r-- | vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedClient.java | 5 | ||||
-rw-r--r-- | vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedException.java | 5 |
2 files changed, 2 insertions, 8 deletions
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 7de7aae1350..d73d36e0f4e 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,7 +2,6 @@ package ai.vespa.feed.client; import java.io.Closeable; -import java.time.Duration; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -75,8 +74,8 @@ public interface FeedClient extends Closeable { /** Whether to retry operations of the given type. */ default boolean retry(OperationType type) { return true; } - /** Maximum number of retries per operation for assumed transient, non-backpressure problems. */ - default int retries() { return Integer.MAX_VALUE; } + /** Number of retries per operation for assumed transient, non-backpressure problems. */ + default int retries() { return 10; } } 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 dd1327f7ccf..74f906149b2 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,9 +44,4 @@ 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(); - } - } |