Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import io.airlift.jaxrs.JaxrsModule;
import io.airlift.jmx.testing.TestingJmxModule;
import io.airlift.json.JsonModule;
import io.airlift.log.Logger;
import io.airlift.node.testing.TestingNodeModule;
import io.airlift.tracetoken.TraceTokenModule;
import io.trino.connector.CatalogName;
Expand Down Expand Up @@ -96,6 +97,8 @@
import io.trino.testing.TestingWarningCollectorModule;
import io.trino.transaction.TransactionManager;
import io.trino.transaction.TransactionManagerModule;
import net.jodah.failsafe.Failsafe;
import net.jodah.failsafe.RetryPolicy;
import org.weakref.jmx.guice.MBeanModule;

import javax.annotation.concurrent.GuardedBy;
Expand All @@ -120,6 +123,7 @@

import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.nullToEmpty;
import static com.google.common.base.Throwables.getStackTraceAsString;
import static com.google.common.io.MoreFiles.deleteRecursively;
import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
import static com.google.inject.util.Modules.EMPTY_MODULE;
Expand All @@ -133,6 +137,8 @@
public class TestingTrinoServer
implements Closeable
{
private static final Logger log = Logger.get(TestingTrinoServer.class);

public static TestingTrinoServer create()
{
return builder().build();
Expand Down Expand Up @@ -286,17 +292,17 @@ private TestingTrinoServer(

modules.add(additionalModule);

Bootstrap app = new Bootstrap(modules.build());

Map<String, String> optionalProperties = new HashMap<>();
environment.ifPresent(env -> optionalProperties.put("node.environment", env));

injector = app
.doNotInitializeLogging()
.setRequiredConfigurationProperties(serverProperties.buildOrThrow())
.setOptionalConfigurationProperties(optionalProperties)
.quiet()
.initialize();
injector = Failsafe.with(new RetryPolicy<>()
.withMaxRetries(5)
.handleIf(throwable -> getStackTraceAsString(throwable).contains("BindException: Address already in use"))
.onRetry(event -> log.debug(
"Initialization failed on attempt %s, will retry. Exception: %s",
event.getAttemptCount(),
event.getLastFailure().getMessage())))
.get(() -> initialize(serverProperties.buildOrThrow(), modules.build(), optionalProperties));

injector.getInstance(Announcer.class).start();

Expand Down Expand Up @@ -363,6 +369,16 @@ private TestingTrinoServer(
refreshNodes();
}

private static Injector initialize(Map<String, String> serverProperties, List<Module> modules, Map<String, String> optionalProperties)
{
return new Bootstrap(modules)
.doNotInitializeLogging()
.setRequiredConfigurationProperties(serverProperties)
.setOptionalConfigurationProperties(optionalProperties)
.quiet()
.initialize();
}

@Override
public void close()
throws IOException
Expand Down