Persist automatic entity merges #29568
Open
+362
−167
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
github-actions
bot
added
the
hashicorp-contributed-pr
biazmoreira
force-pushed
the
biazmoreira/invalidate-merge
branch
4 times, most recently
from
22f00d2 to
4f904f8
Compare
biazmoreira
force-pushed
the
biazmoreira/invalidate-merge
branch
2 times, most recently
from
bc4fb3f to
53b7098
Compare
|
CI Results: |
|
Build Results: |
biazmoreira
force-pushed
the
biazmoreira/invalidate-merge
branch
from
53b7098 to
6e4a30c
Compare
mpalmi
reviewed
Feb 19, 2025
Comment on lines
+1451
to
+1461
| repeats := 50 | ||
|
|
||
| for name, flags := range tests { | ||
| t.Run(t.Name()+"-"+name, func(t *testing.T) { | ||
| // Create a random source specific to this test case so every test case | ||
| // starts out from the identical random state given the same seed. We do | ||
| // want each iteration to explore different path though so we do it here | ||
| // not inside the test func. | ||
| seed := rand.New(rand.NewSource(seedval)) // Seed for deterministic test | ||
| flags.seed = seed | ||
|
|
There was a problem hiding this comment.
Do you think we should keep this?
There was a problem hiding this comment.
I don't mind removing it, but it has helped us find problems earlier by running different seeds as part of the same test.
There was a problem hiding this comment.
No worries either way -- I don't insist! In my mind we could accomplish the same thing by using untilfail, but it may also be useful to have multiple test runs.
My only concerns are:
- Test bloat on this runner.
- Potential for no net-gain having this in CI, since we retry failures to weed out flakes, and that might mask a failing seed.
biazmoreira
force-pushed
the
biazmoreira/invalidate-merge
branch
2 times, most recently
from
e033f74 to
9af56aa
Compare
biazmoreira
force-pushed
the
biazmoreira/invalidate-merge
branch
from
9af56aa to
e180ae7
Compare
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.
Description
This PR adds persistence to automatic merges of entities. Before, this was only happening in cache and could cause non-deterministic behavior, whereas multiple nodes had a different view of cache.
TODO only if you're a HashiCorp employee
backport/label that matches the desired release branch. Note that in the CE repo, the latest release branch will look likebackport/x.x.x, but older release branches will bebackport/ent/x.x.x+ent.of a public function, even if that change is in a CE file, double check that
applying the patch for this PR to the ENT repo and running tests doesn't
break any tests. Sometimes ENT only tests rely on public functions in CE
files.
in the PR description, commit message, or branch name.
description. Also, make sure the changelog is in this PR, not in your ENT PR.