implement issue 12963#23699
Merged
mergify[bot] merged 18 commits intomatrixorigin:mainfrom Feb 13, 2026
Merged
Conversation
|
|
iamlinjunhong
approved these changes
Feb 10, 2026
fengttt
approved these changes
Feb 11, 2026
XuPeng-SH
approved these changes
Feb 11, 2026
heni02
approved these changes
Feb 12, 2026
Contributor
Merge Queue StatusRule:
This pull request spent 27 minutes 27 seconds in the queue, with no time running CI. Required conditions to merge
ReasonThe merge conditions cannot be satisfied due to failing checks HintYou may have to fix your CI before adding the pull request to the queue again. |
Contributor
Merge Queue StatusRule:
This pull request spent 10 seconds in the queue, with no time running CI. Required conditions to merge
|
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
8 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.
What type of PR is this?
Which issue(s) this PR fixes:
issue #12963
What this PR does / why we need it:
Root Cause
We need MySQL‑compatible idle disconnect behavior for wait_timeout / interactive_timeout.
The previous behavior wasn’t observable because idle timeout wasn’t being applied consistently at read time, and tests were often run via the proxy port (which doesn’t enforce CN idle timeout). In addition, the mysql client auto‑reconnects by default, which can mask disconnections.
Fix
Apply wait_timeout as the read timeout before each request read.
For interactive clients, only at login we overwrite session.wait_timeout with interactive_timeout (one‑time override).
Disallow GLOBAL changes to wait_timeout / interactive_timeout (cloud policy).
Add session‑level min/max hard limits validation.
Added minimal unit tests covering interactive/non‑interactive behavior, session/global restrictions, and boundary checks.
Verification SQL / Steps (direct CN connection, not proxy)
Use mysql --skip-reconnect to avoid auto‑reconnect masking the disconnect.
Interactive client (should disconnect):
set session wait_timeout=3;
-- idle 6 seconds
select 1; -- expected: ERROR 2013 / Lost connection
Interactive client (should NOT disconnect):
set session interactive_timeout=3;
-- idle 6 seconds
select 1; -- expected: returns 1
Non‑interactive client (batch; should disconnect):
set session wait_timeout=3;
-- idle 6 seconds
select 1; -- expected: ERROR 2013 / Lost connection
We changed the default wait_timeout and interactive_timeout from 28800 to 86400 to align with the cloud policy and login flow. In cloud mode, SET GLOBAL for these variables is blocked, but timeout values are needed before tenant login, when tenant-specific configs are not yet available. So we use 86400 (24h) as a safe pre-login fallback, and then override session values with tenant settings from mo_mysql_compatibility_mode after login.