gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

fix(1.5.0-beta1): 修复重试传播机制重试次数错误问题

Browse Source
This commit is contained in:
opensnail 2025-04-18 22:43:20 +08:00
parent 53530517f4
commit 310d9bc580
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/RetrySiteSnapshot.java
View File

@ -8,9 +8,7 @@ import com.aizuda.snailjob.common.core.model.SnailJobHeaders;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Deque;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.LinkedBlockingDeque;
/**
@ -21,6 +19,10 @@ import java.util.concurrent.LinkedBlockingDeque;
*/
public class RetrySiteSnapshot {
private static final String RETRY_STAGE_KEY = "RETRY_STAGE";
private static final String RETRY_CLASS_METHOD_ENTRANCE_KEY = "RETRY_CLASS_METHOD_ENTRANCE";
private static final String RETRY_STATUS_KEY = "RETRY_STATUS";
/**
* 重试阶段，1-内存重试阶段，2-服务端重试阶段
*/
@ -46,11 +48,33 @@ public class RetrySiteSnapshot {
*/
private static final RetrySiteSnapshotContext<String> RETRY_STATUS_CODE = SnailRetrySpiLoader.loadRetrySiteSnapshotContext();
/**
* 挂起重试的内存状态
*/
private static final RetrySiteSnapshotContext<Map<String, Object>> SUSPEND = SnailRetrySpiLoader.loadRetrySiteSnapshotContext();
/**
* 进入方法入口时间标记
*/
private static final RetrySiteSnapshotContext<Long> ENTRY_METHOD_TIME = SnailRetrySpiLoader.loadRetrySiteSnapshotContext();
public static void suspend() {
SUSPEND.set(new HashMap<>(){{
put(RETRY_STAGE_KEY, RETRY_STAGE.get());
put(RETRY_STATUS_KEY, RETRY_STATUS.get());
put(RETRY_CLASS_METHOD_ENTRANCE_KEY, RETRY_CLASS_METHOD_ENTRANCE.get());
}});
}
public static void restore() {
Optional.ofNullable(SUSPEND.get()).ifPresent(map -> {
RETRY_STAGE.set((Integer) map.get(RETRY_STAGE_KEY));
RETRY_STATUS.set((Integer) map.get(RETRY_STATUS_KEY));
RETRY_CLASS_METHOD_ENTRANCE.set((Deque<MethodEntranceMeta>) map.get(RETRY_CLASS_METHOD_ENTRANCE_KEY));
SUSPEND.remove();
});
}
public static Integer getStage() {
return RETRY_STAGE.get();
}

15
snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/SnailRetryInterceptor.java
View File

@ -74,7 +74,18 @@ public class SnailRetryInterceptor implements MethodInterceptor, AfterAdvice, Se
String methodEntrance = getMethodEntrance(retryable, executorClassName);
if (Propagation.REQUIRES_NEW.equals(retryable.propagation())) {
// 如果已经是入口了就不需要继续添加入口了
if (!RetrySiteSnapshot.isMethodEntrance(methodEntrance)) {
// 这里需要挂起外部重试的内存的信息
if (RetrySiteSnapshot.isRunning()
&& RetrySiteSnapshot.getStage() == RetrySiteSnapshot.EnumStage.LOCAL.getStage()) {
RetrySiteSnapshot.suspend();
// 清除线程信息
RetrySiteSnapshot.removeAll();
}
// 设置新的内容信息
RetrySiteSnapshot.setMethodEntrance(methodEntrance);
}
} else if (!RetrySiteSnapshot.existedMethodEntrance()) {
RetrySiteSnapshot.setMethodEntrance(methodEntrance);
} else {
@ -195,7 +206,11 @@ public class SnailRetryInterceptor implements MethodInterceptor, AfterAdvice, Se
sendMessage(e);
} finally {
// 清除当前重试的信息
RetrySiteSnapshot.removeAll();
// 还原挂起的信息
RetrySiteSnapshot.restore();
}
return null;