fix: prevent crash when disconnecting etcd connection#456
Merged
Conversation
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
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
Fixes a crash (
EXC_CRASH SIGABRT) when disconnecting an etcd connection while requests are in-flight (ping, watch, or auth).Root cause:
EtcdHttpClient.disconnect()callssession.invalidateAndCancel(), but in-flight async requests had already captured theURLSessionreference outside the lock. When the continuation closure later callssession.dataTask(with:)on the invalidated session, CFNetwork throws an Objective-CNSException— which is uncatchable by Swiftdo/catch— causingabort().Fix: Added a
sessionGenerationcounter that increments on disconnect. All threedataTaskcreation sites (performRequest,watch,authenticate) now re-acquire the lock and verify the generation matches before callingdataTask. If the session was invalidated, they throwEtcdError.notConnectedinstead of crashing.Crash sites fixed (all in
EtcdHttpClient.swift):performRequest— line 717 (general API calls, ping)watch— line 574 (key watch long-poll)authenticate— line 817 (token refresh)Test plan