Skip to content
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

once-wait-conflict #1227

Merged
merged 2 commits into from Jul 8, 2019
Merged

once-wait-conflict #1227

merged 2 commits into from Jul 8, 2019

Conversation

eikenb
Copy link
Contributor

@eikenb eikenb commented Jul 3, 2019

fix -once to ignore wait/quiescence timers

addresses issues: #1196, #1207, #1209

Wait timers disabled so that it blocks on all dependencies, completing
the template execution only once it has all the data. Keeps it from
returning before all dependencies have returned.

Note it is treating the logic here at configuration time, so it disables
any configured Wait settings if it gets -once.

Include documentation updates and tests.

Refactors use of `once` variables to make them part of the config setup.

Fixes #1196, fixes #1207, fixes #1209
When configs don't match output a simple diff of the 2 configs instead
of just dumping both of them. Much easier to read to find errors.

Also added nil guards on config Copy/Finalize to get parity with Merge
and to eliminate need for checks in tests.
@eikenb eikenb requested review from a team July 4, 2019 02:04
@eikenb eikenb added this to the v0.20.1 milestone Jul 4, 2019
@eikenb eikenb added the bug label Jul 4, 2019
Copy link

@freddygv freddygv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me @eikenb.

My only suggestion is that It would help if the PR name had a description rather than the issue number. It's a little easier to get to the issue if it's linked to from the PR comment as was done here:
hashicorp/envconsul#208

@eikenb eikenb changed the title Issue1196 once-wait-conflict Jul 8, 2019
@eikenb
Copy link
Contributor Author

eikenb commented Jul 8, 2019

Thanks @freddygv! I updated the PR name to be more descriptive as suggested and added the related issues to the description (didn't use the Fixes syntax as that's already in a commit).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants