fix: use configured drain timeout for gateway restart wait (#17198)#17292
Open
vominh1919 wants to merge 1 commit into
Open
fix: use configured drain timeout for gateway restart wait (#17198)#17292vominh1919 wants to merge 1 commit into
vominh1919 wants to merge 1 commit into
Conversation
The gateway restart command hardcoded a 10-second timeout for _wait_for_gateway_exit(), but platform adapters like Weixin can take 18+ seconds to release their tokens during graceful shutdown. Now uses the configured restart_drain_timeout (default 60s) with a minimum of 20s, matching the existing drain timeout mechanism used by systemd/launchd restarts. Fixes NousResearch#17198
3 tasks
2 tasks
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
2 participants
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.
Problem
The
hermes gateway restartcommand hardcoded a 10-second timeout for_wait_for_gateway_exit(), but platform adapters like Weixin can take 18+ seconds to release their tokens during graceful shutdown. This causes a race condition where the new gateway fails to start because the old process's platform lock is still held.Fix
Now uses the configured
restart_drain_timeout(default 60s) with a minimum of 20s for the wait timeout, and 50% of the drain timeout (capped at 10s) for the force-kill threshold. This matches the existing drain timeout mechanism used by systemd/launchd restarts.Before:
After:
Before vs After
Fixes #17198