fix(版本包): 最新版改为显式标记 + 新增升级包保留期清理
读取侧不再靠 created_at 现场算「最新版」(补插一条老记录就会把全体客户端更新目标带偏且 无报错),改读 web_config.is_latest,与数字人版本表口径对齐;上传/补录后标记,删除到最新版 时立刻改标剩余最新一条,全无标记时回退按时间取并补标——否则客户端会以为已是最新版而停更。 标记用一条 SET is_latest = (id = ?) 的整表 UPDATE,避免「先清零再置一」的中间零标记态需要拉事务。 另新增 SoftwareVersionRetentionService:client 桶 nanri-image/versions/ 前缀只增不删, 2026-09-21 已堆到 61 个对象 / 6.2GiB(单个约 106MB)。刻意不走 MinIO ILM 按天过期—— 2026-09-08 那次全桶 30 天规则连着删掉 9 个仍被人下载的安装包,web_config 留下断链至今。 口径为「保留最近 N 个 + 最新版永不删」,删除复用 deleteSoftwareVersions 的 file_url 引用计数 (同版本重复上传共享同一 key),双节点 job 锁,默认 dry-run。
This commit is contained in:
+208
@@ -0,0 +1,208 @@
|
||||
package com.nanri.aiimage.modules.softwareversion.service;
|
||||
|
||||
import com.nanri.aiimage.common.service.DistributedJobLockService;
|
||||
import com.nanri.aiimage.modules.softwareversion.mapper.SoftwareVersionMapper;
|
||||
import com.nanri.aiimage.modules.softwareversion.model.entity.SoftwareVersionEntity;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
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.anyString;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 客户端升级包保留期清理:按「保留最近 N 个」而非按天数过期,
|
||||
* 避免重演 2026-09-08 那次全桶 30 天 ILM 误删在用安装包。
|
||||
*/
|
||||
class SoftwareVersionRetentionServiceTest {
|
||||
|
||||
private final SoftwareVersionMapper versionMapper = mock(SoftwareVersionMapper.class);
|
||||
private final SoftwareVersionService versionService = mock(SoftwareVersionService.class);
|
||||
private final DistributedJobLockService jobLockService = mock(DistributedJobLockService.class);
|
||||
|
||||
/**
|
||||
* 构造 count 条版本记录并按 created_at 倒序返回(id 越大越新、排在首位),
|
||||
* 与 SoftwareVersionService#listSoftwareVersions 的 ORDER BY created_at DESC, id DESC 口径一致。
|
||||
*/
|
||||
private static List<SoftwareVersionEntity> newestFirst(int count) {
|
||||
LocalDateTime base = LocalDateTime.of(2026, 9, 1, 10, 0);
|
||||
return java.util.stream.IntStream.rangeClosed(1, count).mapToObj(i -> {
|
||||
SoftwareVersionEntity entity = new SoftwareVersionEntity();
|
||||
entity.setId((long) i);
|
||||
entity.setVersion("4.0." + i);
|
||||
entity.setCreatedAt(base.plusDays(i - 1));
|
||||
return entity;
|
||||
}).sorted((a, b) -> b.getCreatedAt().compareTo(a.getCreatedAt())).toList();
|
||||
}
|
||||
|
||||
private SoftwareVersionRetentionService service(int keepCount, boolean dryRun) {
|
||||
SoftwareVersionRetentionService service = new SoftwareVersionRetentionService(
|
||||
versionMapper, versionService, jobLockService);
|
||||
ReflectionTestUtils.setField(service, "keepCount", keepCount);
|
||||
ReflectionTestUtils.setField(service, "dryRun", dryRun);
|
||||
return service;
|
||||
}
|
||||
|
||||
private DistributedJobLockService.LockHandle lockAvailable() {
|
||||
DistributedJobLockService.LockHandle handle = mock(DistributedJobLockService.LockHandle.class);
|
||||
when(jobLockService.tryLock(anyString(), any())).thenReturn(handle);
|
||||
return handle;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private List<Long> captureDeletedIds() {
|
||||
ArgumentCaptor<List<Long>> captor = ArgumentCaptor.forClass(List.class);
|
||||
verify(versionService).deleteSoftwareVersions(captor.capture());
|
||||
return captor.getValue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void dryRunLogsCandidatesButDeletesNothing() {
|
||||
lockAvailable();
|
||||
when(versionMapper.selectList(any())).thenReturn(newestFirst(25));
|
||||
|
||||
service(20, true).purgeSupersededVersions();
|
||||
|
||||
verify(versionService, never()).deleteSoftwareVersions(anyList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void deletesOnlyVersionsOlderThanKeepCount() {
|
||||
lockAvailable();
|
||||
when(versionMapper.selectList(any())).thenReturn(newestFirst(25));
|
||||
|
||||
service(20, false).purgeSupersededVersions();
|
||||
|
||||
// 25 条按新→旧排列,保留前 20(id 25..6),删除 id 5..1
|
||||
assertEquals(List.of(5L, 4L, 3L, 2L, 1L), captureDeletedIds());
|
||||
}
|
||||
|
||||
@Test
|
||||
void neverTouchesTheLatestVersion() {
|
||||
lockAvailable();
|
||||
when(versionMapper.selectList(any())).thenReturn(newestFirst(3));
|
||||
|
||||
service(2, false).purgeSupersededVersions();
|
||||
|
||||
List<Long> ids = captureDeletedIds();
|
||||
assertEquals(List.of(1L), ids);
|
||||
assertFalse(ids.contains(3L), "最新记录不能被选为删除候选");
|
||||
}
|
||||
|
||||
@Test
|
||||
void clampsKeepCountToOneWhenMisconfigured() {
|
||||
// 配成 0 会算出「一个都不保留」,把 61 个安装包连同最新一并删掉
|
||||
lockAvailable();
|
||||
when(versionMapper.selectList(any())).thenReturn(newestFirst(3));
|
||||
|
||||
service(0, false).purgeSupersededVersions();
|
||||
|
||||
assertEquals(List.of(2L, 1L), captureDeletedIds());
|
||||
}
|
||||
|
||||
@Test
|
||||
void capsDeletionsPerRunAndLeavesTheRestForNextRound() {
|
||||
lockAvailable();
|
||||
when(versionMapper.selectList(any())).thenReturn(newestFirst(25));
|
||||
|
||||
service(1, false).purgeSupersededVersions();
|
||||
|
||||
List<Long> ids = captureDeletedIds();
|
||||
assertEquals(SoftwareVersionRetentionService.MAX_DELETIONS_PER_RUN, ids.size());
|
||||
assertEquals(24L, ids.get(0), "应从次新的一条开始删");
|
||||
assertTrue(ids.contains(5L));
|
||||
assertFalse(ids.contains(4L), "超出单轮上限的留给下一轮");
|
||||
}
|
||||
|
||||
@Test
|
||||
void neverDeletesTheFlaggedLatestEvenOutsideTheKeepWindow() {
|
||||
lockAvailable();
|
||||
// 有人把最新版回设到一个较老的版本上:它落在 keep 之外,但带 is_latest 标记就不该被清
|
||||
List<SoftwareVersionEntity> rows = newestFirst(25);
|
||||
rows.stream().filter(r -> r.getId() == 10L).forEach(r -> r.setIsLatest(true));
|
||||
when(versionMapper.selectList(any())).thenReturn(rows);
|
||||
|
||||
service(5, false).purgeSupersededVersions();
|
||||
|
||||
List<Long> ids = captureDeletedIds();
|
||||
assertFalse(ids.contains(10L), "is_latest 标记行必须免于保留期清理");
|
||||
assertEquals(19, ids.size(), "20 个候选里被标记的那 1 个应被剔除");
|
||||
}
|
||||
|
||||
@Test
|
||||
void skipsTheRoundWhenEverythingOutsideTheKeepWindowIsProtected() {
|
||||
lockAvailable();
|
||||
List<SoftwareVersionEntity> rows = newestFirst(3);
|
||||
rows.forEach(r -> r.setIsLatest(true));
|
||||
when(versionMapper.selectList(any())).thenReturn(rows);
|
||||
|
||||
service(1, false).purgeSupersededVersions();
|
||||
|
||||
verify(versionService, never()).deleteSoftwareVersions(anyList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void doesNothingWhenWithinKeepCount() {
|
||||
lockAvailable();
|
||||
when(versionMapper.selectList(any())).thenReturn(newestFirst(5));
|
||||
|
||||
service(20, false).purgeSupersededVersions();
|
||||
|
||||
verify(versionMapper).selectList(any());
|
||||
verify(versionService, never()).deleteSoftwareVersions(anyList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void skipsWhenAnotherInstanceHoldsLock() {
|
||||
when(jobLockService.tryLock(anyString(), any())).thenReturn(null);
|
||||
|
||||
service(20, false).purgeSupersededVersions();
|
||||
|
||||
verify(versionMapper, never()).selectList(any());
|
||||
verify(versionService, never()).deleteSoftwareVersions(anyList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void releasesJobLockAfterRun() {
|
||||
DistributedJobLockService.LockHandle handle = lockAvailable();
|
||||
when(versionMapper.selectList(any())).thenReturn(newestFirst(25));
|
||||
|
||||
service(20, false).purgeSupersededVersions();
|
||||
|
||||
verify(handle).close();
|
||||
}
|
||||
|
||||
@Test
|
||||
void queryFailureIsLoggedAndDoesNotThrow() {
|
||||
lockAvailable();
|
||||
when(versionMapper.selectList(any())).thenThrow(new IllegalStateException("db down"));
|
||||
|
||||
service(20, false).purgeSupersededVersions();
|
||||
|
||||
verify(versionService, never()).deleteSoftwareVersions(anyList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteFailureDoesNotThrowAndStillReleasesLock() {
|
||||
DistributedJobLockService.LockHandle handle = lockAvailable();
|
||||
when(versionMapper.selectList(any())).thenReturn(newestFirst(25));
|
||||
when(versionService.deleteSoftwareVersions(anyList())).thenThrow(new IllegalStateException("oss 不可达"));
|
||||
|
||||
service(20, false).purgeSupersededVersions();
|
||||
|
||||
verify(versionService, times(1)).deleteSoftwareVersions(anyList());
|
||||
verify(handle).close();
|
||||
}
|
||||
}
|
||||
+166
@@ -0,0 +1,166 @@
|
||||
package com.nanri.aiimage.modules.softwareversion.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import com.nanri.aiimage.modules.softwareversion.mapper.SoftwareVersionMapper;
|
||||
import com.nanri.aiimage.modules.softwareversion.model.entity.SoftwareVersionEntity;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
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.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 「最新版」必须是 web_config 上的显式标记,而不是按 created_at 现场算出来的。
|
||||
* 现场算的问题:补插一条 created_at 较早的记录,就会把全体客户端的更新目标静默带偏。
|
||||
*/
|
||||
class SoftwareVersionServiceTest {
|
||||
|
||||
private final SoftwareVersionMapper versionMapper = mock(SoftwareVersionMapper.class);
|
||||
private final OssStorageService ossStorageService = mock(OssStorageService.class);
|
||||
|
||||
private SoftwareVersionService service() {
|
||||
return new SoftwareVersionService(versionMapper, ossStorageService);
|
||||
}
|
||||
|
||||
@BeforeAll
|
||||
static void initializeMybatisMetadata() {
|
||||
// 不初始化表元信息,LambdaQueryWrapper 解析不出列名,is_latest 的映射就无从校验
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""), SoftwareVersionEntity.class);
|
||||
}
|
||||
|
||||
private static SoftwareVersionEntity row(long id, String version, boolean latest, int daysAgo) {
|
||||
SoftwareVersionEntity entity = new SoftwareVersionEntity();
|
||||
entity.setId(id);
|
||||
entity.setVersion(version);
|
||||
entity.setFileUrl("https://oss.aishufu.top/client/nanri-image/versions/" + version + ".zip");
|
||||
entity.setIsLatest(latest);
|
||||
entity.setCreatedAt(LocalDateTime.of(2026, 9, 1, 10, 0).minusDays(daysAgo));
|
||||
return entity;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private String capturedLatestQuery() {
|
||||
ArgumentCaptor<LambdaQueryWrapper<SoftwareVersionEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaQueryWrapper.class);
|
||||
verify(versionMapper).selectOne(captor.capture());
|
||||
return captor.getValue().getSqlSegment();
|
||||
}
|
||||
|
||||
@Test
|
||||
void isLatestFieldMapsToTheMigrationColumn() {
|
||||
when(versionMapper.selectOne(any())).thenReturn(row(1, "4.0.32", true, 0));
|
||||
|
||||
service().latestSoftwareVersion();
|
||||
|
||||
// V136 建的列名就是 is_latest;实体字段若改名,这里会先红,而不是等到生产
|
||||
assertTrue(capturedLatestQuery().contains("is_latest"),
|
||||
"最新版查询应过滤 is_latest 列,实际 SQL 片段: " + capturedLatestQuery());
|
||||
}
|
||||
|
||||
@Test
|
||||
void returnsTheFlaggedRowWithoutTouchingTheFlag() {
|
||||
when(versionMapper.selectOne(any())).thenReturn(row(1, "4.0.32", true, 0));
|
||||
|
||||
Map<String, Object> result = service().latestSoftwareVersion();
|
||||
|
||||
assertEquals("4.0.32", result.get("version"));
|
||||
verify(versionMapper, never()).markLatestById(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void fallsBackToNewestByCreatedAtAndReMarksWhenNothingIsFlagged() {
|
||||
// 第一次查(按标记)落空,第二次查(按时间)才拿到——手工删库或旧备份库接上时的形态
|
||||
SoftwareVersionEntity newest = row(77, "4.0.31", false, 1);
|
||||
when(versionMapper.selectOne(any())).thenReturn(null, newest);
|
||||
|
||||
Map<String, Object> result = service().latestSoftwareVersion();
|
||||
|
||||
assertEquals("4.0.31", result.get("version"));
|
||||
verify(versionMapper).markLatestById(77L);
|
||||
}
|
||||
|
||||
@Test
|
||||
void emptyTableStillReturnsNullVersion() {
|
||||
when(versionMapper.selectOne(any())).thenReturn(null);
|
||||
|
||||
Map<String, Object> result = service().latestSoftwareVersion();
|
||||
|
||||
assertEquals(null, result.get("version"));
|
||||
assertEquals(null, result.get("file_url"));
|
||||
verify(versionMapper, never()).markLatestById(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void confirmUploadMarksTheNewRowAsLatest() {
|
||||
String objectKey = SoftwareVersionService.STORAGE_PATH_PREFIX + "4.0.33.zip";
|
||||
when(ossStorageService.softwareVersionObjectSize(objectKey)).thenReturn(1024L * 1024);
|
||||
when(ossStorageService.getSoftwareVersionDownloadUrl(objectKey))
|
||||
.thenReturn("https://oss.aishufu.top/" + objectKey);
|
||||
when(versionMapper.insert(any(SoftwareVersionEntity.class))).thenAnswer(invocation -> {
|
||||
((SoftwareVersionEntity) invocation.getArgument(0)).setId(200L);
|
||||
return 1;
|
||||
});
|
||||
when(versionMapper.selectById(200L)).thenReturn(row(200, "4.0.33", true, 0));
|
||||
|
||||
service().confirmSoftwareVersion("4.0.33");
|
||||
|
||||
verify(versionMapper).markLatestById(200L);
|
||||
}
|
||||
|
||||
@Test
|
||||
void deletingTheFlaggedRowPromotesTheNewestRemaining() {
|
||||
when(versionMapper.selectBatchIds(anyList())).thenReturn(List.of(row(9, "4.0.32", true, 0)));
|
||||
when(versionMapper.deleteById(9L)).thenReturn(1);
|
||||
when(versionMapper.selectCount(any())).thenReturn(0L);
|
||||
when(ossStorageService.resolveObjectKey(anyString())).thenReturn(null);
|
||||
when(versionMapper.selectOne(any())).thenReturn(row(8, "4.0.31", false, 1));
|
||||
|
||||
service().deleteSoftwareVersions(List.of(9L));
|
||||
|
||||
verify(versionMapper).markLatestById(8L);
|
||||
}
|
||||
|
||||
@Test
|
||||
void deletingNonFlaggedRowsLeavesTheFlagAlone() {
|
||||
when(versionMapper.selectBatchIds(anyList())).thenReturn(List.of(row(5, "4.0.28", false, 4)));
|
||||
when(versionMapper.deleteById(5L)).thenReturn(1);
|
||||
when(versionMapper.selectCount(any())).thenReturn(0L);
|
||||
when(ossStorageService.resolveObjectKey(anyString())).thenReturn(null);
|
||||
|
||||
service().deleteSoftwareVersions(List.of(5L));
|
||||
|
||||
verify(versionMapper, never()).markLatestById(any());
|
||||
verify(versionMapper, never()).selectOne(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void deletingTheOnlyRowDoesNotMarkAnything() {
|
||||
when(versionMapper.selectBatchIds(anyList())).thenReturn(List.of(row(9, "4.0.32", true, 0)));
|
||||
when(versionMapper.deleteById(9L)).thenReturn(1);
|
||||
when(versionMapper.selectCount(any())).thenReturn(0L);
|
||||
when(ossStorageService.resolveObjectKey(anyString())).thenReturn(null);
|
||||
when(versionMapper.selectOne(any())).thenReturn(null);
|
||||
|
||||
service().deleteSoftwareVersions(List.of(9L));
|
||||
|
||||
verify(versionMapper, never()).markLatestById(any());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user