udpate

Author: kimmking

Diff for: 08cache/ha/conf/redis6379.conf

@@ -1866,3 +1866,4 @@ jemalloc-bg-thread yes
 # Generated by CONFIG REWRITE
 user default on nopass ~* +@all
 
+replicaof 127.0.0.1 6380

Diff for: 08cache/ha/conf/redis6380.conf

@@ -1865,4 +1865,4 @@ jemalloc-bg-thread yes
 # bgsave_cpulist 1,10-11
 # Generated by CONFIG REWRITE
 user default on nopass ~* +@all
-replicaof 127.0.0.1 6379
+

Diff for: 08cache/ha/conf/sentinel0.conf

@@ -1,14 +1,14 @@
 sentinel myid 8d992c54df8f8677b0b345825f61fb733c73d14c
 sentinel deny-scripts-reconfig yes
-sentinel monitor mymaster 127.0.0.1 6379 2
+sentinel monitor mymaster 127.0.0.1 6380 2
 sentinel down-after-milliseconds mymaster 10000
 # Generated by CONFIG REWRITE
 protected-mode no
 port 26379
 user default on nopass ~* +@all
 dir "/Users/kimmking/kimmking/JavaCourseCodes/08cache/ha/conf"
-sentinel config-epoch mymaster 2
-sentinel leader-epoch mymaster 2
-sentinel known-replica mymaster 127.0.0.1 6380
+sentinel config-epoch mymaster 5
+sentinel leader-epoch mymaster 5
+sentinel known-replica mymaster 127.0.0.1 6379
 sentinel known-sentinel mymaster 127.0.0.1 26380 8d992c54df8f8677b0b345825f61fb733c73d14d
-sentinel current-epoch 2
+sentinel current-epoch 5

Diff for: 08cache/ha/conf/sentinel1.conf

@@ -1,14 +1,14 @@
 sentinel myid 8d992c54df8f8677b0b345825f61fb733c73d14d
 sentinel deny-scripts-reconfig yes
-sentinel monitor mymaster 127.0.0.1 6379 2
+sentinel monitor mymaster 127.0.0.1 6380 2
 sentinel down-after-milliseconds mymaster 10000
 # Generated by CONFIG REWRITE
 protected-mode no
 port 26380
 user default on nopass ~* +@all
 dir "/Users/kimmking/kimmking/JavaCourseCodes/08cache/ha/conf"
-sentinel config-epoch mymaster 2
-sentinel leader-epoch mymaster 2
-sentinel known-replica mymaster 127.0.0.1 6380
+sentinel config-epoch mymaster 5
+sentinel leader-epoch mymaster 5
+sentinel known-replica mymaster 127.0.0.1 6379
 sentinel known-sentinel mymaster 127.0.0.1 26379 8d992c54df8f8677b0b345825f61fb733c73d14c
-sentinel current-epoch 2
+sentinel current-epoch 5

Diff for: 08cache/redis/src/main/java/io/kimmking/cache/RedisApplication.java

@@ -25,14 +25,16 @@ public static void main(String[] args) {
 		// C2.基于sentinel和连接池的demo
 //		Jedis sjedis = SentinelJedis.getJedis();
 //		System.out.println(sjedis.info());
-//		sjedis.set("uptime", new Long(System.currentTimeMillis()).toString());
-//		System.out.println(sjedis.get("uptime"));
+//		sjedis.set("uptime2", new Long(System.currentTimeMillis()).toString());
+//		System.out.println(sjedis.get("uptime2"));
 //		SentinelJedis.close();
 
 		// C3. 直接连接sentinel进行操作
-//		Jedis jedis = new Jedis("localhost", 26380); // 连接到sentinel
-//		List<Map<String, String>> masters = jedis.sentinelMasters();
+//		Jedis jedisSentinel = new Jedis("localhost", 26380); // 连接到sentinel
+//		List<Map<String, String>> masters = jedisSentinel.sentinelMasters();
 //		System.out.println(JSON.toJSONString(masters));
+//		List<Map<String, String>> slaves = jedisSentinel.sentinelSlaves("mymaster");
+//		System.out.println(JSON.toJSONString(slaves));
 
 
 		// 作业：
@@ -48,11 +50,11 @@ public static void main(String[] args) {
 		// 4. 使用C3的方式，使用java代码手动操作sentinel
 
 
-		// C4. Cluster
+		// C4. Redis Cluster
 		// 作业：
-		// 5.使用命令行配置cluster:
+		// 5.使用命令行配置Redis cluster:
 		//  1) 以cluster方式启动redis-server
-		//  2) 添加cluster节点，确认集群节点数目
+		//  2) 用meet，添加cluster节点，确认集群节点数目
 		//  3) 分配槽位，确认分配成功
 		//  4) 测试简单的get/set是否成功
 		// 然后运行如下代码

Diff for: 08cache/redis/src/main/java/io/kimmking/cache/cluster/ClusterJedis.java

@@ -19,6 +19,7 @@ private static JedisCluster createJedisCluster() {
         // 添加节点
         hostAndPortsSet.add(new HostAndPort("127.0.0.1", 6379));
         hostAndPortsSet.add(new HostAndPort("127.0.0.1", 6380));
+        // hostAndPortsSet.add(new HostAndPort("127.0.0.1", 6381));
 
         // Jedis连接池配置
         JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();