-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: parallel plan and apply also in a single workspace (rebased) #5264
base: main
Are you sure you want to change the base?
Conversation
I'm not sure what the etiquette is around signing off on this as the committer given that I just rebased someone else's work from their own MR. |
just sign it with yours |
We generate a list of all interesting directories, so we can target the locks to the affected directories instead of using a (too) global lock Signed-Off-By: Andrew Carter <andrew@emailcarter.com>
There is a race condition here where we test if we are current, and only then if we are not current we grab the lock. In the meantime, that information could be stale. Extend the lock to cover all operations, and unconditionally wait for the lock. We can't assume anything can be skipped if we have to wait for the lock. Signed-Off-By: Andrew Carter <andrew@emailcarter.com>
All Clone() calls that have signaled an interest in merging before another Clone() checks whether a merge is necessary can skip their own checks. This should reduce the thundering herd problem at the beginning of large paralell runs. Signed-Off-By: Andrew Carter <andrew@emailcarter.com>
Clone is now a NOP if the PR has not changed, and loses its second return value, the MergedAgain flag. MergeAgain must be called explicitly in the only location that cares about this flag, just before planning. This cleans up the code for Clone and re-merging a bit. Also regenerated mocks Signed-Off-By: Andrew Carter <andrew@emailcarter.com>
671efda
to
cde1fe5
Compare
While we wait on this to get merged, we wanted to test running it locally. Are the images built, ever pushed to ghcr?
|
sha256:5f2412560425761d177fab5e1e878e3d9e08c0bce7a248d65eff88efde593b84 |
Any chance you can paste syntax on this? Everything Im attempting is apparently wrong. |
what
@finnag did all the real work here. I just rebased and regenerated mocks. I'm new to this codebase, but I've reviewed the code and it seems reasonable to me, and I've reviewed all the commits between October and today and I see no logical conflicts. If in fresh review any changes are needed, I'm happy to do so.
From the original PR description:
why
tests
I ran
make test-all fmt lint
references
This is just #3670 rebased