Handle OS pretty name on old OS without OS release #35453
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
Some very old ancient versions of Linux do not have /etc/os-release. For example, old Red Hat-like OS. This commit adds a fallback for handling pretty name for these OS.
jasontedor
added
:Data Management/Stats
|
Pinging @elastic/es-core-infra |
romseygeek
reviewed
Nov 12, 2018
| * The lines from {@code /etc/os-release} or {@code /usr/lib/os-release} as a fallback. These file represents identification of the | ||
| * underlying operating system. The structure of the file is newlines of key-value pairs of shell-compatible variable assignments. | ||
| * The lines from {@code /etc/os-release} or {@code /usr/lib/os-release} as a fallback, with an additional fallback to | ||
| * {@code /etc/system-release}. These file represents identification of the underlying operating system. The structure of the file is |
There was a problem hiding this comment.
nit: s/These file represents/These files represent/
| List<String> readOsRelease() throws IOException { | ||
| final List<String> lines; | ||
| if (Files.exists(PathUtils.get("/etc/os-release"))) { | ||
| lines = Files.readAllLines(PathUtils.get("/etc/os-release")); | ||
| } else { | ||
| assert lines != null && lines.isEmpty() == false; |
There was a problem hiding this comment.
Do we want to have this as an assertion or as an IllegalStateException or similar? If a user runs this on some weird Linux distribution that has an empty file here they might get odd errors later on, although I suppose you could argue that if they're not running on a supported OS then they're on their own anyway.
There was a problem hiding this comment.
Exactly, we code for the platforms that we support and use these assertions to ensure that everything is as expected on those platforms.
romseygeek
approved these changes
Nov 12, 2018
| * The lines from {@code /etc/os-release} or {@code /usr/lib/os-release} as a fallback. These file represents identification of the | ||
| * underlying operating system. The structure of the file is newlines of key-value pairs of shell-compatible variable assignments. | ||
| * The lines from {@code /etc/os-release} or {@code /usr/lib/os-release} as a fallback, with an additional fallback to | ||
| * {@code /etc/system-release}. These files represents identification of the underlying operating system. The structure of the file is |
There was a problem hiding this comment.
nanonit: s/represents/represent/
:)
There was a problem hiding this comment.
Thanks for double-checking. 😄
| List<String> readOsRelease() throws IOException { | ||
| final List<String> lines; | ||
| if (Files.exists(PathUtils.get("/etc/os-release"))) { | ||
| lines = Files.readAllLines(PathUtils.get("/etc/os-release")); | ||
| } else { | ||
| assert lines != null && lines.isEmpty() == false; |
* master: Address handling of OS pretty name on some OS (elastic#35451) HLRC support for getTask (elastic#35166) upgrade to lucene-8.0.0-snapshot-6d9c714052 (elastic#35428) Add docs for CCR stats API (elastic#35439) Fix the names of CCR stats endpoints in usage API (elastic#35438) Switch to default to no build qualifier (elastic#35415) Clarify S3 repository storage class parameter (elastic#35400) SQL: Fix query translation for scripted queries (elastic#35408) [TEST] Instead of ignoring the ccr downgrade to basic license qa test avoid the assertions that check the log files, because that does not work on Windows. The rest of the test is still useful and should work on Windows CI. Upgrade to Joda 2.10.1 (elastic#35410) HLRest: model role and privileges (elastic#35128)
|
@elasticmachine run gradle build tests |
|
@elasticmachine run gradle builds tests |
jasontedor
added a commit
that referenced
this pull request
Nov 13, 2018
Some very old ancient versions of Linux do not have /etc/os-release. For example, old Red Hat-like OS. This commit adds a fallback for handling pretty name for these OS.
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Nov 13, 2018
* master: (22 commits) Introduce CCR getting started guide (elastic#35434) Correct typo in BuildPlugin exception message (elastic#35458) Correct implemented interface of ParsedReverseNested (elastic#35455) [ML] Fix find_file_structure NPE with should_trim_fields (elastic#35465) Handle OS pretty name on old OS without OS release (elastic#35453) Register remote cluster compress setting (elastic#35464) [DOCS] Clarify results_index_name description (elastic#35463) [TEST] add missing doc tests for HLRC GetRollupIndexCaps API [HLRC] Add GetRollupIndexCaps API (elastic#35102) Geo: enables coerce support in WKT polygon parser (elastic#35414) [ILM] fix retry so it picks up latest policy and executes async action (elastic#35406) Address handling of OS pretty name on some OS (elastic#35451) HLRC support for getTask (elastic#35166) upgrade to lucene-8.0.0-snapshot-6d9c714052 (elastic#35428) Add docs for CCR stats API (elastic#35439) Fix the names of CCR stats endpoints in usage API (elastic#35438) Switch to default to no build qualifier (elastic#35415) Clarify S3 repository storage class parameter (elastic#35400) SQL: Fix query translation for scripted queries (elastic#35408) [TEST] Instead of ignoring the ccr downgrade to basic license qa test avoid the assertions that check the log files, because that does not work on Windows. The rest of the test is still useful and should work on Windows CI. ...
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.
Some very old ancient versions of Linux do not have /etc/os-release. For example, old Red Hat-like OS. This commit adds a fallback for handling pretty name for these OS.
Closes #35440