vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-16 17:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(macos): fail fast during node lifecycle cleanup (#105282)

Browse Source
This commit is contained in:
Peter Steinberger
2026-07-12 11:41:21 +01:00
committed by GitHub
parent 4249cdb8fe
commit 7303f42917
2 changed files with 81 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/shared/OpenClawKit/Sources/OpenClawKit/GatewayNodeSession.swift
View File

@@ -965,10 +965,25 @@ extension GatewayNodeSession {
channel: GatewayChannelActor,
socketGeneration: UInt64) async
{
guard await self.awaitLifecycleCallbacks(ifCurrentRoute: route) else { return }
guard self.isCurrentRoute(route),
self.channel === channel
else { return }
// Lifecycle cleanup gates owner readiness. Reject while it is suspended instead of
// holding the Gateway request until timeout; the replacement route stays fail-closed.
if self.lifecycleCallbackBarrier != nil {
self.logger.info("node invoke rejected during lifecycle transition id=\(request.id, privacy: .public)")
await self.sendInvokeResult(
request: request,
response: BridgeInvokeResponse(
id: request.id,
ok: false,
error: OpenClawNodeError(
code: .unavailable,
message: "UNAVAILABLE: node lifecycle transition in progress")),
channel: channel,
socketGeneration: socketGeneration)
return
}
self.logger.info("node invoke executing id=\(request.id, privacy: .public)")
let bridgeRequest = BridgeInvokeRequest(
id: request.id,
@@ -1004,14 +1019,6 @@ extension GatewayNodeSession {
socketGeneration: socketGeneration)
}
private func awaitLifecycleCallbacks(ifCurrentRoute route: GatewayNodeSessionRoute) async -> Bool {
while let lifecycleCallback = self.lifecycleCallbackBarrier {
await lifecycleCallback.task.value
guard self.isCurrentRoute(route), self.channel != nil else { return false }
}
return self.isCurrentRoute(route) && self.channel != nil
}
func invokeIfCurrentRoute(
_ request: BridgeInvokeRequest,
expectedRoute: GatewayNodeSessionRoute,