Unmute docker tests, add more logging and increase startup timeout #131203
There are no files selected for viewing
This file contains hidden or 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 file contains hidden or 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 file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -151,7 +151,19 @@ private static HttpResponse execute(Request request, String username, String pas | |
| executor.auth(username, password); | ||
| executor.authPreemptive(new HttpHost("localhost", 9200)); | ||
| } | ||
| try { | ||
| return executor.execute(request).returnResponse(); | ||
| } catch (Exception e) { | ||
| logger.warn( | ||
| "Failed to execute request [{}] with username/password [{}/{}] and caCert [{}]", | ||
| request.toString(), | ||
| username, | ||
| password, | ||
| caCert, | ||
| e | ||
| ); | ||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| // polls every two seconds for Elasticsearch to be running on 9200 | ||
|
|
@@ -239,14 +251,13 @@ public static void waitForElasticsearch( | |
| long timeElapsed = 0; | ||
| boolean started = false; | ||
| Throwable thrownException = null; | ||
|
|
||
| while (started == false && timeElapsed < waitTime) { | ||
| if (System.currentTimeMillis() - lastRequest > requestInterval) { | ||
| if (caCert == null) { | ||
| caCert = getCaCert(installation); | ||
|
There was a problem hiding this comment. In case of slow auto-configuration, the HTTP CA certificate may not have been configured when |
||
| } | ||
| try { | ||
| final HttpResponse response = execute( | ||
| Request.Get((caCert != null ? "https" : "http") + "://localhost:9200/_cluster/health") | ||
| .connectTimeout((int) timeoutLength) | ||
|
|
@@ -277,7 +288,7 @@ public static void waitForElasticsearch( | |
| } | ||
| started = true; | ||
|
|
||
| } catch (Exception e) { | ||
| if (thrownException == null) { | ||
| thrownException = e; | ||
| } else { | ||
|
|
||
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some of the uncaught docker failures did not include any cluster logs, which makes it super hard to troubleshoot.