Review retry

jd-opensource · May 7, 2024 · ba09f9e · ba09f9e
1 parent 8e7e27d
commit ba09f9e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/...ylive-governance-api/src/main/java/com/jd/live/agent/governance/invoke/retry/Retrier.java b/...ylive-governance-api/src/main/java/com/jd/live/agent/governance/invoke/retry/Retrier.java
@@ -33,7 +33,10 @@ public interface Retrier {
      * @param response Response
      * @return true: retry, false: no need to retry
      */
-    boolean isRetryable(Response response);
+    default boolean isRetryable(Response response) {
+        RetryPolicy policy = getPolicy();
+        return policy != null && (policy.isRetry(response.getCode()) || policy.isRetry(response.getThrowable()));
+    }
 
     /**
      * Execute retry logic

diff --git a/...overnance-api/src/main/java/com/jd/live/agent/governance/invoke/retry/RetrierFactory.java b/...overnance-api/src/main/java/com/jd/live/agent/governance/invoke/retry/RetrierFactory.java
@@ -38,20 +38,20 @@ default Retrier get(RetryPolicy policy) {
         }
         AtomicReference<Retrier> reference = RETRIERS.computeIfAbsent(policy.getId(), n -> new AtomicReference<>());
         Retrier retrier = reference.get();
-        if (retrier != null && retrier.getPolicy().getVersion() >= policy.getVersion()) {
+        long version = retrier == null ? Long.MIN_VALUE : retrier.getPolicy().getVersion();
+        if (version >= policy.getVersion()) {
             return retrier;
         }
-        Retrier newLimiter = create(policy);
+        Retrier newRetrier = create(policy);
         while (true) {
             retrier = reference.get();
-            if (retrier == null || retrier.getPolicy().getVersion() < policy.getVersion()) {
-                if (reference.compareAndSet(retrier, newLimiter)) {
-                    retrier = newLimiter;
-                    break;
-                }
+            version = retrier == null ? Long.MIN_VALUE : retrier.getPolicy().getVersion();
+            if (version >= policy.getVersion()) {
+                return retrier;
+            } else if (reference.compareAndSet(retrier, newRetrier)) {
+                return newRetrier;
             }
         }
-        return retrier;
     }
 
     /**

diff --git a/.../java/com/jd/live/agent/implement/flowcontrol/resilience4j/retry/Resilience4jRetrier.java b/.../java/com/jd/live/agent/implement/flowcontrol/resilience4j/retry/Resilience4jRetrier.java
@@ -49,14 +49,6 @@ public Resilience4jRetrier(RetryPolicy policy) {
         retry = registry.retry(policy.getId().toString());
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isRetryable(Response response) {
-        return policy.isRetry(response.getCode()) || policy.isRetry(response.getThrowable());
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/...ing/src/main/java/com/jd/live/agent/implement/flowcontrol/spring/retry/SpringRetrier.java b/...ing/src/main/java/com/jd/live/agent/implement/flowcontrol/spring/retry/SpringRetrier.java
@@ -45,14 +45,6 @@ public SpringRetrier(RetryPolicy policy) {
         retryTemplate.setBackOffPolicy(fixedBackOffPolicy);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isRetryable(Response response) {
-        return policy.isRetry(response.getCode()) || policy.isRetry(response.getThrowable());
-    }
-
     /**
      * {@inheritDoc}
      */