chore: Extract server recovery tracking from controller#1552
Merged
Conversation
Move recovery task tracking and retry backoff out of the server controller while preserving the public RecoveryTask surface and retry ordering.
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: ⛔ Files ignored due to path filters (1)
📒 Files selected for processing (5)
📝 WalkthroughWalkthroughRecovery scheduling and retry/backoff logic previously implemented inside ChangesRecovery tracking service extraction
Estimated code review effort: 3 (Moderate) | ~25 minutes Sequence Diagram(s)sequenceDiagram
participant Controller as UnityCliLoopServerControllerService
participant Tracker as UnityCliLoopServerRecoveryTrackingService
participant Repo as ISessionFlagsRepository
Controller->>Tracker: ScheduleStartupRecovery(restoreServerState)
Tracker-->>Controller: RecoveryTask
Controller->>Tracker: ScheduleTrackedRecovery(recoveryAction)
loop retry with backoff
Tracker->>Repo: GetIsServerManuallyStopped()
alt manually stopped
Tracker-->>Controller: abandon retries
else retries exceeded
Tracker->>Repo: ClearServerSession()
Tracker-->>Controller: throw InvalidOperationException
end
end
Possibly related PRs
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
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. Comment |
There was a problem hiding this comment.
1 issue found across 6 files
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="Packages/src/Editor/Infrastructure/Server/UnityCliLoopServerRecoveryTrackingService.cs">
<violation number="1" location="Packages/src/Editor/Infrastructure/Server/UnityCliLoopServerRecoveryTrackingService.cs:168">
P2: Recovery failures can produce an extra unobserved fault from the fire-and-forget cleanup task, which may trigger noisy `UnobservedTaskException` handling and duplicate error surfacing. This happens because `ClearTrackedRecoveryWhenCompleteAsync` rethrows `recoveryTask` faults even though its result is intentionally discarded.</violation>
</file>
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
Comment on lines
+168
to
+176
| await recoveryTask; | ||
| } | ||
| finally | ||
| { | ||
| if (ReferenceEquals(_currentRecoveryTask, recoveryTask)) | ||
| { | ||
| _currentRecoveryTask = null; | ||
| } | ||
| } |
There was a problem hiding this comment.
P2: Recovery failures can produce an extra unobserved fault from the fire-and-forget cleanup task, which may trigger noisy UnobservedTaskException handling and duplicate error surfacing. This happens because ClearTrackedRecoveryWhenCompleteAsync rethrows recoveryTask faults even though its result is intentionally discarded.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At Packages/src/Editor/Infrastructure/Server/UnityCliLoopServerRecoveryTrackingService.cs, line 168:
<comment>Recovery failures can produce an extra unobserved fault from the fire-and-forget cleanup task, which may trigger noisy `UnobservedTaskException` handling and duplicate error surfacing. This happens because `ClearTrackedRecoveryWhenCompleteAsync` rethrows `recoveryTask` faults even though its result is intentionally discarded.</comment>
<file context>
@@ -0,0 +1,179 @@
+
+ try
+ {
+ await recoveryTask;
+ }
+ finally
</file context>
Suggested change
| await recoveryTask; | |
| } | |
| finally | |
| { | |
| if (ReferenceEquals(_currentRecoveryTask, recoveryTask)) | |
| { | |
| _currentRecoveryTask = null; | |
| } | |
| } | |
| await recoveryTask; | |
| } | |
| catch | |
| { | |
| // Recovery failure is surfaced by the original recoveryTask returned to callers. | |
| } | |
| finally | |
| { | |
| if (ReferenceEquals(_currentRecoveryTask, recoveryTask)) | |
| { | |
| _currentRecoveryTask = null; | |
| } | |
| } |
This was referenced Jul 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
User Impact
Changes
Verification
dist/darwin-arm64/uloop compile --project-path "$(git rev-parse --show-toplevel)"-> 0 errors / 0 warningsdist/darwin-arm64/uloop run-tests --project-path "$(git rev-parse --show-toplevel)" --test-mode EditMode --filter-type regex "(DomainReloadRecoveryUseCaseTests|UnityCliLoopServerControllerRecoveryTests|UnityCliLoopServerStartupProtectionTests|UnityCliLoopBridgeServerShutdownTests|JsonRpcHeartbeatTests|UnityCliLoopServerLifecycleRegistryServiceTests|ServerLifecycleContractTests|UnityCliLoopFirstPartyServerLifecycleBindingTests|JsonRpcProcessorCliVersionGateTests|OnionAssemblyDependencyTests)"-> 141/141 passed