feat: update conf (#466)

Author: caojiajun

camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/cluster/provider/AbstractClusterModeProvider.java

@@ -98,7 +98,7 @@ protected final Reply sync(CompletableFuture<Reply> future) {
      * @return heartbeatTimeoutSeconds
      */
     protected final int heartbeatTimeoutSeconds() {
-        return ProxyDynamicConf.getInt("proxy.cluster.mode.heartbeat.request.timeout.seconds", 10);
+        return ProxyDynamicConf.getInt("cluster.mode.heartbeat.request.timeout.seconds", 10);
     }
 
     /**

camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/cluster/provider/DefaultClusterModeProvider.java

@@ -119,7 +119,7 @@ private void checkHeartbeatReply() {
                 if (!heartbeatMap.containsKey(node)) {
                     logger.warn("proxy check heartbeat reply fail, node = {}", node);
                     //检查失败，则再等一下
-                    int delaySeconds = ProxyDynamicConf.getInt("proxy.cluster.mode.heartbeat.init.delay.check.seconds", 10);
+                    int delaySeconds = ProxyDynamicConf.getInt("cluster.mode.heartbeat.init.delay.check.seconds", 10);
                     schedule.schedule(this::checkHeartbeatReply, delaySeconds, TimeUnit.SECONDS);
                     return;
                 }
@@ -143,7 +143,7 @@ private void checkOnlineNodes() {
                 continue;
             }
             Long lastHeartbeatTime = heartbeatMap.get(node);
-            int timeoutSeconds = ProxyDynamicConf.getInt("proxy.cluster.mode.heartbeat.timeout.seconds", 20);
+            int timeoutSeconds = ProxyDynamicConf.getInt("cluster.mode.heartbeat.timeout.seconds", 20);
             if (lastHeartbeatTime == null || System.currentTimeMillis() - lastHeartbeatTime > timeoutSeconds*1000L) {
                 offlineNodes.add(node);
             }
@@ -165,7 +165,7 @@ private void sendHeartbeat() {
             Set<ProxyNode> heartbeatNodes = new HashSet<>(onlineNodes);
             heartbeatNodes.addAll(pendingNodes);
             heartbeatNodes.addAll(initNodes(true));
-            int times = ProxyDynamicConf.getInt("proxy.cluster.mode.heartbeat.request.fail.times", 3);
+            int times = ProxyDynamicConf.getInt("cluster.mode.heartbeat.request.fail.times", 3);
             heartbeatTargetNodes.entrySet().removeIf(entry -> entry.getValue().get() > times);//心跳连续三次失败，则剔除出去
             heartbeatNodes.addAll(heartbeatTargetNodes.keySet());
             for (ProxyNode node : heartbeatNodes) {

camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/sentinel/DefaultSentinelModeProcessor.java

@@ -95,10 +95,10 @@ private void init() {
             }
             Collections.sort(onlineNodes);
             this.onlineNodes = onlineNodes;
-            this.masterName = ProxyDynamicConf.getString("proxy.sentinel.mode.master.name", "camellia_sentinel");
+            this.masterName = ProxyDynamicConf.getString("sentinel.mode.master.name", "camellia_sentinel");
             logger.info("sentinel mode init success, masterName = {}, currentNode = {}, onlineNodes = {}, allNodes = {}, nodesProvider = {}",
                     this.masterName, this.currentNode, this.onlineNodes, this.allNodes, provider.getClass().getName());
-            int intervalSeconds = ProxyDynamicConf.getInt("proxy.sentinel.mode.heartbeat.interval.seconds", 5);
+            int intervalSeconds = ProxyDynamicConf.getInt("sentinel.mode.heartbeat.interval.seconds", 5);
             scheduler.scheduleAtFixedRate(this::schedule, intervalSeconds, intervalSeconds, TimeUnit.SECONDS);
             logger.info("sentinel mode heartbeat schedule start success, intervalSeconds = {}", intervalSeconds);
             init = true;
@@ -411,7 +411,7 @@ private boolean heartbeat(ProxyNode node) {
         try {
             RedisConnection connection = RedisConnectionHub.getInstance().get(null, node.getHost(), node.getCport(), null, ServerConf.cportPassword());
             CompletableFuture<Reply> future = connection.sendCommand(RedisCommand.SENTINEL.raw(), Utils.stringToBytes(heartbeat));
-            int timeoutSeconds = ProxyDynamicConf.getInt("proxy.sentinel.mode.heartbeat.timeout.seconds", 20);
+            int timeoutSeconds = ProxyDynamicConf.getInt("sentinel.mode.heartbeat.timeout.seconds", 20);
             Reply reply = future.get(timeoutSeconds, TimeUnit.SECONDS);
             if (reply instanceof StatusReply) {
                 return ((StatusReply) reply).getStatus().equalsIgnoreCase(StatusReply.OK.getStatus());

docs/camellia-redis-proxy/deploy/cluster_mode.md

@@ -22,5 +22,5 @@ redis-cluster模式，如下：
 
 ```properties
 #是否对每一个命令都检查slot以及是否要重定向，默认false
-proxy.cluster.mode.command.move.always=false
+cluster.mode.command.move.always=false
 ```

docs/camellia-redis-proxy/deploy/sentinel_mode.md

@@ -24,8 +24,8 @@ sentinel.mode.nodes=192.168.3.218:6380@16380,192.168.3.218:6390@16390
 ```properties
 ### 此时集群内的节点会通过redis自动彼此发现，优点是可以不需要提前知道节点ip，适用于k8s环境
 sentinel.mode.provider.class.name=com.netease.nim.camellia.redis.proxy.sentinel.RedisSentinelModeProvider
-proxy.sentinel.mode.nodes.provider.redis.url=redis://passwd@127.0.0.1
-proxy.sentinel.mode.nodes.provider.redis.key=xxxx
+sentinel.mode.nodes.provider.redis.url=redis://passwd@127.0.0.1
+sentinel.mode.nodes.provider.redis.key=xxxx
 ```