dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Testcontainers: valkey images instead of redis

Browse Source
This commit is contained in:
Sergey Matvienko 2025-03-13 18:12:33 +01:00
parent c9ef125911
commit 2867082776
3 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java
View File

@ -16,6 +16,7 @@
package org.thingsboard.server.dao; package org.thingsboard.server.dao;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.assertj.core.api.Assertions;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.rules.ExternalResource; import org.junit.rules.ExternalResource;
import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.GenericContainer;
@ -23,27 +24,35 @@ import org.testcontainers.containers.Network;
import org.testcontainers.containers.output.OutputFrame; import org.testcontainers.containers.output.OutputFrame;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@Slf4j @Slf4j
public class AbstractRedisClusterContainer { public class AbstractRedisClusterContainer {
static final String nodes = "127.0.0.1:6371,127.0.0.1:6372,127.0.0.1:6373,127.0.0.1:6374,127.0.0.1:6375,127.0.0.1:6376"; static final String nodes = "127.0.0.1:6371,127.0.0.1:6372,127.0.0.1:6373,127.0.0.1:6374,127.0.0.1:6375,127.0.0.1:6376";
static Map<String,String> envs = Map.of(
"VALKEY_CLUSTER_ANNOUNCE_IP", "127.0.0.1",
"VALKEY_CLUSTER_DYNAMIC_IPS", "no",
"ALLOW_EMPTY_PASSWORD", "yes",
"VALKEY_NODES", nodes
);
@ClassRule(order = 0) @ClassRule(order = 0)
public static Network network = Network.newNetwork(); public static Network network = Network.newNetwork();
@ClassRule(order = 1) @ClassRule(order = 1)
public static GenericContainer redis1 = new GenericContainer("bitnami/redis-cluster:latest").withEnv("REDIS_PORT_NUMBER", "6371").withNetworkMode("host").withLogConsumer(x -> log.warn("{}", ((OutputFrame) x).getUtf8StringWithoutLineEnding())).withEnv("ALLOW_EMPTY_PASSWORD", "yes").withEnv("REDIS_NODES", nodes); public static GenericContainer redis1 = new GenericContainer("bitnami/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6371").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
@ClassRule(order = 2) @ClassRule(order = 2)
public static GenericContainer redis2 = new GenericContainer("bitnami/redis-cluster:latest").withEnv("REDIS_PORT_NUMBER", "6372").withNetworkMode("host").withLogConsumer(x -> log.warn("{}", ((OutputFrame) x).getUtf8StringWithoutLineEnding())).withEnv("ALLOW_EMPTY_PASSWORD", "yes").withEnv("REDIS_NODES", nodes); public static GenericContainer redis2 = new GenericContainer("bitnami/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6372").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
@ClassRule(order = 3) @ClassRule(order = 3)
public static GenericContainer redis3 = new GenericContainer("bitnami/redis-cluster:latest").withEnv("REDIS_PORT_NUMBER", "6373").withNetworkMode("host").withLogConsumer(x -> log.warn("{}", ((OutputFrame) x).getUtf8StringWithoutLineEnding())).withEnv("ALLOW_EMPTY_PASSWORD", "yes").withEnv("REDIS_NODES", nodes); public static GenericContainer redis3 = new GenericContainer("bitnami/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6373").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
@ClassRule(order = 4) @ClassRule(order = 4)
public static GenericContainer redis4 = new GenericContainer("bitnami/redis-cluster:latest").withEnv("REDIS_PORT_NUMBER", "6374").withNetworkMode("host").withLogConsumer(x -> log.warn("{}", ((OutputFrame) x).getUtf8StringWithoutLineEnding())).withEnv("ALLOW_EMPTY_PASSWORD", "yes").withEnv("REDIS_NODES", nodes); public static GenericContainer redis4 = new GenericContainer("bitnami/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6374").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
@ClassRule(order = 5) @ClassRule(order = 5)
public static GenericContainer redis5 = new GenericContainer("bitnami/redis-cluster:latest").withEnv("REDIS_PORT_NUMBER", "6375").withNetworkMode("host").withLogConsumer(x -> log.warn("{}", ((OutputFrame) x).getUtf8StringWithoutLineEnding())).withEnv("ALLOW_EMPTY_PASSWORD", "yes").withEnv("REDIS_NODES", nodes); public static GenericContainer redis5 = new GenericContainer("bitnami/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6375").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
@ClassRule(order = 6) @ClassRule(order = 6)
public static GenericContainer redis6 = new GenericContainer("bitnami/redis-cluster:latest").withEnv("REDIS_PORT_NUMBER", "6376").withNetworkMode("host").withLogConsumer(x -> log.warn("{}", ((OutputFrame) x).getUtf8StringWithoutLineEnding())).withEnv("ALLOW_EMPTY_PASSWORD", "yes").withEnv("REDIS_NODES", nodes); public static GenericContainer redis6 = new GenericContainer("bitnami/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6376").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
@ClassRule(order = 100) @ClassRule(order = 100)
@ -59,12 +68,16 @@ public class AbstractRedisClusterContainer {
Thread.sleep(TimeUnit.SECONDS.toMillis(5)); // otherwise not all containers have time to start Thread.sleep(TimeUnit.SECONDS.toMillis(5)); // otherwise not all containers have time to start
String clusterCreateCommand = "echo yes | redis-cli --cluster create " + redis6.execInContainer("/bin/sh", "-c", "printenv | grep VALKEY"); //"sleep infinity"
"127.0.0.1:6371 127.0.0.1:6372 127.0.0.1:6373 127.0.0.1:6374 127.0.0.1:6375 127.0.0.1:6376 " +
"--cluster-replicas 1"; String clusterCreateCommand = "" +
log.warn("Command to init Redis Cluster: {}", clusterCreateCommand); "valkey-cli --cluster create " +nodes.replace(","," ") + " --cluster-replicas 1 --cluster-yes" +
var result = redis6.execInContainer("/bin/sh", "-c", clusterCreateCommand); "";
log.warn("Command to init ValKey Cluster: {}", clusterCreateCommand);
var result = redis6.execInContainer("/bin/sh", "-c", clusterCreateCommand); //"sleep infinity"
// result.wait(TimeUnit.SECONDS.toMillis(300));
log.warn("Init cluster result: {}", result); log.warn("Init cluster result: {}", result);
Assertions.assertThat(result.getExitCode()).isEqualTo(0);
Thread.sleep(TimeUnit.SECONDS.toMillis(5)); // otherwise cluster not always ready Thread.sleep(TimeUnit.SECONDS.toMillis(5)); // otherwise cluster not always ready
@ -83,9 +96,12 @@ public class AbstractRedisClusterContainer {
redis4.stop(); redis4.stop();
redis5.stop(); redis5.stop();
redis6.stop(); redis6.stop();
List.of("cache.type", "redis.connection.type", "redis.cluster.nodes", "redis.cluster.useDefaultPoolConfig\"") List.of("cache.type", "redis.connection.type", "redis.cluster.nodes", "redis.cluster.useDefaultPoolConfig")
.forEach(System.getProperties()::remove); .forEach(System.getProperties()::remove);
} }
}; };
private static void consumeLog(Object x) {
log.warn("{}", ((OutputFrame) x).getUtf8StringWithoutLineEnding());
}
} }

5
dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
View File

@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.rules.ExternalResource; import org.junit.rules.ExternalResource;
import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.OutputFrame;
import java.util.List; import java.util.List;
@ -26,7 +27,9 @@ import java.util.List;
public class AbstractRedisContainer { public class AbstractRedisContainer {
@ClassRule(order = 0) @ClassRule(order = 0)
public static GenericContainer redis = new GenericContainer("redis:7.2") public static GenericContainer redis = new GenericContainer("bitnami/valkey:8.0")
.withEnv("ALLOW_EMPTY_PASSWORD","yes")
.withLogConsumer(s -> log.warn(((OutputFrame) s).getUtf8String().trim()))
.withExposedPorts(6379); .withExposedPorts(6379);
@ClassRule(order = 1) @ClassRule(order = 1)

3
dao/src/test/java/org/thingsboard/server/dao/RedisJUnit5Test.java
View File

@ -33,7 +33,8 @@ import static org.assertj.core.api.Assertions.assertThat;
public class RedisJUnit5Test { public class RedisJUnit5Test {
@Container @Container
private static final GenericContainer REDIS = new GenericContainer("redis:7.2-bookworm") private static final GenericContainer REDIS = new GenericContainer("bitnami/valkey:8.0")
.withEnv("ALLOW_EMPTY_PASSWORD","yes")
.withLogConsumer(s -> log.error(((OutputFrame) s).getUtf8String().trim())) .withLogConsumer(s -> log.error(((OutputFrame) s).getUtf8String().trim()))
.withExposedPorts(6379); .withExposedPorts(6379);