[Bugfix] Handle SocketException on accepted socket configuration#1648
Merged
hamdaankhalid merged 3 commits intoMar 30, 2026
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR hardens the TCP accept loop in GarnetServerTcp by ensuring post-accept socket configuration and handler registration failures don’t terminate the accept loop, disposing failed sockets/handlers and continuing to accept new connections.
Changes:
- Wrap accepted-socket configuration (e.g.,
NoDelay,RemoteEndPointaccess) inside the existing handler creation/registration try/catch. - Ensure sockets are disposed when handler creation never occurs (e.g., dead socket timing window).
- Make handler cleanup more explicit (avoid null-conditional disposal paths).
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
hamdaankhalid
force-pushed
the
hkhalid/more-tcp-fixes
branch
2 times, most recently
from
db8e542 to
65af274
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
When a client RSTs between accept completing and socket setup (e.g. NoDelay), the SocketException was unhandled and crashed the process. Wrap the post-accept socket configuration in a try/catch, dispose the dead socket, and continue the accept loop. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
hamdaankhalid
force-pushed
the
hkhalid/more-tcp-fixes
branch
from
65af274 to
f27d3e2
Compare
hamdaankhalid
commented
Mar 27, 2026
kevin-montrose
approved these changes
Mar 30, 2026
badrishc
approved these changes
Mar 30, 2026
vazois
pushed a commit
that referenced
this pull request
Apr 2, 2026
When a client RSTs between accept completing and socket setup (e.g. NoDelay), the SocketException was unhandled and crashed the process. Wrap the post-accept socket configuration in a try/catch, dispose the dead socket, and continue the accept loop. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
vazois
added a commit
that referenced
this pull request
Apr 2, 2026
* Add es-metadata.yml (#1641) * Fix INFO all/default/everything returning empty response (#1645) * Fix INFO all/default/everything returning empty response Implement support for INFO all, default, and everything options: - all: returns all DefaultInfo sections excluding module-generated ones - default: returns the default set of sections (same as no-arg INFO) - everything: returns all DefaultInfo sections including modules Added pre-declared HashSet collections (AllInfoSet, EverythingInfoSet) in GarnetInfoMetrics.cs derived from DefaultInfo to support these options. Updated InfoCommand.cs to use UnionWith with the new HashSets instead of silently skipping the ALL keyword. Added tests for all three options, verifying correct section inclusion/exclusion. Fixes #1643 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * make everything option use DefaultInfo * Add null/empty guard in GetSectionHeaders test helper Adds explicit asserts before splitting INFO output so test failures surface a clear message instead of a NullReferenceException. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * wip; restructuring cluster tests to reduce CI duration * separate dispose from close and configure socket to allow rapid connect * ensure socket is disposed succesfully * fix failing test * update global.json --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix revivification CLI flag ordering dependency (#1644) The validation in Options.GetServerOptions() checked the raw enableRevivification flag (from --reviv) instead of the computed useRevivBinsPowerOf2 state. This caused specifying --reviv alongside explicit --reviv-bin-record-sizes and --reviv-bin-record-counts to always fail, despite the --reviv help text documenting that it can be overridden by the combination of these flags. Changed the check from enableRevivification to useRevivBinsPowerOf2, which correctly reflects that --reviv-bin-record-sizes already overrides the power-of-2 default when present. Co-authored-by: Hamdaan Khalid <hkhalid@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Vasileios Zois <96085550+vazois@users.noreply.github.com> * [Bugfix] SortedSet Race Condition - Mutating under Shared Lock (#1642) * fixed * SortedSet Race Condition - Mutation under Shared Lock --------- Co-authored-by: Hamdaan Khalid <hkhalid@microsoft.com> Co-authored-by: Vasileios Zois <96085550+vazois@users.noreply.github.com> * Bugfix: Accept Loop socket error handling (#1646) * Bugfix Accept Loop * race condition and tiny loggin fix * Dispose potentially partial sockets. * Fix accept loop zombie state: tiered error handling with backoff retry The accept loop in GarnetServerTcp.HandleNewConnection previously treated all SocketError != Success as fatal, disposing the SocketAsyncEventArgs and permanently killing the accept loop. This left the server in a zombie state where existing connections worked but no new connections were accepted. Changes: - Extract HandleAcceptError with three-tier error categorization: - Tier 1 (fatal): OperationAborted, NotSocket, etc. — stop loop - Tier 2 (resource pressure): TooManyOpenSockets, NoBufferSpaceAvailable, etc. — backoff via Timer and retry (100ms initial, 5s cap) - Tier 3 (client-caused transient): ConnectionReset, etc. — log and continue - Add ScheduleAcceptRetry using Timer to avoid blocking IOCP threads - Dispose retry timer on server shutdown - Add AcceptLoopTests with RST flood and extended attack simulation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * PR comments * Nit * Nit * simplify greatly * easy win * small updates --------- Co-authored-by: Hamdaan Khalid <hkhalid@microsoft.com> Co-authored-by: Badrish Chandramouli <badrishc@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Vasileios Zois <96085550+vazois@users.noreply.github.com> * Skip Value Expiration Check When Scanning a Tombstoned Record (#1612) * fix migrate write test * prevent expiration check on tombstoned key while scanning * fix formatting * ensure reviv pause signal is observed through epoch protection * make revivPauseEvent readonly * Update test/Garnet.test.cluster/ClusterMigrateTests.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * addressing first comments * update comment in MigrateScanFunctions * release epoch when acquiring exlucisve SuspendConfigMerge lock * add ReaderWriterLock custom implementation * fix formatting * fixing simple tests * make pause reviv thread safe --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Bump picomatch from 2.3.1 to 2.3.2 in /website (#1649) Bumps [picomatch](https://github.com/micromatch/picomatch) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/micromatch/picomatch/releases) - [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md) - [Commits](micromatch/picomatch@2.3.1...2.3.2) --- updated-dependencies: - dependency-name: picomatch dependency-version: 2.3.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump brace-expansion from 1.1.12 to 1.1.13 in /website (#1651) Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.12 to 1.1.13. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@v1.1.12...v1.1.13) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.13 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Handle SocketException on accepted socket configuration (#1648) When a client RSTs between accept completing and socket setup (e.g. NoDelay), the SocketException was unhandled and crashed the process. Wrap the post-accept socket configuration in a try/catch, dispose the dead socket, and continue the accept loop. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix CLUSTER NODES and CLUSTER SHARDS metadata output (#1657) * Fix CLUSTER NODES and CLUSTER SHARDS metadata output (#1650) - CLUSTER NODES: Only append ,hostname when hostname is non-empty - CLUSTER SHARDS: Replace 'address' field with Redis-compatible 'ip', 'endpoint', and optional 'hostname' fields - CLUSTER SHARDS: Honor ClusterPreferredEndpointType for endpoint field (ip address when Ip, hostname when Hostname) - CLUSTER SHARDS: Fix role output to use 'master'/'slave' instead of enum names 'PRIMARY'/'REPLICA' - Update NodeInfo struct and ClusterShards parser in test utilities for dynamic key-value field parsing - Add ClusterShardsTest and ClusterNodesHostnameTest unit tests Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Refactor CLUSTER SLOTS/SHARDS to use StringBuilder Replace string concatenation with StringBuilder in GetShardsInfo, GetSlotsInfo, and their helper methods (AppendFormattedSlotInfo, AppendNodeNetworkingInfo) to reduce intermediate string allocations. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address PR review comments and fix endpoint validation - Fix endpoint validation (Options.cs): allow cluster-announce-ip when bind address is 0.0.0.0/:: (wildcard), since the server listens on all interfaces. Only require port match in that case. - Handle ClusterPreferredEndpointType.Unknown in CLUSTER SHARDS: set endpoint to '?' consistent with CLUSTER SLOTS and redirects. - Add ClusterShardsTest cases for Unknown endpoint type. - Improve ClusterNodesHostnameTest to handle both hostname-present and hostname-absent branches. - Add even-length guard and explicit role validation in ClusterShards test parser. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Badrish Chandramouli <badrishc@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Hamdaan Khalid <42720645+hamdaankhalid@users.noreply.github.com> Co-authored-by: Hamdaan Khalid <hkhalid@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Wrap the post-accept socket configuration in a try/catch, dispose the dead socket, and continue the accept loop. There is small gap where bad timing can still kill accept loop.