Middleware/redis-stream-springboot-starter
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cache): 击穿等待响应中断 + interval 兜底,消除空转与无限循环

Browse Source 
未抢到锁的自旋等待原以 waited += waitIntervalMs 推进:waitIntervalMs<=0 时永不
前进 → 无限循环 hang;且 sleep 吞中断后不退出,被中断时以 Redis 往返为节奏空转
到超时、不响应协作式取消。改为溢出安全的 deadline 截止判断 + Math.max(1,interval)
兜底,sleep 返回中断信号、被中断即 break 降级并保留中断标志。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
root
2026-06-26 09:51:42 +08:00
parent ba2606ea46
commit 0facafc745
2 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/java/com/njcn/middle/cache/template/RedisCacheEnhanceTemplateTest.java vendored
View File

@@ -24,12 +24,14 @@ import java.util.function.Supplier;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atMost;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -264,4 +266,32 @@ class RedisCacheEnhanceTemplateTest {
assertThrows(IllegalArgumentException.class,
() -> template.getOrLoad("user:1", User.class, 0, () -> new User(1L, "a")));
}
// ---- #3+#4: 击穿等待的中断响应与 interval 兜底 ----
@Test
void getOrLoadWaitIntervalZeroDoesNotSpinForever() {
props.getBreakdown().setWaitIntervalMs(0); // 误配 0:旧实现 waited 永不前进 → 无限循环
props.getBreakdown().setWaitTimeoutMs(50);
when(valueOps.get("cache:user:1")).thenReturn(null);
when(valueOps.setIfAbsent(anyString(), anyString(), any(Duration.class))).thenReturn(false);
User got = assertTimeoutPreemptively(Duration.ofSeconds(2), () ->
template.getOrLoad("user:1", User.class, 60, () -> new User(7L, "fb")));
assertEquals("fb", got.getName());
}
@Test
void getOrLoadInterruptedDuringWaitStopsSpinning() {
props.getBreakdown().setWaitIntervalMs(20);
props.getBreakdown().setWaitTimeoutMs(10000); // 大超时:旧实现中断后空转数百次到超时
when(valueOps.get("cache:user:1")).thenReturn(null);
when(valueOps.setIfAbsent(anyString(), anyString(), any(Duration.class))).thenReturn(false);
Thread.currentThread().interrupt(); // 当前线程预置中断,getOrLoad 同步执行可感知
User got = template.getOrLoad("user:1", User.class, 60, () -> new User(7L, "fb"));
boolean wasInterrupted = Thread.interrupted(); // 读取并清除,避免污染后续测试
assertEquals("fb", got.getName());
assertTrue(wasInterrupted, "中断标志应被保留(协作式取消)");
// 中断后立即停止等待:仅首次 tryGet 读一次,而非空转数百次
verify(valueOps, atMost(2)).get("cache:user:1");
}
}