github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed - duplicated master/slave added log output in sentinel mode

Browse Source
pull/5937/head
Nikita Koksharov 8 months ago
parent 0fcedcc7ff
commit eb31a064a9
1 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File

93
redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
Unescape Escape View File

@ -103,61 +103,63 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
continue; continue;
} }
RedisURI master = connection.sync(masterHostCommand, cfg.getMasterName()); List<CompletableFuture<Void>> connectionFutures = new LinkedList<>();
if (master == null) { if (currentMaster.get() == null) {
throw new RedisConnectionException("Master node is undefined! SENTINEL GET-MASTER-ADDR-BY-NAME command returns empty result!"); RedisURI master = connection.sync(masterHostCommand, cfg.getMasterName());
} if (master == null) {
throw new RedisConnectionException("Master node is undefined! SENTINEL GET-MASTER-ADDR-BY-NAME command returns empty result!");
InetSocketAddress masterHost = resolveIP(master.getHost(), String.valueOf(master.getPort())).join();
RedisURI masterUri = toURI(masterHost);
if (!master.isIP()) {
uri2hostname.put(masterUri, master.getHost());
}
this.config.setMasterAddress(masterUri.toString());
currentMaster.set(masterUri);
log.info("master: {} added", masterHost);
List<Map<String, String>> sentinelSlaves = connection.sync(StringCodec.INSTANCE, RedisCommands.SENTINEL_SLAVES, cfg.getMasterName());
for (Map<String, String> map : sentinelSlaves) {
if (map.isEmpty()) {
continue;
}
String host = map.get("ip");
String port = map.get("port");
String flags = map.getOrDefault("flags", "");
String masterLinkStatus = map.getOrDefault("master-link-status", "");
InetSocketAddress slaveAddr = resolveIP(host, port).join();
RedisURI uri = toURI(slaveAddr);
if (isHostname(host)) {
uri2hostname.put(uri, host);
} }
log.debug("slave {} state: {}", slaveAddr, map); InetSocketAddress masterHost = resolveIP(master.getHost(), String.valueOf(master.getPort())).join();
RedisURI masterUri = toURI(masterHost);
if (isSlaveDown(flags, masterLinkStatus)) { if (!master.isIP()) {
log.warn("slave: {} is down", slaveAddr); uri2hostname.put(masterUri, master.getHost());
} else {
this.config.addSlaveAddress(uri.toString());
log.info("slave: {} added", slaveAddr);
} }
} this.config.setMasterAddress(masterUri.toString());
currentMaster.set(masterUri);
log.info("master: {} added", masterHost);
List<CompletableFuture<Void>> connectionFutures = new LinkedList<>(); List<Map<String, String>> sentinelSlaves = connection.sync(StringCodec.INSTANCE, RedisCommands.SENTINEL_SLAVES, cfg.getMasterName());
if (cfg.isSentinelsDiscovery()) { for (Map<String, String> map : sentinelSlaves) {
List<Map<String, String>> sentinelSentinels = connection.sync(StringCodec.INSTANCE, RedisCommands.SENTINEL_SENTINELS, cfg.getMasterName());
for (Map<String, String> map : sentinelSentinels) {
if (map.isEmpty()) { if (map.isEmpty()) {
continue; continue;
} }
String ip = map.get("ip"); String host = map.get("ip");
String port = map.get("port"); String port = map.get("port");
String flags = map.getOrDefault("flags", "");
String masterLinkStatus = map.getOrDefault("master-link-status", "");
InetSocketAddress slaveAddr = resolveIP(host, port).join();
RedisURI uri = toURI(slaveAddr);
if (isHostname(host)) {
uri2hostname.put(uri, host);
}
InetSocketAddress sentinelAddr = resolveIP(ip, port).join(); log.debug("slave {} state: {}", slaveAddr, map);
CompletionStage<Void> future = registerSentinel(sentinelAddr);
connectionFutures.add(future.toCompletableFuture()); if (isSlaveDown(flags, masterLinkStatus)) {
log.warn("slave: {} is down", slaveAddr);
} else {
this.config.addSlaveAddress(uri.toString());
log.info("slave: {} added", slaveAddr);
}
}
if (cfg.isSentinelsDiscovery()) {
List<Map<String, String>> sentinelSentinels = connection.sync(StringCodec.INSTANCE, RedisCommands.SENTINEL_SENTINELS, cfg.getMasterName());
for (Map<String, String> map : sentinelSentinels) {
if (map.isEmpty()) {
continue;
}
String ip = map.get("ip");
String port = map.get("port");
InetSocketAddress sentinelAddr = resolveIP(ip, port).join();
CompletionStage<Void> future = registerSentinel(sentinelAddr);
connectionFutures.add(future.toCompletableFuture());
}
} }
} }
@ -170,6 +172,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
} catch (Exception e) { } catch (Exception e) {
// skip // skip
} }
break;
} catch (RedisConnectionException e) { } catch (RedisConnectionException e) {
internalShutdown(); internalShutdown();
throw e; throw e;

Write Preview
Loading…
Cancel
Save