From 52f8dd87f9c569a4b1ba1d91e483206296c0aac8 Mon Sep 17 00:00:00 2001 From: Blank Date: Tue, 3 Nov 2026 15:32:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(server-lifecycle):=20=E6=94=B6=E5=8F=A3?= =?UTF-8?q?=E5=90=88=E6=9C=8D=20PR974=20CodeRabbit=20=E5=BF=AB=E4=BF=AE?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - OnlineServerAnchorMergeParticipant:前置校验目标服锚点,已合入其他服(退役服)直接拒绝,避免数据写入已退役区服 - OnlineServerRowKeyRewriteParticipant:真实执行 CAS 重试耗尽(skipped>0)时抛 StateOperationForbidden 拒绝落定,重试按 HomeServerId 过滤补写滞留行 - OnlineServerMergeCli:解析阶段拒绝非正数源区服 ID,返回参数错误码 2 而非业务拒绝码 3 - 新增回归测试:目标服退役拒绝、skipped 拒绝落定(1120 通过) --- .../OnlineServerAnchorMergeParticipant.cs | 8 +++- .../ServerMerge/OnlineServerMergeCli.cs | 6 +++ .../OnlineServerRowKeyRewriteParticipant.cs | 10 +++- .../Online/OnlineServerLifecycleTests.cs | 46 +++++++++++++++++++ 4 files changed, 68 insertions(+), 2 deletions(-) diff --git a/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerAnchorMergeParticipant.cs b/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerAnchorMergeParticipant.cs index d5d0c108..f12e5b4b 100644 --- a/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerAnchorMergeParticipant.cs +++ b/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerAnchorMergeParticipant.cs @@ -38,7 +38,7 @@ namespace GameFrameX.Capability.Online.ServerLifecycle.ServerMerge; /// /// 内置参与者:开服锚点合服标记(源服锚点 MergedIntoServerId 置目标服;幂等)。 /// -/// 前置全量校验(dry-run 与真实执行共用):任一源服锚点未登记或已合入其他目标即整体拒绝 +/// 前置全量校验(dry-run 与真实执行共用):目标服锚点已合入其他服(已退役)、任一源服锚点未登记或已合入其他目标即整体拒绝 /// ()——dry-run 即暴露执行期失败, /// 真实执行不会出现部分源服已标记的半途状态。 /// @@ -70,6 +70,12 @@ public async Task MergeAsync(OnlineServerMergeConte { var details = new Dictionary(); long affected = 0; + + var targetAnchor = await _calendarStore.FindAsync(context.Plan.TargetServerId, cancellationToken).ConfigureAwait(false); + if (targetAnchor != null && targetAnchor.MergedIntoServerId != 0) + { + throw new OnlineServiceException(OnlineErrorCode.StateOperationForbidden, "Target server " + context.Plan.TargetServerId + " already merged into " + targetAnchor.MergedIntoServerId + "; cannot merge into a retired server."); + } foreach (var sourceServerId in context.Plan.SourceServerIds) { var anchor = await _calendarStore.FindAsync(sourceServerId, cancellationToken).ConfigureAwait(false); diff --git a/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerMergeCli.cs b/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerMergeCli.cs index 764a1f9a..82630b40 100644 --- a/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerMergeCli.cs +++ b/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerMergeCli.cs @@ -160,6 +160,12 @@ private static async Task ParseArgumentsAsync(strin return null; } + if (sourceServerId <= 0) + { + await output.WriteLineAsync("ERROR: invalid --sources segment '" + segment + "' (server ids must be positive).").ConfigureAwait(false); + return null; + } + options.SourceServerIds.Add(sourceServerId); } } diff --git a/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerRowKeyRewriteParticipant.cs b/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerRowKeyRewriteParticipant.cs index 8b45394e..78eeca8b 100644 --- a/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerRowKeyRewriteParticipant.cs +++ b/Capability/GameFrameX.Capability.Online.ServerLifecycle/ServerMerge/OnlineServerRowKeyRewriteParticipant.cs @@ -30,7 +30,7 @@ namespace GameFrameX.Capability.Online.ServerLifecycle.ServerMerge; using System; -using System.Collections.Generic; +using GameFrameX.Capability.Online.Abstractions.Contracts; using System.Threading; using System.Threading.Tasks; @@ -76,17 +76,25 @@ public async Task MergeAsync(OnlineServerMergeConte { var counts = await _rewriter.RewriteServerDomainRowsAsync(context.Plan.SourceServerIds, context.Plan.TargetServerId, context.DryRun, _batchSize, cancellationToken).ConfigureAwait(false); long affected = 0; + long skipped = 0; foreach (var pair in counts) { // skipped 明细是运营对账信息(CAS 失配超限跳过),不计入受影响行数。 if (pair.Key.EndsWith("-skipped", StringComparison.Ordinal)) { + skipped += pair.Value; continue; } affected += pair.Value; } + if (!context.DryRun && skipped > 0) + { + // 拒绝落定:滞留行留在源服,重试按 HomeServerId == 源服 过滤只补写滞留行。 + throw new OnlineServiceException(OnlineErrorCode.StateOperationForbidden, "Row key rewrite skipped " + skipped + " row(s) after CAS retry exhaustion; the merge is not settled. Retry the execute to rewrite the remaining rows."); + } + return new OnlineServerMergeStepReport("row-key-rewrite:server-domain", affected, counts); } } diff --git a/Tests/GameFrameX.Tests/Online/OnlineServerLifecycleTests.cs b/Tests/GameFrameX.Tests/Online/OnlineServerLifecycleTests.cs index 5ad2c410..7f9e6e0f 100644 --- a/Tests/GameFrameX.Tests/Online/OnlineServerLifecycleTests.cs +++ b/Tests/GameFrameX.Tests/Online/OnlineServerLifecycleTests.cs @@ -261,6 +261,52 @@ public async Task Execute_PublishFailureAfterMarkExecuted_ReplayRepublishesWithS Assert.Single(publisher.PublishedEvents); } + [Fact] + public async Task MergeAsync_TargetServerAlreadyMerged_RejectedInDryRun() + { + var calendarStore = new InMemoryOnlineServerCalendarStore(); + await calendarStore.TryRegisterAsync(new OnlineServerAnchor { ServerId = 1, OpenedAtUnixMilliseconds = 1000 }); + await calendarStore.TryRegisterAsync(new OnlineServerAnchor { ServerId = 2, OpenedAtUnixMilliseconds = 2000 }); + await calendarStore.MarkMergedAsync(1, 3); + + // 服 1 已合入服 3(退役),不可再作为目标服;dry-run 即拒绝。 + var participant = new OnlineServerAnchorMergeParticipant(calendarStore); + var exception = await Assert.ThrowsAsync(() => participant.MergeAsync(new OnlineServerMergeContext(OnlineServerMergePlan.Create(1, new long[] { 2 }, 1), true, 1), CancellationToken.None)); + Assert.Equal(OnlineErrorCode.StateOperationForbidden, exception.Code); + } + + [Fact] + public async Task MergeAsync_RowRewriteSkippedRows_ThrowsAndRefusesToSettle() + { + var rewriter = new SkippingRowRewriterStub(); + var participant = new OnlineServerRowKeyRewriteParticipant(rewriter, 500); + + // dry-run 只计数不拒绝;真实执行 skipped > 0 时抛异常,计划不落定。 + var dryRunReport = await participant.MergeAsync(new OnlineServerMergeContext(OnlineServerMergePlan.Create(3, new long[] { 1 }, 1), true, 1), CancellationToken.None); + Assert.Equal(0, dryRunReport.AffectedCount); + + var exception = await Assert.ThrowsAsync(() => participant.MergeAsync(new OnlineServerMergeContext(OnlineServerMergePlan.Create(3, new long[] { 1 }, 1), false, 1), CancellationToken.None)); + Assert.Equal(OnlineErrorCode.StateOperationForbidden, exception.Code); + } + + /// + /// 恒定返回 skipped 明细的重写端口桩(CAS 重试耗尽场景回归载体)。 + /// + private sealed class SkippingRowRewriterStub : IOnlineServerMergeRowRewriter + { + public Task> RewriteServerDomainRowsAsync(IReadOnlyList sourceServerIds, long targetServerId, bool dryRun, int batchSize, CancellationToken cancellationToken = default) + { + IReadOnlyDictionary counts = new Dictionary { { "player-scope-skipped", 2 } }; + return Task.FromResult(counts); + } + + public Task> CountServerDomainRowsAsync(IReadOnlyList sourceServerIds, CancellationToken cancellationToken) + { + IReadOnlyDictionary counts = new Dictionary { { "player-scope", 2 } }; + return Task.FromResult(counts); + } + } + internal static OnlineServerMergeService BuildMergeService(IOnlineServerMergeStore mergeStore, IOnlineServerCalendarStore calendarStore = null, IOnlinePlayerRouteRewriter routeRewriter = null) { calendarStore ??= new InMemoryOnlineServerCalendarStore();