fix(delivery): claimBatch 排除已暂停 FLID,避免投递饿死(ACM2-95)

同 FLID 事件占满 delivery-batch 时后续轮次不再重复领到同一批;补饥饿回归用例。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
windyboy
2026-09-21 14:11:53 +08:00
co-authored by Cursor
parent 2fb9e76919
commit d298fcc48f
5 changed files with 62 additions and 8 deletions
@@ -172,7 +172,11 @@ data class Backlog(
interface MsgEventRepository {
fun insertAll(events: List<MsgEvent>): List<Long>
fun claimBatch(target: String, limit: Int): List<MsgEvent>
/**
* 领取待发事件;[excludePartitionKeys] 为本轮已暂停的 FLID,排除后避免单航班占满整批
* 导致其他航班饿死(ACM2-95)。
*/
fun claimBatch(target: String, limit: Int, excludePartitionKeys: Set<String> = emptySet()): List<MsgEvent>
/** 领取待发的整态事件:写入侧已保证每个 `FLID` 只有一行,读端不再去重合并。 */
fun mergePendingSchd(now: Instant, limit: Int): List<MsgEvent>
@@ -512,12 +512,29 @@ class JdbcMsgEventRepository(
ps.setTimestamp(9, e.createdAt.toSqlTimestamp())
}
override fun claimBatch(target: String, limit: Int): List<MsgEvent> =
ds.query(
"SELECT * FROM msg_event WHERE target = ? AND state = 'PENDING' ORDER BY event_id ASC LIMIT ?",
{ ps -> ps.setString(1, target); ps.setInt(2, limit) },
override fun claimBatch(target: String, limit: Int, excludePartitionKeys: Set<String>): List<MsgEvent> {
if (excludePartitionKeys.isEmpty()) {
return ds.query(
"SELECT * FROM msg_event WHERE target = ? AND state = 'PENDING' ORDER BY event_id ASC LIMIT ?",
{ ps -> ps.setString(1, target); ps.setInt(2, limit) },
::mapEvent,
)
}
val placeholders = excludePartitionKeys.joinToString(",") { "?" }
return ds.query(
"""
SELECT * FROM msg_event
WHERE target = ? AND state = 'PENDING' AND partition_key NOT IN ($placeholders)
ORDER BY event_id ASC LIMIT ?
""".trimIndent(),
{ ps ->
ps.setString(1, target)
excludePartitionKeys.forEachIndexed { i, key -> ps.setString(i + 2, key) }
ps.setInt(excludePartitionKeys.size + 2, limit)
},
::mapEvent,
)
}
/**
* 领取待发的整态事件。写入侧已保证每个 `FLID` 只有一行(部分唯一索引 `uq_schd_event`),
@@ -280,8 +280,12 @@ class StubMsgEvents : MsgEventRepository {
return id
}
override fun claimBatch(target: String, limit: Int): List<MsgEvent> =
rows.values.filter { it.target == target && it.state == EventStatus.PENDING }.sortedBy { it.eventId!! }.take(limit)
override fun claimBatch(target: String, limit: Int, excludePartitionKeys: Set<String>): List<MsgEvent> =
rows.values
.filter { it.target == target && it.state == EventStatus.PENDING }
.filter { it.partitionKey !in excludePartitionKeys }
.sortedBy { it.eventId!! }
.take(limit)
/** 写入侧已保证每个 FLID 单行,按退避与事件先后输出。 */
override fun mergePendingSchd(now: Instant, limit: Int): List<MsgEvent> =