在持锁补读数:heldMs 此前只在放手那一刻打,锁还压着多久读不到
第 3/4 步(拆锁、缩合批)要立论,必须知道"此刻这把锁已经压了多久",而 [task-lock-held] 只在 LockHandle.close() 打——正在持有的那一段是盲区(货源 40902×24h RUNNING 就是这么看不见的)。 - ActiveTaskLockRegistry:登记表跟着取锁/放锁动;单独标 renewalLost——续期连续失败的锁最迟在 TTL 后就该被另一实例拿走,本节点却还在按"仍持锁"跑,挂着多久不等于还被保护。 - 看门狗 task-lock-watch 每 60 秒扫一轮,留痕走阶梯(首个 60 秒、之后每 5 分钟), 一次 30 分钟持锁总共 6 行而不是 30 行——与 10-06 通知放大同一口径。 - 15 例(9 节奏 + 6 接线),变异自证 M1 丢 unregister/M2 阶梯归零/M3 丢 register 三轮全 KILLED; 后端全量 4320/0 红/跳过 7。
This commit is contained in:
+114
@@ -0,0 +1,114 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* 「正在持有」读数的判据(10-14 补的埋点)。
|
||||
*
|
||||
* 要钉住的是原来读不到的那一维:锁**还没放**的时候它已经压了多久,以及那把锁的续期是否已经失败
|
||||
* (后者意味着锁最迟在 TTL 后就该被另一实例拿走,本节点却还在按"仍持锁"跑)。
|
||||
* 顺带钉住留痕节奏:阶梯不成立就会把一次长持锁灌成每分钟一行,与 10-06 通知放大同族。
|
||||
*/
|
||||
class ActiveTaskLockRegistryTest {
|
||||
|
||||
private static final long T0 = 1_700_000_000_000L;
|
||||
private static final long TTL = Duration.ofMinutes(5).toMillis();
|
||||
|
||||
private static ActiveTaskLockRegistry registered() {
|
||||
ActiveTaskLockRegistry registry = new ActiveTaskLockRegistry();
|
||||
registry.register("similar-asin:30853", T0, TTL);
|
||||
return registry;
|
||||
}
|
||||
|
||||
@Test
|
||||
void ladderIsPinnedAtOneMinuteThenFiveMinutes() {
|
||||
assertEquals(60_000L, ActiveTaskLockRegistry.FIRST_REPORT_MILLIS);
|
||||
assertEquals(300_000L, ActiveTaskLockRegistry.REPEAT_REPORT_MILLIS);
|
||||
}
|
||||
|
||||
@Test
|
||||
void holdUnderOneMinuteStaysSilent() {
|
||||
ActiveTaskLockRegistry registry = registered();
|
||||
assertFalse(registry.shouldReport("similar-asin:30853", T0 + 59_999L),
|
||||
"60 秒以内的持锁是常态,读数不该在这一档说话");
|
||||
assertFalse(registry.shouldReport("别的锁", T0 + 999_999L), "没登记过的名字恒不报");
|
||||
}
|
||||
|
||||
@Test
|
||||
void firstReportHappensOnceAtTheMinuteMarkThenWaits() {
|
||||
ActiveTaskLockRegistry registry = registered();
|
||||
assertTrue(registry.shouldReport("similar-asin:30853", T0 + 60_000L));
|
||||
assertFalse(registry.shouldReport("similar-asin:30853", T0 + 60_001L), "同一轮不许复报");
|
||||
assertFalse(registry.shouldReport("similar-asin:30853", T0 + 359_999L));
|
||||
assertTrue(registry.shouldReport("similar-asin:30853", T0 + 360_000L), "满 5 分钟再报一次");
|
||||
}
|
||||
|
||||
@Test
|
||||
void releasedLockLeavesTheReading() {
|
||||
ActiveTaskLockRegistry registry = registered();
|
||||
registry.unregister("similar-asin:30853");
|
||||
assertEquals(0, registry.size());
|
||||
assertFalse(registry.shouldReport("similar-asin:30853", T0 + 900_000L),
|
||||
"已经放手的锁不能还在'在持'里计数");
|
||||
assertTrue(registry.snapshot().isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void renewalLostIsReadableWhileTheHoldKeepsGrowing() {
|
||||
ActiveTaskLockRegistry registry = registered();
|
||||
registry.markRenewalLost("similar-asin:30853");
|
||||
Map<String, ActiveTaskLockRegistry.ActiveLock> snap = registry.snapshot();
|
||||
ActiveTaskLockRegistry.ActiveLock lock = snap.get("similar-asin:30853");
|
||||
assertTrue(lock.isRenewalLost(), "续期失败必须能从读数里读出来");
|
||||
assertEquals(T0 + 900_000L - T0, lock.heldMillis(T0 + 900_000L),
|
||||
"锁丢失不等于时间停住——它还在被本节点按'仍持有'用着");
|
||||
assertTrue(lock.ttlExpired(T0 + 900_000L));
|
||||
}
|
||||
|
||||
@Test
|
||||
void ttlNeedsStrictlyMoreThanTheTtlToCountAsExpired() {
|
||||
ActiveTaskLockRegistry registry = registered();
|
||||
assertFalse(registry.snapshot().get("similar-asin:30853").ttlExpired(T0 + TTL),
|
||||
"刚好等于 TTL 还在续期窗口内");
|
||||
assertTrue(registry.snapshot().get("similar-asin:30853").ttlExpired(T0 + TTL + 1L));
|
||||
}
|
||||
|
||||
@Test
|
||||
void reRegistrationResetsTheClock() {
|
||||
ActiveTaskLockRegistry registry = registered();
|
||||
// 上一任没走到 unregister 就崩了:新持有者刚拿到锁,读数不能显示"已经压了很久"
|
||||
registry.register("similar-asin:30853", T0 + 86_400_000L, TTL);
|
||||
ActiveTaskLockRegistry.ActiveLock lock = registry.snapshot().get("similar-asin:30853");
|
||||
assertEquals(0L, lock.heldMillis(T0 + 86_400_000L));
|
||||
assertFalse(registry.shouldReport("similar-asin:30853", T0 + 86_400_000L + 30_000L));
|
||||
}
|
||||
|
||||
@Test
|
||||
void thirtyMinuteHoldProducesSixLinesNotThirty() {
|
||||
ActiveTaskLockRegistry registry = registered();
|
||||
int reports = 0;
|
||||
for (long elapsed = 0L; elapsed <= 1_800_000L; elapsed += 60_000L) {
|
||||
if (registry.shouldReport("similar-asin:30853", T0 + elapsed)) {
|
||||
reports++;
|
||||
}
|
||||
}
|
||||
assertEquals(6, reports, "60s/360s/660s/960s/1260s/1560s 共 6 行");
|
||||
}
|
||||
|
||||
@Test
|
||||
void snapshotCannotBeMutatedByCallers() {
|
||||
ActiveTaskLockRegistry registry = registered();
|
||||
Map<String, ActiveTaskLockRegistry.ActiveLock> snap = registry.snapshot();
|
||||
assertThrows(UnsupportedOperationException.class,
|
||||
() -> snap.remove("similar-asin:30853"), "读数不能反过来改登记表");
|
||||
assertEquals(1, registry.size());
|
||||
}
|
||||
}
|
||||
+102
@@ -0,0 +1,102 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.common.service.DistributedJobLockService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 「在持读数」的接线判据(10-14)。
|
||||
*
|
||||
* 阶梯节奏本身在 {@link ActiveTaskLockRegistryTest} 里钉;这里只证一件事:
|
||||
* 登记表真的跟着**取锁/放锁**在动。少一条,看门狗读到的就是上一任留下的旧时间戳,
|
||||
* 那正是"锁挂了 24 小时"最容易骗人的形状。
|
||||
*/
|
||||
class TaskDistributedLockServiceActiveReadingTest {
|
||||
|
||||
private static final Duration TTL = Duration.ofMinutes(5);
|
||||
private static final String LOCK_NAME = "task:similar-asin:30853";
|
||||
|
||||
private TaskDistributedLockService serviceWithLockAvailable() {
|
||||
DistributedJobLockService delegate = mock(DistributedJobLockService.class);
|
||||
when(delegate.tryLock(anyString(), any(Duration.class)))
|
||||
.thenReturn(mock(DistributedJobLockService.LockHandle.class));
|
||||
return new TaskDistributedLockService(delegate);
|
||||
}
|
||||
|
||||
private TaskDistributedLockService serviceWithLockBusy() {
|
||||
DistributedJobLockService delegate = mock(DistributedJobLockService.class);
|
||||
when(delegate.tryLock(anyString(), any(Duration.class))).thenReturn(null);
|
||||
return new TaskDistributedLockService(delegate);
|
||||
}
|
||||
|
||||
@Test
|
||||
void heldLockIsReadableBeforeItIsReleased() {
|
||||
TaskDistributedLockService service = serviceWithLockAvailable();
|
||||
TaskDistributedLockService.LockHandle handle = service.acquire("SIMILAR_ASIN", 30853L);
|
||||
assertNotNull(handle, "锁可用时应当取到");
|
||||
Map<String, Long> readings = service.activeHeldMillis();
|
||||
assertEquals(Set.of(LOCK_NAME), readings.keySet(),
|
||||
"模块名要归一成 task:similar-asin:30853,读数才对得上 grep 的锚");
|
||||
assertTrue(readings.get(LOCK_NAME) >= 0L, "还没放的锁必须读得到时长");
|
||||
}
|
||||
|
||||
@Test
|
||||
void releaseTakesTheLockOutOfTheReading() {
|
||||
TaskDistributedLockService service = serviceWithLockAvailable();
|
||||
service.acquire("similar-asin", 30853L).close();
|
||||
assertTrue(service.activeHeldMillis().isEmpty(), "放手的锁不能继续算在持");
|
||||
}
|
||||
|
||||
@Test
|
||||
void nestedAcquireRegistersOnceAndNeedsEveryClose() {
|
||||
TaskDistributedLockService service = serviceWithLockAvailable();
|
||||
TaskDistributedLockService.LockHandle outer = service.acquire("similar-asin", 30853L);
|
||||
TaskDistributedLockService.LockHandle inner = service.acquire("similar-asin", 30853L);
|
||||
assertEquals(1, service.activeHeldMillis().size(), "同一把锁重入只登记一次");
|
||||
inner.close();
|
||||
assertEquals(1, service.activeHeldMillis().size(), "只放了一层,锁还在本线程手里");
|
||||
outer.close();
|
||||
assertTrue(service.activeHeldMillis().isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void contestedAcquireRegistersNothing() {
|
||||
TaskDistributedLockService service = serviceWithLockBusy();
|
||||
assertNull(service.acquire("similar-asin", 30853L, TTL, 0L), "等不到锁就是没取到");
|
||||
assertTrue(service.activeHeldMillis().isEmpty(), "没取到的锁不许出现在在持读数里");
|
||||
}
|
||||
|
||||
@Test
|
||||
void badTaskIdentityRegistersNothing() {
|
||||
TaskDistributedLockService service = serviceWithLockAvailable();
|
||||
assertNull(service.acquire("similar-asin", null));
|
||||
assertNull(service.acquire(" ", 30853L));
|
||||
assertTrue(service.activeHeldMillis().isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void reacquiringStartsTheClockOver() {
|
||||
TaskDistributedLockService service = serviceWithLockAvailable();
|
||||
service.acquire("similar-asin", 30853L).close();
|
||||
long heldAfterReacquire;
|
||||
TaskDistributedLockService.LockHandle again = service.acquire("similar-asin", 30853L);
|
||||
heldAfterReacquire = service.activeHeldMillis().get(LOCK_NAME);
|
||||
again.close();
|
||||
assertTrue(heldAfterReacquire < 5_000L,
|
||||
"上一任的时间戳不能留给新持有者(否则一条刚取到锁的读数会显示成已压了很久)");
|
||||
assertFalse(service.activeHeldMillis().containsKey(LOCK_NAME));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user