HPCC-16120 Fix type causing regression in init_thor script #9028
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 section of code for kill_slaves relies on the uslaves file being present. Yet in the frunssh call we use the slaves file for our ip list, unlike every other frunssh call where we rely on the uslaves file. This was causing issues where the uslaves file would be present, but a previous failure to connect to the slave machines would erase the slaves file (as was intended), and cause the startup to always fail. The fix is to use the uslaves file, as was originally intended. If there is a failure to connect to the slave machines to stop the slaves, we want the uslaves file to remain in the instancedir so we can try again on the next startup attempt. Signed-off-by: Michael Gardner <michael.gardner@lexisnexis.com>
|
https://track.hpccsystems.com/browse/HPCC-16120 |
|
@jakesmith please review |
|
Automated Smoketest HPCC Stop: OK |
|
Looks good. @richardkchapman - ready to merge. |
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.
The section of code for kill_slaves relies on the uslaves file
being present. Yet in the frunssh call we use the slaves file
for our ip list, unlike every other frunssh call where we rely on
the uslaves file. This was causing issues where the uslaves file
would be present, but a previous failure to connect to the slave
machines would erase the slaves file (as was intended), and cause
the startup to always fail.
The fix is to use the uslaves file, as was originally intended.
If there is a failure to connect to the slave machines to stop the
slaves, we want the uslaves file to remain in the instancedir so
we can try again on the next startup attempt.
Signed-off-by: Michael Gardner michael.gardner@lexisnexis.com