Merge pull request #267 from ydb-platform/fix_concurrent_tests

Added experimental option to use native docker port binding
ydb-platform · Apr 27, 2024 · f8dcaee · f8dcaee
2 parents 4951bec + 146a73c
commit f8dcaee
Show file tree

Hide file tree

Showing 19 changed files with 583 additions and 43 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -19,7 +19,7 @@ jobs:
         java: [ '8', '11', '17']
 
     env:
-        MAVEN_ARGS: --batch-mode --update-snapshots -Dstyle.color=always
+        MAVEN_ARGS: --batch-mode --update-snapshots -Dstyle.color=always -DYDB_DOCKER_ISOLATION=true
 
     steps:
       - uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
     needs: build
 
     env:
-        MAVEN_ARGS: --batch-mode --update-snapshots -Dstyle.color=always
+        MAVEN_ARGS: --batch-mode --update-snapshots -Dstyle.color=always -DYDB_DOCKER_ISOLATION=true
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,7 +19,7 @@ jobs:
         java: [ '8', '11', '17']
 
     env:
-        MAVEN_ARGS: --batch-mode --update-snapshots -Dstyle.color=always
+        MAVEN_ARGS: --batch-mode --update-snapshots -Dstyle.color=always -DYDB_DOCKER_ISOLATION=true
 
     steps:
       - uses: actions/checkout@v4
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: ydb-platform/ydb-java-examples
-          ref: develop
+          ref: master
           path: examples
 
       - name: Download dependencies

diff --git a/coordination/pom.xml b/coordination/pom.xml
@@ -47,6 +47,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <environmentVariables>
+                        <YDB_DOCKER_IMAGE>cr.yandex/yc/yandex-docker-local-ydb:trunk</YDB_DOCKER_IMAGE>
+                        <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
+                    </environmentVariables>
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/core/src/main/java/tech/ydb/core/impl/pool/EndpointPool.java b/core/src/main/java/tech/ydb/core/impl/pool/EndpointPool.java
@@ -83,7 +83,7 @@ public List<EndpointRecord> setNewState(String selfLocation, List<EndpointRecord
             String hostAndPort = endpoint.getHostAndPort();
 
             if (!newRecordsByEndpoint.containsKey(hostAndPort)) {
-                logger.debug("added endpoint {}", entry);
+                logger.debug("added endpoint {}", endpoint);
                 newRecordsByEndpoint.put(hostAndPort, entry);
                 if (endpoint.getNodeId() != 0) {
                     newRecordsByNodeId.put(endpoint.getNodeId(), entry);

diff --git a/tests/common/pom.xml b/tests/common/pom.xml
@@ -61,12 +61,12 @@
                     <!-- Test env variables for unit tests -->
                     <environmentVariables>
                         <TEST_VAR1>var1</TEST_VAR1>
-                        <!-- TEST_VAR2 isnot set -->
+                        <!-- TEST_VAR2 is not set -->
                         <TEST_VAR3></TEST_VAR3>
                         <TEST_VAR4>true</TEST_VAR4>
                         <TEST_VAR5>true1</TEST_VAR5>
 
-                        <YDB_DISABLE_INTEGRATION_TESTS>true</YDB_DISABLE_INTEGRATION_TESTS>
+                        <YDB_DOCKER_ISOLATION>true</YDB_DOCKER_ISOLATION>
                     </environmentVariables>
                 </configuration>
             </plugin>

diff --git a/tests/common/src/main/java/tech/ydb/test/integration/YdbEnvironment.java b/tests/common/src/main/java/tech/ydb/test/integration/YdbEnvironment.java
@@ -24,6 +24,7 @@ public class YdbEnvironment {
 
     private final Supplier<Boolean> cleanUpTests = createParam("YDB_CLEAN_UP", true);
     private final Supplier<Boolean> disableIntegrationTests = createParam("YDB_DISABLE_INTEGRATION_TESTS", false);
+    private final Supplier<Boolean> useDockerIsolation = createParam("YDB_DOCKER_ISOLATION", false);
 
     public String ydbEndpoint() {
         return ydbEndpoint.get();
@@ -69,6 +70,10 @@ public boolean disableIntegrationTests() {
         return disableIntegrationTests.get();
     }
 
+    public boolean useDockerIsolation() {
+        return useDockerIsolation.get();
+    }
+
     private Supplier<String> createParam(String key, String defaultValue) {
         return Suppliers.memoize(() -> readParam(key, defaultValue));
     }

diff --git a/tests/common/src/main/java/tech/ydb/test/integration/YdbHelperFactory.java b/tests/common/src/main/java/tech/ydb/test/integration/YdbHelperFactory.java
@@ -6,6 +6,7 @@
 import org.testcontainers.DockerClientFactory;
 
 import tech.ydb.test.integration.docker.DockerHelperFactory;
+import tech.ydb.test.integration.docker.ProxedDockerHelperFactory;
 import tech.ydb.test.integration.external.ExternalHelperFactory;
 
 /**
@@ -37,7 +38,11 @@ static YdbHelperFactory createYdbHelper(YdbEnvironment env) {
         // check if docker is availabled
         if (DockerClientFactory.instance().isDockerAvailable()) {
             logger.info("setup docker-based ydb helper");
-            return new DockerHelperFactory(env);
+            if (env.useDockerIsolation()) {
+                return new ProxedDockerHelperFactory(env);
+            } else {
+                return new DockerHelperFactory(env);
+            }
         }
 
         logger.info("ydb helper is disabled");

diff --git a/tests/common/src/main/java/tech/ydb/test/integration/docker/DiscoveryServiceProxy.java b/tests/common/src/main/java/tech/ydb/test/integration/docker/DiscoveryServiceProxy.java
@@ -0,0 +1,75 @@
+package tech.ydb.test.integration.docker;
+
+import com.google.protobuf.Any;
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerMethodDefinition;
+import io.grpc.Status;
+
+import tech.ydb.core.impl.pool.EndpointRecord;
+import tech.ydb.proto.OperationProtos;
+import tech.ydb.proto.StatusCodesProtos;
+import tech.ydb.proto.discovery.DiscoveryProtos;
+import tech.ydb.proto.discovery.v1.DiscoveryServiceGrpc;
+
+
+/**
+ *
+ * @author Aleksandr Gorshenin
+ */
+public class DiscoveryServiceProxy
+        implements ServerCallHandler<DiscoveryProtos.ListEndpointsRequest, DiscoveryProtos.ListEndpointsResponse> {
+
+    private final EndpointRecord endpoint;
+
+    public DiscoveryServiceProxy(EndpointRecord endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public ServerMethodDefinition<?, ?> toMethodDefinition() {
+        return ServerMethodDefinition.create(DiscoveryServiceGrpc.getListEndpointsMethod(), this);
+    }
+
+    @Override
+    public ServerCall.Listener<DiscoveryProtos.ListEndpointsRequest> startCall(
+            ServerCall<DiscoveryProtos.ListEndpointsRequest, DiscoveryProtos.ListEndpointsResponse> serverCall,
+            Metadata metadata
+    ) {
+        serverCall.request(1);
+        serverCall.sendHeaders(new Metadata());
+        return new ServerCall.Listener<DiscoveryProtos.ListEndpointsRequest>() {
+            @Override
+            public void onMessage(DiscoveryProtos.ListEndpointsRequest message) {
+                serverCall.sendMessage(createDiscoveryResponse());
+            }
+
+            @Override
+            public void onHalfClose() {
+                serverCall.close(Status.OK, new Metadata());
+            }
+        };
+    }
+
+    private DiscoveryProtos.ListEndpointsResponse createDiscoveryResponse() {
+        DiscoveryProtos.ListEndpointsResult result = DiscoveryProtos.ListEndpointsResult.newBuilder()
+                .setSelfLocation("PROXY")
+                .addEndpoints(DiscoveryProtos.EndpointInfo.newBuilder()
+                        .setAddress(endpoint.getHost())
+                        .setPort(endpoint.getPort())
+                        .build()
+                )
+                .build();
+
+        OperationProtos.Operation operation = OperationProtos.Operation.newBuilder()
+                .setReady(true)
+                .setStatus(StatusCodesProtos.StatusIds.StatusCode.SUCCESS)
+                .setId("grpc-proxy-discovery")
+                .setResult(Any.pack(result))
+                .build();
+
+        return DiscoveryProtos.ListEndpointsResponse.newBuilder()
+                .setOperation(operation)
+                .build();
+    }
+}
diff --git a/tests/common/src/main/java/tech/ydb/test/integration/docker/DockerHelperFactory.java b/tests/common/src/main/java/tech/ydb/test/integration/docker/DockerHelperFactory.java
@@ -4,6 +4,7 @@
 
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.core.grpc.GrpcTransportBuilder;
+import tech.ydb.core.impl.pool.EndpointRecord;
 import tech.ydb.test.integration.YdbEnvironment;
 import tech.ydb.test.integration.YdbHelper;
 import tech.ydb.test.integration.YdbHelperFactory;
@@ -43,7 +44,8 @@ public GrpcTransport createTransport() {
 
             @Override
             public String endpoint() {
-                return env.ydbUseTls() ? container.secureEndpoint() : container.nonSecureEndpoint();
+                EndpointRecord endpoint = env.ydbUseTls() ? container.secureEndpoint() : container.nonSecureEndpoint();
+                return endpoint.getHostAndPort();
             }
 
             @Override
@@ -58,7 +60,7 @@ public boolean useTls() {
 
             @Override
             public String authToken() {
-                // connection to docker container always is anonymous
+                // connection to docker container is always anonymous
                 return null;
             }