ROVER-280 Fix Adding Subgraphs Semantics #2358
Merged
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.
In the original code even though we reported errors with and the subgraph was ostensibly "removed", it was retained inside an internal data structure within the SupergraphConfigWatcher and so when changes were made they were not seen properly and thus not acted on.
In addition there were issues with adding a subgraph where file watchers were getting dropped too early, because of the use of a DropGuard in one of the Watcher objects, I've removed this idiom and instead added a series of cancellation tokens throughout, rather than relying on abort handles. This has the added benefit that cancellation is much more controlled and cascades in a better way than consistently trying to ensure all the right abort handles get called.