fix(core): handle file change conflicts between sync generators #27695
Conversation
This file contains 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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎ 1 Skipped Deployment
|
☁️ Nx Cloud ReportCI is running/has finished running commands for commit 9fdc29d. As they complete they will appear below. Click to see the status, the terminal output, and the build insights. 📂 See all runs for this CI Pipeline Execution ✅ Successfully ran 4 targets
Sent with 💌 from NxCloud. |
FrozenPandaz
approved these changes
Aug 29, 2024
FrozenPandaz
pushed a commit
that referenced
this pull request
Sep 3, 2024
<!-- Please make sure you have read the submission guidelines before posting an PR --> <!-- https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr --> <!-- Please make sure that your commit message follows our format --> <!-- Example: `fix(nx): must begin with lowercase` --> <!-- If this is a particularly complex change or feature addition, you can request a dedicated Nx release for this pull request branch. Mention someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they will confirm if the PR warrants its own release for testing purposes, and generate it for you if appropriate. --> ## Current Behavior <!-- This is the behavior we have today --> When running sync generators in the background (daemon) to cache the results for when needed, they are isolated from each other (each run with its own `Tree`). This is done because there's no guarantee which sync generator will be run together since that would depend on each specific task graph being run. When a task is run, a task graph is constructed, and sync generators are collected from it and run/retrieved from the cache. Currently, when we run a task and ask the daemon to run the relevant generators, if there are cached results for a generator that ran in isolation, we return it. We don't check if its file changes conflict with those of another generator included in the task graph. This results in the changes for those conflicting files of the first generator getting overwritten by the changes of the second generator. ## Expected Behavior <!-- This is the behavior we should expect with the changes in this PR --> When running tasks for which there are conflicting file changes between generators in the daemon, the conflicting generators should be re-run sequentially using the same `Tree` to guarantee that file changes are not overwritten and lost. ## Related Issue(s) <!-- Please link the issue being fixed so it gets closed when this is merged. --> <!-- Fixes NXC-903 --> Fixes # (cherry picked from commit 3562131)
|
This pull request has already been merged/closed. If you experience issues related to these changes, please open a new issue referencing this pull request. |
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.
Current Behavior
When running sync generators in the background (daemon) to cache the results for when needed, they are isolated from each other (each run with its own
Tree). This is done because there's no guarantee which sync generator will be run together since that would depend on each specific task graph being run. When a task is run, a task graph is constructed, and sync generators are collected from it and run/retrieved from the cache.Currently, when we run a task and ask the daemon to run the relevant generators, if there are cached results for a generator that ran in isolation, we return it. We don't check if its file changes conflict with those of another generator included in the task graph. This results in the changes for those conflicting files of the first generator getting overwritten by the changes of the second generator.
Expected Behavior
When running tasks for which there are conflicting file changes between generators in the daemon, the conflicting generators should be re-run sequentially using the same
Treeto guarantee that file changes are not overwritten and lost.Related Issue(s)
Fixes #