Protect logged exec spooling from no output #42177
Merged
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
This commit adds a guard around reading the spooled LoggedExec output. It is possible the exec command did not output anything, and failed, which would trigger a failure to read the output file.
|
Pinging @elastic/es-core-infra |
|
@elasticmachine run elasticsearch-ci/2 |
mark-vieira
approved these changes
May 16, 2019
| @@ -63,7 +63,10 @@ public void setSpoolOutput(boolean spoolOutput) { | |||
| out = new LazyFileOutputStream(spoolFile); | |||
| outputLogger = logger -> { | |||
| try { | |||
| Files.lines(spoolFile.toPath()).forEach(logger::error); | |||
| // the file may not exist if the command never output anything | |||
| if (Files.exists(spoolFile.toPath())) { | |||
There was a problem hiding this comment.
Is there any real benefit in doing Files.exists(spoolFile.toPath) vs simply spoolFile.exists()?
rjernst
added a commit
that referenced
this pull request
May 16, 2019
This commit adds a guard around reading the spooled LoggedExec output. It is possible the exec command did not output anything, and failed, which would trigger a failure to read the output file.
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
This commit adds a guard around reading the spooled LoggedExec output. It is possible the exec command did not output anything, and failed, which would trigger a failure to read the output file.
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.
This commit adds a guard around reading the spooled LoggedExec output.
It is possible the exec command did not output anything, and failed,
which would trigger a failure to read the output file.