Skip to content

Commit 0ea14d6

Browse files
committed
test & logs
1 parent f4a525f commit 0ea14d6

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.junit.Assert;
88
import org.junit.BeforeClass;
99
import org.junit.ClassRule;
10-
import org.junit.Ignore;
1110
import org.junit.Test;
1211
import org.slf4j.Logger;
1312
import org.slf4j.LoggerFactory;
@@ -40,7 +39,6 @@
4039
*
4140
* @author Evgeny Kuvardin
4241
*/
43-
@Ignore // Resource pools are unstable now
4442
public class ResourcePoolTest {
4543
private final static Logger logger = LoggerFactory.getLogger(ResourcePoolTest.class);
4644

@@ -98,7 +96,7 @@ private Status selectWithPool(String poolName) {
9896
private Status createResourcePool(String poolName) {
9997
String createPool = "CREATE RESOURCE POOL " + poolName + " WITH ("
10098
+ "CONCURRENT_QUERY_LIMIT=10,"
101-
+ "QUEUE_SIZE=\"-1\"," // Query size works unstable
99+
+ "QUEUE_SIZE=1000,"
102100
+ "DATABASE_LOAD_CPU_THRESHOLD=80);";
103101
return retryCtx.supplyResult(s -> s.createQuery(createPool, TxMode.NONE).execute()).join().getStatus();
104102
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ public byte[] pemCert() {
7171

7272
@Override
7373
public void close() {
74+
container.logStdErr();
75+
7476
if (env.dockerReuse() && TestcontainersConfiguration.getInstance().environmentSupportsReuse()) {
7577
return;
7678
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package tech.ydb.test.integration.docker;
22

3+
import java.io.BufferedReader;
34
import java.io.ByteArrayOutputStream;
5+
import java.io.InputStreamReader;
46
import java.util.Collections;
57
import java.util.UUID;
68

@@ -61,6 +63,7 @@ public void init() {
6163

6264
withEnv("YDB_USE_IN_MEMORY_PDISKS", "true");
6365
withEnv("YDB_ENABLE_COLUMN_TABLES", "true");
66+
withEnv("YDB_DEFAULT_LOG_LEVEL", "DEBUG");
6467

6568
if (env.dockerFeatures() != null && !env.dockerFeatures().isEmpty()) {
6669
withEnv("YDB_FEATURE_FLAGS", env.dockerFeatures());
@@ -104,6 +107,19 @@ public byte[] pemCert() {
104107
});
105108
}
106109

110+
public void logStdErr() {
111+
copyFileFromContainer("/stderr", is -> {
112+
try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
113+
String line = reader.readLine();
114+
while (line != null) {
115+
System.out.println(line);
116+
line = reader.readLine();
117+
}
118+
}
119+
return null;
120+
});
121+
}
122+
107123
public String database() {
108124
return env.dockerDatabase();
109125
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public void evaluate() throws Throwable {
4848
base.evaluate();
4949
proxy.set(null);
5050
}
51+
5152
}
5253
}
5354
};

0 commit comments

Comments
 (0)