Modify the field name of the retry policy

jd-opensource · May 7, 2024 · c60ed11 · c60ed11
1 parent 15019e3
commit c60ed11
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/joylive-bom/pom.xml b/joylive-bom/pom.xml
@@ -348,11 +348,6 @@
                                 </goals>
                             </execution>
                         </executions>
-                        <configuration>
-                            <excludes>
-                                <exclude>com/jdcloud/**</exclude>
-                            </excludes>
-                        </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -423,12 +418,12 @@
             </build>
             <distributionManagement>
                 <snapshotRepository>
-                    <id>jdcloud</id>
+                    <id>jd</id>
                     <name>OSS Snapshots Repository</name>
                     <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
                 </snapshotRepository>
                 <repository>
-                    <id>jdcloud</id>
+                    <id>jd</id>
                     <name>OSS Staging Repository</name>
                     <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
                 </repository>

diff --git a/...ance-api/src/main/java/com/jd/live/agent/governance/policy/service/retry/RetryPolicy.java b/...ance-api/src/main/java/com/jd/live/agent/governance/policy/service/retry/RetryPolicy.java
@@ -61,11 +61,9 @@ public class RetryPolicy extends PolicyId implements PolicyInheritWithId<RetryPo
     private Integer retry;
 
     /**
-     * The timeout in milliseconds for each retry attempt. This parameter specifies how long the system should
-     * wait for an operation to complete before timing out and potentially retrying the operation, according
-     * to the retry policy.
+     * Retry waiting interval, in milliseconds.
      */
-    private Integer timeoutInMilliseconds;
+    private Integer waitTimeInMilliseconds;
 
     /**
      * Collection of retry status codes. This parameter specifies which status codes should be considered retryable.
@@ -93,8 +91,8 @@ public void supplement(RetryPolicy source) {
         if (retry == null) {
             retry = source.retry;
         }
-        if (timeoutInMilliseconds == null) {
-            timeoutInMilliseconds = source.timeoutInMilliseconds;
+        if (waitTimeInMilliseconds == null) {
+            waitTimeInMilliseconds = source.waitTimeInMilliseconds;
         }
         if ((retryableStatusCodes == null || retryableStatusCodes.isEmpty()) && source.retryableStatusCodes != null) {
             retryableStatusCodes = source.retryableStatusCodes;

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
@@ -40,7 +40,7 @@ public Resilience4jRetrier(RetryPolicy policy) {
         this.policy = policy;
         RetryConfig config = RetryConfig.custom()
                 .maxAttempts(policy.getRetry())
-                .waitDuration(Duration.ofMillis(policy.getTimeoutInMilliseconds()))
+                .waitDuration(Duration.ofMillis(policy.getWaitTimeInMilliseconds()))
                 .retryOnResult(response -> {
                     if (policy.getRetryableStatusCodes() != null) {
                         return policy.getRetryableStatusCodes().contains(((Response) response).getCode());

diff --git a/pom.xml b/pom.xml
@@ -277,12 +277,12 @@
             </build>
             <distributionManagement>
                 <snapshotRepository>
-                    <id>jdcloud</id>
+                    <id>jd</id>
                     <name>OSS Snapshots Repository</name>
                     <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
                 </snapshotRepository>
                 <repository>
-                    <id>jdcloud</id>
+                    <id>jd</id>
                     <name>OSS Staging Repository</name>
                     <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
                 </repository>