test & logs

Author: alex268

query/pom.xml

@@ -45,6 +45,7 @@
                 <configuration>
                     <environmentVariables>
                         <YDB_DOCKER_FEATURE_FLAGS>enable_resource_pools</YDB_DOCKER_FEATURE_FLAGS>
+                        <!--<YDB_DOCKER_IMAGE>ydbplatform/local-ydb:trunk</YDB_DOCKER_IMAGE>-->
                     </environmentVariables>
                 </configuration>
             </plugin>

query/src/test/java/tech/ydb/query/QueryExampleTest.java

@@ -11,6 +11,7 @@
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.FixMethodOrder;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
@@ -32,6 +33,7 @@
  * @author Alexandr Gorshenin <[email protected]>
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Ignore
 public class QueryExampleTest {
     @ClassRule
     public final static GrpcTransportRule ydbRule = new GrpcTransportRule();

query/src/test/java/tech/ydb/query/TableExampleTest.java

@@ -14,6 +14,7 @@
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.FixMethodOrder;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
@@ -43,6 +44,7 @@
  * @author Alexandr Gorshenin <[email protected]>
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Ignore
 public class TableExampleTest {
     @ClassRule
     public final static GrpcTransportRule ydbRule = new GrpcTransportRule();

query/src/test/java/tech/ydb/query/impl/QueryIntegrationTest.java

@@ -44,6 +44,7 @@
  *
  * @author Aleksandr Gorshenin
  */
+@Ignore
 public class QueryIntegrationTest {
     private final static Logger logger = LoggerFactory.getLogger(QueryIntegrationTest.class);
     private final static String TEST_TABLE = "query_service_test";

query/src/test/java/tech/ydb/query/impl/ResourcePoolTest.java

@@ -7,7 +7,6 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,7 +39,6 @@
  *
  * @author Evgeny Kuvardin
  */
-@Ignore // Resource pools are unstable now
 public class ResourcePoolTest {
     private final static Logger logger = LoggerFactory.getLogger(ResourcePoolTest.class);
 
@@ -98,7 +96,7 @@ private Status selectWithPool(String poolName) {
     private Status createResourcePool(String poolName) {
         String createPool = "CREATE RESOURCE POOL " + poolName + " WITH ("
                 + "CONCURRENT_QUERY_LIMIT=10,"
-                + "QUEUE_SIZE=\"-1\"," // Query size works unstable
+                + "QUEUE_SIZE=1000,"
                 + "DATABASE_LOAD_CPU_THRESHOLD=80);";
         return retryCtx.supplyResult(s -> s.createQuery(createPool, TxMode.NONE).execute()).join().getStatus();
     }

tests/common/src/main/java/tech/ydb/test/integration/docker/DockerHelperFactory.java

@@ -1,5 +1,7 @@
 package tech.ydb.test.integration.docker;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import tech.ydb.core.grpc.GrpcTransport;
@@ -15,6 +17,7 @@
  * @author Aleksandr Gorshenin
  */
 public class DockerHelperFactory extends YdbHelperFactory {
+    private static final Logger logger = LoggerFactory.getLogger(DockerHelperFactory.class);
     private final YdbEnvironment env;
     private final YdbDockerContainer container;
 
@@ -30,6 +33,7 @@ public DockerHelperFactory(YdbEnvironment env, YdbDockerContainer container) {
 
     @Override
     public YdbHelper createHelper() {
+        logger.warn("container start");
         container.start();
 
         return new YdbHelper() {
@@ -71,6 +75,14 @@ public byte[] pemCert() {
 
             @Override
             public void close() {
+                logger.warn("container stop");
+
+                try {
+                    container.logStdErr();
+                } catch (Exception ex) {
+                    logger.error("cannot print stderr", ex);
+                }
+
                 if (env.dockerReuse() && TestcontainersConfiguration.getInstance().environmentSupportsReuse()) {
                     return;
                 }

tests/common/src/main/java/tech/ydb/test/integration/docker/YdbDockerContainer.java

@@ -61,6 +61,7 @@ public void init() {
 
         withEnv("YDB_USE_IN_MEMORY_PDISKS", "true");
         withEnv("YDB_ENABLE_COLUMN_TABLES", "true");
+        withEnv("YDB_DEFAULT_LOG_LEVEL", "DEBUG");
 
         if (env.dockerFeatures() != null && !env.dockerFeatures().isEmpty()) {
             withEnv("YDB_FEATURE_FLAGS", env.dockerFeatures());
@@ -104,6 +105,12 @@ public byte[] pemCert() {
         });
     }
 
+    public void logStdErr() {
+        String logs = getLogs();
+        System.out.println(logs);
+        System.out.println("LOG SIZE = " + logs.length());
+    }
+
     public String database() {
         return env.dockerDatabase();
     }

tests/common/src/test/java/tech/ydb/test/integration/DockerHelperFactoryTest.java

@@ -60,6 +60,13 @@ public String getHost() {
 
         @Override
         public <T> T copyFileFromContainer(String containerPath, ThrowingFunction<InputStream, T> function) {
+            if (!pemPath.equals(containerPath)) {
+                try (ByteArrayInputStream bais = new ByteArrayInputStream("".getBytes())) {
+                    return function.apply(bais);
+                } catch (Exception ex) {
+                    throw new AssertionError("mock error", ex);
+                }
+            }
             Assert.assertEquals("check pem path", pemPath, containerPath);
 
             try (ByteArrayInputStream bais = new ByteArrayInputStream(pemCert)) {

tests/junit4-support/src/main/java/tech/ydb/test/junit4/GrpcTransportRule.java

@@ -41,13 +41,21 @@ public void evaluate() throws Throwable {
                     path += "/" + description.getMethodName();
                 }
 
-                logger.debug("create ydb helper for test {}", path);
+                logger.warn("create ydb helper for test {}", path);
                 try (YdbHelper helper = factory.createHelper()) {
+                    logger.warn("create ydb transport for test {}", path);
                     try (GrpcTransport transport = helper.createTransport()) {
                         proxy.set(transport);
-                        base.evaluate();
-                        proxy.set(null);
+                        logger.warn("evaluate test {}", path);
+                        try {
+                            base.evaluate();
+                        } finally {
+                            logger.warn("finish evaluate test {}", path);
+                            proxy.set(null);
+                        }
+                        logger.warn("close ydb transport for test {}", path);
                     }
+                    logger.warn("close ydb helper for test {}", path);
                 }
             }
         };