(PE-14934) Add more robust puppetdb check #3
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
| while not match | ||
| output = on(host, "curl -s http://localhost:8080/pdb/meta/v1/version", :accept_all_exit_codes => true) | ||
| match = output.stdout =~ /version.*\d+\.\d+\.\d+/ | ||
| sleep 1 |
|
Can one of the admins verify this patch? |
Before this commit we were still failing before the last puppet agent run in do_install because we also run puppet agent in some cases before the last run. This commit adds in the wait during that agent run as well as a check on the status endpoint in puppetdb to be sure that it is running in the case that the port is open but puppetdb is not ready for requests.
demophoon
force-pushed
the
fix/master/pe-14934-robust-puppetdb-check
branch
from
77dd844 to
7112971
Compare
|
Ok, we have a version up with checks in both the secondary and final agent runs, with looping, and a 60 second timeout, and which respects the previous version checks while also only performing the status check on a 2016.1.x+ build. Britt's doing a final test run of this now. |
|
Install test passed on 2016.1 using |
| @@ -540,6 +547,22 @@ def install_pe | |||
| install_pe_on(hosts, options) | |||
| end | |||
|
|
|||
| def check_puppetdb_status_endpoint(host) | |||
| if version_is_less(host['pe_ver'], '2016.1.0') | |||
There was a problem hiding this comment.
You could inline this conditional.
|
👍 |
|
@demophoon no real problems with this PR, I'm ready to merge once your own test has been verified. |
|
Tests when installing 2015.3.3 are green!! |
|
|
jpartlow
referenced
this pull request
in jpartlow/beaker-pe
May 11, 2016
Introduced chagnes to the do_install method, but specs were failing because of the tight coupling between expectations and counts of command execution. The need to initialize metadata comes from the fact that the previous PR #3 added step() calls, which reference the TestCase metadata attr. Since we aren't using an actual TestCase instance, this had to be initalized separately.
jpartlow
referenced
this pull request
in jpartlow/beaker-pe
May 26, 2016
Introduced chagnes to the do_install method, but specs were failing because of the tight coupling between expectations and counts of command execution. The need to initialize metadata comes from the fact that the previous PR #3 added step() calls, which reference the TestCase metadata attr. Since we aren't using an actual TestCase instance, this had to be initalized separately.
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.
Before this commit we were still failing before the last puppet agent
run in do_install because we also run puppet agent in some cases before
the last run. This commit adds in the wait during that agent run as well
as a check on the status endpoint in puppetdb to be sure that it is
running in the case that the port is open but puppetdb is not ready for
requests.