test & logs

Author: alex268

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

@@ -71,6 +71,8 @@ public byte[] pemCert() {
 
             @Override
             public void close() {
+                container.logStdErr();
+
                 if (env.dockerReuse() && TestcontainersConfiguration.getInstance().environmentSupportsReuse()) {
                     return;
                 }

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

@@ -1,6 +1,8 @@
 package tech.ydb.test.integration.docker;
 
+import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
+import java.io.InputStreamReader;
 import java.util.Collections;
 import java.util.UUID;
 
@@ -61,6 +63,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 +107,19 @@ public byte[] pemCert() {
         });
     }
 
+    public void logStdErr() {
+        copyFileFromContainer("/stderr", is -> {
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
+                String line = reader.readLine();
+                while (line != null) {
+                    System.out.println(line);
+                    line = reader.readLine();
+                }
+            }
+            return null;
+        });
+    }
+
     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

@@ -48,6 +48,7 @@ public void evaluate() throws Throwable {
                         base.evaluate();
                         proxy.set(null);
                     }
+
                 }
             }
         };