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

AbstractRedisClusterContainer: code cleanup

Browse Source
This commit is contained in:
Sergey Matvienko 2025-03-13 18:28:03 +01:00
parent 1352475301
commit 21c6a77de9
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,29 +30,27 @@ 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( static final String IMAGE = "bitnami/valkey-cluster:8.0";
static final Map<String,String> ENVS = Map.of(
"VALKEY_CLUSTER_ANNOUNCE_IP", "127.0.0.1", "VALKEY_CLUSTER_ANNOUNCE_IP", "127.0.0.1",
"VALKEY_CLUSTER_DYNAMIC_IPS", "no", "VALKEY_CLUSTER_DYNAMIC_IPS", "no",
"ALLOW_EMPTY_PASSWORD", "yes", "ALLOW_EMPTY_PASSWORD", "yes",
"VALKEY_NODES", nodes "VALKEY_NODES", NODES
); );
@ClassRule(order = 0)
public static Network network = Network.newNetwork();
@ClassRule(order = 1) @ClassRule(order = 1)
public static GenericContainer redis1 = new GenericContainer("bitnami/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6371").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog); public static GenericContainer redis1 = new GenericContainer(IMAGE).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/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6372").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog); public static GenericContainer redis2 = new GenericContainer(IMAGE).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/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6373").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog); public static GenericContainer redis3 = new GenericContainer(IMAGE).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/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6374").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog); public static GenericContainer redis4 = new GenericContainer(IMAGE).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/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6375").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog); public static GenericContainer redis5 = new GenericContainer(IMAGE).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/valkey-cluster:8.0").withEnv(envs).withEnv("VALKEY_PORT_NUMBER", "6376").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog); public static GenericContainer redis6 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6376").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
@ClassRule(order = 100) @ClassRule(order = 100)
@ -68,23 +66,18 @@ 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
redis6.execInContainer("/bin/sh", "-c", "printenv | grep VALKEY"); //"sleep infinity" String clusterCreateCommand = "valkey-cli --cluster create " + NODES.replace(","," ") + " --cluster-replicas 1 --cluster-yes";
String clusterCreateCommand = "" +
"valkey-cli --cluster create " +nodes.replace(","," ") + " --cluster-replicas 1 --cluster-yes" +
"";
log.warn("Command to init ValKey Cluster: {}", clusterCreateCommand); log.warn("Command to init ValKey Cluster: {}", clusterCreateCommand);
var result = redis6.execInContainer("/bin/sh", "-c", clusterCreateCommand); //"sleep infinity" var result = redis6.execInContainer("/bin/sh", "-c", clusterCreateCommand);
// result.wait(TimeUnit.SECONDS.toMillis(300));
log.warn("Init cluster result: {}", result); log.warn("Init cluster result: {}", result);
Assertions.assertThat(result.getExitCode()).isEqualTo(0); 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
log.warn("Connect to nodes: {}", nodes); log.warn("Connect to nodes: {}", NODES);
System.setProperty("cache.type", "redis"); System.setProperty("cache.type", "redis");
System.setProperty("redis.connection.type", "cluster"); System.setProperty("redis.connection.type", "cluster");
System.setProperty("redis.cluster.nodes", nodes); System.setProperty("redis.cluster.nodes", NODES);
System.setProperty("redis.cluster.useDefaultPoolConfig", "false"); System.setProperty("redis.cluster.useDefaultPoolConfig", "false");
} }

2
dao/src/test/java/org/thingsboard/server/dao/RedisClusterSqlTestSuite.java
View File

@ -21,7 +21,7 @@ import org.junit.runner.RunWith;
@RunWith(ClasspathSuite.class) @RunWith(ClasspathSuite.class)
@ClassnameFilters( @ClassnameFilters(
//All the same tests using redis instead of caffeine. //All the same tests using ValKey instead of caffeine.
{ {
"org.thingsboard.server.dao.service.*ServiceSqlTest", "org.thingsboard.server.dao.service.*ServiceSqlTest",
} }