Resolve Prometheus dependency for IT on non-Linux OS. #152
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
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
This comment was marked as spam.
This comment was marked as spam.
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
acarbonetto
reviewed
Nov 2, 2022
| @@ -85,9 +88,11 @@ task stopPrometheus() { | |||
| } | |||
|
|
|||
| stopPrometheus.mustRunAfter startPrometheus | |||
| doctest.dependsOn startOpenSearch | |||
| if (DefaultNativePlatform.currentOperatingSystem.isLinux()) { | |||
There was a problem hiding this comment.
Thank you!
Can you include a comment saying why we don't run prometheus on non-Linux systems.
There was a problem hiding this comment.
I'll be happy to know why...
acarbonetto
approved these changes
Nov 2, 2022
| dependsOn startPrometheus | ||
| finalizedBy stopPrometheus | ||
|
|
||
| if (DefaultNativePlatform.currentOperatingSystem.isLinux()) { |
There was a problem hiding this comment.
Same here. Maybe a comment why we don't run this for non-Linux.
Someone might ask why don't we support promethius for all OSes
| @@ -66,6 +66,9 @@ protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOE | |||
| } | |||
|
|
|||
| protected static void wipeAllOpenSearchIndices() throws IOException { | |||
| if (client() == null) { | |||
There was a problem hiding this comment.
feels like this check should be moved to RestIntegTestCase::cleanUpIndices and SQLIntegTestCase::cleanUpIndices (those classes already check for client() on setup)
MaxKsyunz
reviewed
Nov 3, 2022
integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
GumpacG
approved these changes
Nov 4, 2022
forestmvey
approved these changes
Nov 9, 2022
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
|
Not relevant since opensearch-project#1069 |
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.
Signed-off-by: Yury-Fridlyand yuryf@bitquilltech.com
Description
Unblock tests from Prometheus dependency - it is available on Linux only:
Issues Resolved
Proposed as a temporary solution while opensearch-project#982 isn't fixed.
Introduced by opensearch-project#977.
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.