From 070abe6844c6919e619a91ea9aef6b0e1a34f909 Mon Sep 17 00:00:00 2001
From: NThakur4 <nthakur4@slb.com>
Date: Fri, 17 Sep 2021 13:46:25 -0500
Subject: [PATCH] update policy
---
.../indexer/azure/service/RetryPolicy.java | 36 ++++++++++---------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/service/RetryPolicy.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/service/RetryPolicy.java
index 0bbcb3905..40e0d8b2a 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/service/RetryPolicy.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/service/RetryPolicy.java
@@ -66,9 +66,9 @@ public class RetryPolicy {
* @return if there are elements in "notFound" returns true, else false
*/
public boolean batchRetryPolicy(HttpResponse response) {
- if (response == null || response.getBody().isEmpty()) {
- return false;
- }
+ if (retryOnEmptyResponse(response)) return false;
+
+ if (defaultResponseRetry(response)) return true;
JsonObject jsonObject = new JsonParser().parse(response.getBody()).getAsJsonObject();
JsonElement notFoundElement = (JsonArray) jsonObject.get(RECORD_NOT_FOUND);
@@ -78,17 +78,17 @@ public class RetryPolicy {
notFoundElement.getAsJsonArray().isJsonNull()) {
return false;
}
- log.info("Retry is set true");
+ log.info("Storage batch API retry");
return true;
}
public boolean schemaRetryPolicy(HttpResponse response) {
- if (response == null || response.getBody().isEmpty()) {
- return false;
- }
+ if (retryOnEmptyResponse(response)) return false;
+
+ if (defaultResponseRetry(response)) return true;
if (response.getResponseCode() == 404) {
- log.info("Retry is set true");
+ log.info("Schema API retry");
return true;
}
@@ -96,15 +96,19 @@ public class RetryPolicy {
}
public boolean defaultRetryPolicy(HttpResponse response) {
- if (response == null || response.getBody().isEmpty()) {
- return false;
- }
+ if (retryOnEmptyResponse(response)) return false;
- if (response.getResponseCode() > 501) {
- log.info("Retry is set true");
- return true;
- }
+ return defaultResponseRetry(response);
+ }
- return false;
+ private boolean retryOnEmptyResponse(HttpResponse response) {
+ return response == null || response.getBody().isEmpty();
+ }
+
+ private boolean defaultResponseRetry(HttpResponse response) {
+ if (response.getResponseCode() <= 501) return false;
+
+ log.info(String.format("Default retry, response code: %s", response.getResponseCode()));
+ return true;
}
}
--
GitLab