Skip to content

fix(server-lifecycle): 收口合服 PR974 CodeRabbit 快修项 - #985

Merged
AlianBlank merged 1 commit into
mainfrom
fix/server-merge-review-quick-wins
Nov 3, 2026
Merged

AlianBlank merged 1 commit into
mainfrom
fix/server-merge-review-quick-wins

Conversation

@AlianBlank

Copy link
Copy Markdown
Collaborator

概要

收口 PR #974 CodeRabbit 审查中 Quick win 级 Major/Minor 遗留项:

  1. 目标服锚点退役校验(Major):OnlineServerAnchorMergeParticipant 前置校验目标服锚点——目标服已合入其他服(退役)时整体拒绝(StateOperationForbidden),dry-run 即暴露,避免源服数据经行键重写落入已退役区服。
  2. CAS 重试耗尽拒绝落定(Major):OnlineServerRowKeyRewriteParticipant 真实执行时 skipped>0 抛 StateOperationForbidden,计划不落定;重试按 HomeServerId == 源服 过滤补写滞留行,对账明细语义不变。
  3. CLI 非正数源 ID(Minor):解析阶段拒绝 --sources=0/-1,返回参数错误码 2。

已修过不重复处理:provider 非法值报错(9bc87108)、事件补发记账(a294067f)、用法说明等号格式(eae16ee 起)。

遗留(已入 backlog)

  • B1 账本行分页读取(Heavy lift)
  • B2 合服停写窗口(Heavy lift)

测试

  • 新增回归:MergeAsync_TargetServerAlreadyMerged_RejectedInDryRun、MergeAsync_RowRewriteSkippedRows_ThrowsAndRefusesToSettle
  • Online 相关 1120/1120 通过;dotnet build 0 错误

- OnlineServerAnchorMergeParticipant:前置校验目标服锚点,已合入其他服(退役服)直接拒绝,避免数据写入已退役区服
- OnlineServerRowKeyRewriteParticipant:真实执行 CAS 重试耗尽(skipped>0)时抛 StateOperationForbidden 拒绝落定,重试按 HomeServerId 过滤补写滞留行
- OnlineServerMergeCli:解析阶段拒绝非正数源区服 ID,返回参数错误码 2 而非业务拒绝码 3
- 新增回归测试:目标服退役拒绝、skipped 拒绝落定(1120 通过)
@coderabbitai

coderabbitai Bot commented Nov 3, 2026

Copy link
Copy Markdown

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 29 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 9e4535ae-72b5-476a-96fe-f8ca6d47ce55
Commits

Reviewing files that changed from the base of the PR and between 2426b98 and 52f8dd8.

Files selected for processing: 4
  • Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerAnchorMergeParticipant.cs
  • Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerMergeCli.cs
  • Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerRowKeyRewriteParticipant.cs
  • Tests/GameFrameX.Tests/Online/OnlineServerLifecycleTests.cs

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

CodeRabbit Verify

  • Run CodeRabbit Verify to test the changes in this pull request.

@sonarqubecloud

sonarqubecloud Bot commented Nov 3, 2026

Copy link
Copy Markdown

@AlianBlank
AlianBlank merged commit d407707 into main Nov 3, 2026
4 checks passed
@AlianBlank
AlianBlank deleted the fix/server-merge-review-quick-wins branch November 3, 2026 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant