Connect directly to Docker containers in benchmark mode (#532)

polypheny · Jan 7, 2025 · 4461bcf · 4461bcf
1 parent 70bfa21
commit 4461bcf
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/core/src/main/java/org/polypheny/db/config/RuntimeConfig.java b/core/src/main/java/org/polypheny/db/config/RuntimeConfig.java
@@ -495,17 +495,27 @@ public enum RuntimeConfig {
             "WARNING! YOU SHOULD NOT BE SEEING THIS",
             ConfigType.STRING
     ),
+
     DOCKER_TIMEOUT(
             "runtime/dockerTimeout",
             "Connection and respones timeout for autodocker.",
             45,
             ConfigType.INTEGER
     ),
+
+    DOCKER_DIRECT_CONNECTION(
+            "runtime/dockerDirectConnection",
+            "Use direct connections to Docker containers in benchmark mode.",
+            true,
+            ConfigType.BOOLEAN
+    ),
+
     SERIALIZATION_BUFFER_SIZE(
             "runtime/serialization",
             "How big the buffersize for catalog objects should be.",
             200000,
             ConfigType.INTEGER ),
+
     LOCKING_MAX_TIMEOUT_SECONDS(
             "runtime/maxTimeout",
             "How long a transactions should wait for a lock until it is aborted",

diff --git a/core/src/main/java/org/polypheny/db/docker/DockerContainer.java b/core/src/main/java/org/polypheny/db/docker/DockerContainer.java
@@ -16,6 +16,12 @@
 
 package org.polypheny.db.docker;
 
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,6 +32,7 @@
 import java.net.SocketException;
 import java.net.StandardSocketOptions;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -243,13 +250,39 @@ private ServerSocket startServer( int port ) {
 
 
     public HostAndPort connectToContainer( int port ) {
+        if ( Catalog.mode == RunMode.BENCHMARK && RuntimeConfig.DOCKER_DIRECT_CONNECTION.getBoolean() ) {
+            log.warn( "Using direct Docker connection in benchmark mode" );
+            return connectToContainerDirectly( port );
+        }
+
         synchronized ( this ) {
             ServerSocket s = proxies.computeIfAbsent( port, this::startServer );
             return new HostAndPort( s.getInetAddress().getHostAddress(), s.getLocalPort() );
         }
     }
 
 
+    public HostAndPort connectToContainerDirectly( int port ) {
+        DockerClientConfig config = DefaultDockerClientConfig
+                .createDefaultConfigBuilder()
+                .build();
+
+        ApacheDockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
+                .dockerHost( config.getDockerHost() )
+                .sslConfig( config.getSSLConfig() )
+                .responseTimeout( Duration.ofSeconds( RuntimeConfig.DOCKER_TIMEOUT.getInteger() ) )
+                .connectionTimeout( Duration.ofSeconds( RuntimeConfig.DOCKER_TIMEOUT.getInteger() ) )
+                .build();
+
+        DockerClient client = DockerClientImpl.getInstance( config, httpClient );
+
+        InspectContainerResponse resp = client.inspectContainerCmd( this.containerId ).exec();
+
+        String ip = resp.getNetworkSettings().getNetworks().get( "polypheny-internal" ).getIpAddress();
+        return new HostAndPort( ip, port );
+    }
+
+
     /**
      * The container gets probed until the defined ready supplier returns true or the timeout is reached
      */