From a2c3800c5ca5e78c3106ebb226ee59dd8d105cd6 Mon Sep 17 00:00:00 2001 From: chenzhiguo Date: Fri, 24 Jan 2025 16:36:14 +0800 Subject: [PATCH] Fix condition of retry missing error message --- .../invoke/ratelimit/tokenbucket/TokenBucketLimiter.java | 3 ++- .../agent/governance/policy/service/cluster/RetryPolicy.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/invoke/ratelimit/tokenbucket/TokenBucketLimiter.java b/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/invoke/ratelimit/tokenbucket/TokenBucketLimiter.java index 9c737002b..5ffbda9e8 100644 --- a/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/invoke/ratelimit/tokenbucket/TokenBucketLimiter.java +++ b/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/invoke/ratelimit/tokenbucket/TokenBucketLimiter.java @@ -193,7 +193,8 @@ protected double coolDownIntervalMicros() { /** * Refresh permits based on the current time. - * @param nowMicros the current time in microseconds + * + * @param nowMicros the current time in microseconds */ protected void refresh(long nowMicros) { if (nowMicros > nextPermitMicros) { diff --git a/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/policy/service/cluster/RetryPolicy.java b/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/policy/service/cluster/RetryPolicy.java index cf4fc5e83..424983b10 100644 --- a/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/policy/service/cluster/RetryPolicy.java +++ b/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/policy/service/cluster/RetryPolicy.java @@ -139,7 +139,8 @@ public long getDeadline(long startTime) { public boolean isEnabled() { return retry != null && retry > 0 && (errorCodes != null && !errorCodes.isEmpty() - || exceptions != null && !exceptions.isEmpty()); + || exceptions != null && !exceptions.isEmpty() + || errorMessages != null && !errorMessages.isEmpty()); } @Override