SNTConfigurator: skip override-file watcher when overrides disabled#936
Merged
Conversation
The DEBUG-only override-file watcher was dispatched onto a global queue unconditionally and held `self` in a polling loop. Under xctest's `--runs_per_test`, the worker block survived bundle teardown and aborted on `objc_msgSend` to a now-unloaded class, manifesting as a 1/25 flake in DaemonConfigBundleTest. Gate the dispatch on the same xctest+ENABLE_CONFIG_OVERRIDES check that already short-circuits applyOverrides:, lifted into a shared overridesEnabled helper so both call sites can't drift.
Contributor
russellhancox
approved these changes
May 8, 2026
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.
The DEBUG-only override-file watcher was dispatched onto a global queue unconditionally and held
selfin a polling loop. Under xctest's--runs_per_test, the worker block survived bundle teardown and aborted onobjc_msgSendto a now-unloaded class, manifesting as a 1/25 flake in DaemonConfigBundleTest.Gate the dispatch on the same xctest+ENABLE_CONFIG_OVERRIDES check that already short-circuits applyOverrides:, lifted into a shared overridesEnabled helper so both call sites can't drift.