Skip to content

Commit 3e9da83

Browse files
committed
redis upgrade test
1 parent ac1c381 commit 3e9da83

File tree

3 files changed

+56
-3
lines changed

3 files changed

+56
-3
lines changed
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package com.netflix.conductor.common.config;
2+
3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
5+
import org.springframework.boot.context.event.ApplicationReadyEvent;
6+
import org.springframework.context.event.EventListener;
7+
import org.springframework.core.env.Environment;
8+
import org.springframework.stereotype.Component;
9+
10+
@Component
11+
public class ConductorRedisPropLogger {
12+
13+
private static final Logger LOGGER = LoggerFactory.getLogger(ConductorRedisPropLogger.class);
14+
15+
private final Environment env;
16+
17+
public ConductorRedisPropLogger(Environment env) {
18+
this.env = env;
19+
}
20+
21+
@EventListener(ApplicationReadyEvent.class)
22+
public void loggerResolvedRedisProps() {
23+
// QUEUE (Orkes RedisQueueConfiguration)
24+
LOGGER.info("[CONDUCTOR_REDIS_UPGRADE] ==== QUEUE_CFG (Orkes queues) ====");
25+
loggerKey("conductor.queue.type");
26+
// common keys for Orkes redis queues:
27+
loggerKey("conductor.redis.hosts");
28+
loggerKey("conductor.redis.ssl");
29+
loggerKey("conductor.redis.workflowNamespacePrefix");
30+
loggerKey("conductor.redis.queueNamespacePrefix");
31+
LOGGER.info("[CONDUCTOR_REDIS_UPGRADE] ==================================");
32+
33+
// LOCK (Netflix RedisLockConfiguration)
34+
LOGGER.info("[CONDUCTOR_REDIS_UPGRADE] ==== LOCK_CFG (Execution lock) ====");
35+
loggerKey("conductor.workflow-scylla-execution-lock.enabled");
36+
loggerKey("conductor.redis-lock.serverType");
37+
loggerKey("conductor.redis-lock.serverAddress");
38+
loggerKey("conductor.redis-lock.serverPassword");
39+
loggerKey("conductor.redis-lock.namespace");
40+
LOGGER.info("[CONDUCTOR_REDIS_UPGRADE] ==================================");
41+
}
42+
43+
private void loggerKey(String key) {
44+
String val = env.getProperty(key);
45+
LOGGER.info("[CONDUCTOR_REDIS_UPGRADE] [{}] {}", key, val == null ? "<unset>" : val);
46+
}
47+
}

docker/server/config/config-conductor-server.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
conductor.grpc-server.enabled=false
33

44
conductor.queue.type=redis_standalone
5-
conductor.redis.hosts=${REDIS_HOST}:${REDIS_PORT}:${REDIS_RACK_HOSTED_ZONE}:${REDIS_PASSWORD}
5+
conductor.redis.hosts=fs-microservice-caas-migration-testing.redis.apps-us-east-1:30140:${REDIS_RACK_HOSTED_ZONE}:8z6USHwP3Ib09efAlcjjq7F9NQO8dcaM
66
conductor.redis.workflowNamespacePrefix=${REDIS_WORKFLOW_NS_PREFIX}
77
conductor.redis.queueNamespacePrefix=${REDIS_QUEUE_NS_PREFIX}
88

@@ -30,8 +30,8 @@ conductor.workflow-monitor.stats.initial-delay=${WORKFLOW_MONITOR_STATS_INITIAL_
3030
conductor.workflow-monitor.stats.delay=${WORKFLOW_MONITOR_STATS_FIXED_DELAY}
3131
conductor.workflow-repair-service.enabled=true
3232
conductor.workflow-scylla-execution-lock.enabled=true
33-
conductor.redis-lock.serverAddress=redis://${REDIS_HOST}:${REDIS_PORT}
34-
conductor.redis-lock.serverPassword=${REDIS_PASSWORD}
33+
conductor.redis-lock.serverAddress=redis://fs-microservice-caas-migration-testing.redis.apps-us-east-1:30140
34+
conductor.redis-lock.serverPassword=8z6USHwP3Ib09efAlcjjq7F9NQO8dcaM
3535
conductor.redis-lock.namespace=${REDIS_LOCK_NS_PREFIX}
3636

3737
# Pushing Prom Metrics

redis-lock/src/main/java/com/netflix/conductor/redislock/config/RedisLockConfiguration.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ public Redisson getRedisson(RedisLockProperties properties) {
5858
}
5959

6060
int connectionTimeout = 10000;
61+
LOGGER.info("[CONDUCTOR_REDIS_UPGRADE] type={}, address={}, pass?={}, masterName={}, nettyThreads={}",
62+
redisServerType,
63+
redisServerAddress,
64+
(redisServerPassword != null && !redisServerPassword.isEmpty()),
65+
masterName,
66+
properties.getNumNettyThreads());
6167
switch (redisServerType) {
6268
case SINGLE:
6369
LOGGER.info("Setting up Redis Single Server for RedisLockConfiguration");

0 commit comments

Comments
 (0)