Shorten fallback to another strategy #4386
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
added 2 commits
August 20, 2021 10:20
When a strategy chosen based on the configuration failed, there should be no point in checking it again based on the list of all available strategies.
bsideup
reviewed
Aug 20, 2021
| @@ -136,6 +136,7 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie | |||
| .peek(strategy -> log.info("Loaded {} from ~/.testcontainers.properties, will try it first", strategy.getClass().getName())), | |||
| strategies | |||
| .stream() | |||
| .filter(c -> !c.getClass().getCanonicalName().equals(TestcontainersConfiguration.getInstance().getDockerClientStrategyClassName())) | |||
There was a problem hiding this comment.
Suggested change
| .filter(c -> !c.getClass().getCanonicalName().equals(TestcontainersConfiguration.getInstance().getDockerClientStrategyClassName())) | |
| .filter(it -> !it.getClass().getCanonicalName().equals(TestcontainersConfiguration.getInstance().getDockerClientStrategyClassName())) |
There was a problem hiding this comment.
Also, please extract TestcontainersConfiguration.getInstance().getDockerClientStrategyClassName() variable - used in two places (see Stream.of)
artjomka
reviewed
Aug 20, 2021
| @@ -145,7 +146,7 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie | |||
|
|
|||
| Info info; | |||
| try { | |||
| info = Unreliables.retryUntilSuccess(30, TimeUnit.SECONDS, () -> { | |||
| info = Unreliables.retryUntilSuccess(5, TimeUnit.SECONDS, () -> { | |||
There was a problem hiding this comment.
This may not be a bad idea, actually 👍
There was a problem hiding this comment.
Perhaps, besides making the default timeout much shorter, we could also make it configurable (again)? So for people who need different TO (due to whatever reason) the would be an option?
bsideup
approved these changes
Sep 1, 2021
rnorth
approved these changes
Sep 1, 2021
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.
It's about two things: