Merge branch 'feature-sentinel'

Author: Jay.H.Zou

redis-manager-dashboard/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.newegg.ec</groupId>
     <artifactId>redis-manager-dashboard</artifactId>
-    <version>2.1.0-RELEASE</version>
+    <version>2.2.0-RELEASE</version>
     <packaging>jar</packaging>
 
     <parent>

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/client/IRedisClient.java

@@ -4,6 +4,7 @@
 import com.newegg.ec.redis.entity.NodeRole;
 import com.newegg.ec.redis.entity.RedisNode;
 import redis.clients.jedis.ClusterReset;
+import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.params.MigrateParams;
 import redis.clients.jedis.util.Slowlog;
@@ -72,6 +73,8 @@ public interface IRedisClient extends IDatabaseCommand {
 
     List<RedisNode> clusterNodes() throws Exception;
 
+    List<RedisNode> sentinelNodes(Set<HostAndPort> hostAndPorts) throws Exception;
+
     Long dbSize();
 
     /**
@@ -203,8 +206,6 @@ public interface IRedisClient extends IDatabaseCommand {
     String migrate(String host, int port, int destinationDB,
                    int timeout, MigrateParams params, String... keys);
 
-//    String clusterSlaves(String nodeId);
-
     /**
      * old name: slaveOf
      *
@@ -223,10 +224,27 @@ String migrate(String host, int port, int destinationDB,
 
     String memoryPurge();
 
+    List<Map<String, String>> getSentinelMasters();
+
+    List<String> getMasterAddrByName(String masterName);
+
+    List<Map<String, String>> sentinelSlaves(String masterName);
+
+    boolean monitorMaster(String masterName, String ip, int port, int quorum);
+
+    boolean failoverMaster(String masterName);
+
+    boolean sentinelRemove(String masterName);
+
+    Long resetConfig(String pattern);
+
+    boolean sentinelSet(String masterName, Map<String, String> parameterMap);
+
     /**
      * Close client
      *
      * @return
      */
     void close();
+
 }

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/client/RedisClient.java

@@ -2,6 +2,7 @@
 
 import com.google.common.base.Strings;
 import com.newegg.ec.redis.entity.*;
+import com.newegg.ec.redis.util.NetworkUtil;
 import com.newegg.ec.redis.util.RedisUtil;
 import com.newegg.ec.redis.util.SignUtil;
 import redis.clients.jedis.*;
@@ -39,6 +40,8 @@ public class RedisClient implements IRedisClient {
 
     public static final String REPLICATION = "replication";
 
+    public static final String SENTINEL = "sentinel";
+
     private Jedis jedis;
 
     private RedisURI redisURI;
@@ -137,8 +140,8 @@ public List<RedisNode> nodes() throws Exception {
         List<RedisNode> nodeList = new ArrayList<>();
         Map<String, String> infoMap = getInfo(REPLICATION);
         String role = infoMap.get(ROLE);
-        String masterHost = null;
-        Integer masterPort = null;
+        String masterHost;
+        Integer masterPort;
         // 使用 master node 进行连接
         if (Objects.equals(role, NodeRole.SLAVE.getValue())) {
             close();
@@ -255,6 +258,20 @@ public List<RedisNode> clusterNodes() throws Exception {
         return redisNodeList;
     }
 
+    @Override
+    public List<RedisNode> sentinelNodes(Set<HostAndPort> hostAndPorts) {
+        List<RedisNode> redisNodeList = new ArrayList<>();
+        hostAndPorts.forEach(hostAndPort -> {
+            RedisNode redisNode = RedisNode.masterRedisNode(hostAndPort);
+            boolean run = NetworkUtil.telnet(redisNode.getHost(), redisNode.getPort());
+            redisNode.setLinkState(run ? "connected" : "unconnected");
+            redisNode.setNodeId(hostAndPort.toString());
+            redisNode.setFlags("master");
+            redisNodeList.add(redisNode);
+        });
+        return redisNodeList;
+    }
+
     @Override
     public boolean exists(String key) {
         return jedis.exists(key);
@@ -367,12 +384,12 @@ public Object list(DataCommandsParam dataCommandsParam) {
         } else if (cmd.startsWith(RPUSH)) {
             result = jedis.rpush(key, items);
         } else if (cmd.startsWith(LINDEX)) {
-            result = jedis.lindex(key, Integer.valueOf(list[2]));
+            result = jedis.lindex(key, Integer.parseInt(list[2]));
         } else if (cmd.startsWith(LLEN)) {
             result = jedis.llen(key);
         } else if (cmd.startsWith(LRANGE)) {
-            int start = Integer.valueOf(list[2]);
-            int stop = Integer.valueOf(list[3]);
+            int start = Integer.parseInt(list[2]);
+            int stop = Integer.parseInt(list[3]);
             result = jedis.lrange(key, start, stop);
         }
         return result;
@@ -395,7 +412,7 @@ public Object set(DataCommandsParam dataCommandsParam) {
         } else if (cmd.startsWith(SRANDMEMBER)) {
             int count = 1;
             if (list.length > 2) {
-                count = Integer.valueOf(list[2]);
+                count = Integer.parseInt(list[2]);
             }
             result = jedis.srandmember(key, count);
         }
@@ -419,8 +436,8 @@ public Object zset(DataCommandsParam dataCommandsParam) {
         } else if (cmd.startsWith(ZCOUNT)) {
             result = jedis.zcount(key, param1, param2);
         } else if (cmd.startsWith(ZRANGE)) {
-            int start = Integer.valueOf(param1);
-            int stop = Integer.valueOf(param2);
+            int start = Integer.parseInt(param1);
+            int stop = Integer.parseInt(param2);
             if (list.length > 4) {
                 result = jedis.zrangeWithScores(key, start, stop);
             } else {
@@ -629,14 +646,53 @@ public String memoryPurge() {
         return null;
     }
 
+    @Override
+    public List<Map<String, String>> getSentinelMasters() {
+        return jedis.sentinelMasters();
+    }
+
+    @Override
+    public List<String> getMasterAddrByName(String masterName) {
+        return jedis.sentinelGetMasterAddrByName(masterName);
+    }
+
+    @Override
+    public List<Map<String, String>> sentinelSlaves(String masterName) {
+        return jedis.sentinelSlaves(masterName);
+    }
+
+    @Override
+    public boolean monitorMaster(String masterName, String ip, int port, int quorum) {
+        return Objects.equals(jedis.sentinelMonitor(masterName, ip, port, quorum), OK);
+    }
+
+    @Override
+    public boolean failoverMaster(String masterName) {
+        return Objects.equals(jedis.sentinelFailover(masterName), OK);
+    }
+
+    @Override
+    public boolean sentinelRemove(String masterName) {
+        return Objects.equals(jedis.sentinelRemove(masterName), OK);
+    }
+
+    @Override
+    public Long resetConfig(String pattern) {
+        return jedis.sentinelReset(pattern);
+    }
+
+    @Override
+    public boolean sentinelSet(String masterName, Map<String, String> parameterMap) {
+        return Objects.equals(jedis.sentinelSet(masterName, parameterMap), OK);
+    }
+
     @Override
     public void close() {
         try {
             if (jedis != null) {
                 jedis.close();
             }
         } catch (Exception ignored) {
-
         }
     }
 }

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/client/RedisClientFactory.java

@@ -4,6 +4,8 @@
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
+import java.util.Set;
+
 /**
  * Build redis client
  *
@@ -43,4 +45,16 @@ public static RedisClient buildRedisClient(HostAndPort hostAndPort, String requi
         return buildRedisClient(redisURI);
     }
 
+    public static RedisClient buildRedisClient(HostAndPort hostAndPort) {
+        return buildRedisClient(hostAndPort, null);
+    }
+
+    public static RedisClient buildRedisClient(String host, int port) {
+        return buildRedisClient(new HostAndPort(host, port));
+    }
+
+    public static RedisClient buildRedisClient(Set<HostAndPort> hostAndPorts) {
+        return buildRedisClient(hostAndPorts.iterator().next());
+    }
+
 }

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/config/InitializeConfiguration.java

@@ -52,6 +52,9 @@ public class InitializeConfiguration implements ApplicationListener<ContextRefre
     @Autowired
     private IOperationLogDao operationLogDao;
 
+    @Autowired
+    private ISentinelMastersDao sentinelMastersDao;
+
     @Value("${redis-manager.auth.user-name:admin}")
     private String userName;
 
@@ -75,6 +78,7 @@ private void createTables() {
         alertRecordDao.createAlertRecordTable();
         redisNodeDao.createRedisNodeTable();
         operationLogDao.createLogTable();
+        sentinelMastersDao.createSentinelMastersTable();
     }
 
     @Transactional

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/controller/ClusterController.java

@@ -14,7 +14,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.ws.rs.PathParam;
 import java.util.*;
 
 /**