From 504d9833defb7cd64f93ef4bf9f4d603f7e8c4dc Mon Sep 17 00:00:00 2001 From: Eugene Kirpichov Date: Tue, 30 May 2017 14:16:22 -0700 Subject: [PATCH] Rephrases messages on RetryHttpRequestInitializer "will NOT retry" messages are confusing some customers into thinking that an entire high-level operation inside a Beam job, involving this request as an implementation detail, will not be retried (e.g. a BigQuery import etc.) In reality there's many levels of retries and RetryHttpRequestInitializer can not be aware of them. Retrying at a higher level may or may not happen, and it's up to higher-level components to log that (they usually do). --- .../beam/sdk/util/RetryHttpRequestInitializer.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/util/RetryHttpRequestInitializer.java b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/util/RetryHttpRequestInitializer.java index 2b7135e94cd9..e5b48d39664f 100644 --- a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/util/RetryHttpRequestInitializer.java +++ b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/util/RetryHttpRequestInitializer.java @@ -73,7 +73,9 @@ public boolean handleIOException(HttpRequest request, boolean supportsRetry) if (willRetry) { LOG.debug("Request failed with IOException, will retry: {}", request.getUrl()); } else { - LOG.warn("Request failed with IOException, will NOT retry: {}", request.getUrl()); + LOG.warn( + "Request failed with IOException (caller responsible for retrying): {}", + request.getUrl()); } return willRetry; } @@ -105,12 +107,14 @@ public boolean handleResponse(HttpRequest request, HttpResponse response, boolean supportsRetry) throws IOException { boolean retry = handler.handleResponse(request, response, supportsRetry); if (retry) { - LOG.debug("Request failed with code {} will retry: {}", + LOG.debug("Request failed with code {}, will retry: {}", response.getStatusCode(), request.getUrl()); } else if (!ignoredResponseCodes.contains(response.getStatusCode())) { - LOG.warn("Request failed with code {}, will NOT retry: {}", - response.getStatusCode(), request.getUrl()); + LOG.warn( + "Request failed with code {} (caller responsible for retrying): {}", + response.getStatusCode(), + request.getUrl()); } return retry;