Merge branch 'v1.3.3'

Author: caojiajun

camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/upstream/kv/gc/KvGcExecutor.java

@@ -43,7 +43,8 @@ public class KvGcExecutor {
     private final KvConfig kvConfig;
     private final MpscSlotHashExecutor deleteExecutor;
     private final ThreadPoolExecutor submitExecutor;
-    private final ScheduledThreadPoolExecutor scheduleExecutor;
+    private final ScheduledThreadPoolExecutor scheduler;
+    private final ThreadPoolExecutor scheduleExecutor;
     private RedisTemplate redisTemplate;
 
     public KvGcExecutor(KVClient kvClient, KeyDesign keyDesign, KvConfig kvConfig) {
@@ -55,7 +56,9 @@ public KvGcExecutor(KVClient kvClient, KeyDesign keyDesign, KvConfig kvConfig) {
                 kvConfig.gcExecutorQueueSize(), new MpscSlotHashExecutor.CallerRunsPolicy());
         this.submitExecutor = new ThreadPoolExecutor(1, 1, 0, TimeUnit.SECONDS,
                 new LinkedBlockingQueue<>(1024*128), new CamelliaThreadFactory("camellia-kv-gc-submit"), new ThreadPoolExecutor.AbortPolicy());
-        this.scheduleExecutor = new ScheduledThreadPoolExecutor(1, new CamelliaThreadFactory("camellia-kv-gc-scheduler"));
+        this.scheduler = new ScheduledThreadPoolExecutor(1, new CamelliaThreadFactory("camellia-kv-gc-scheduler"));
+        this.scheduleExecutor = new ThreadPoolExecutor(2, 2, 0, TimeUnit.SECONDS,
+                new LinkedBlockingQueue<>(32), new CamelliaThreadFactory("camellia-kv-gc-scheduler-executor"));
 
         boolean gcScheduleEnable = ProxyDynamicConf.getBoolean("kv.gc.schedule.enable", false);
         if (gcScheduleEnable) {
@@ -74,7 +77,7 @@ public KvGcExecutor(KVClient kvClient, KeyDesign keyDesign, KvConfig kvConfig) {
     }
 
     public void start() {
-        scheduleExecutor.scheduleAtFixedRate(() -> {
+        scheduler.scheduleAtFixedRate(() -> {
             try {
                 boolean gcScheduleEnable = ProxyDynamicConf.getBoolean("kv.gc.schedule.enable", false);
                 if (!gcScheduleEnable) {
@@ -95,12 +98,17 @@ public void start() {
                     return;
                 }
 
-                boolean scanMetaKeysSuccess = true;
+                //meta-key scan
+                Future<Boolean> metaKeyScanFuture;
                 if (!kvClient.supportTTL()) {
-                    scanMetaKeysSuccess = scanMetaKeys();
+                    metaKeyScanFuture = scheduleExecutor.submit(this::scanMetaKeys);
+                } else {
+                    metaKeyScanFuture = CompletableFuture.completedFuture(true);
                 }
-                boolean scanSubKeysSuccess = scanSubKeys();
-                if (scanMetaKeysSuccess && scanSubKeysSuccess) {
+                //sub-key scan
+                Future<Boolean> subKeyScanFuture = scheduleExecutor.submit(this::scanSubKeys);
+                //
+                if (metaKeyScanFuture.get() && subKeyScanFuture.get()) {
                     KvGcEnv.updateGcTime(namespace, System.currentTimeMillis());
                 }
             } catch (Throwable e) {

update-en.md

@@ -15,6 +15,8 @@
 * camellia-redis-proxy, kv, optimize log of lru-cache
 * camellia-redis-proxy, kv, when configure zset encode version=1, index write async in default
 * camellia-redis-proxy, kv, bump obkv-client to 1.4.0
+* camellia-redis-proxy，kv, add gc scan keys count monitor
+* camellia-redis-proxy，kv, gc schedule task, scan meta key and sub key in concurrent
 
 ### fix
 * camellia-redis-proxy, when use ConsensusProxyClusterModeProvider to deploy redis-cluster-mode, fix slot calc wrong in some case

update-zh.md

@@ -15,6 +15,8 @@
 * camellia-redis-proxy，kv，优化了lru-cache的日志打印
 * camellia-redis-proxy，kv，在zset的version=1下，index默认开启异步写入
 * camellia-redis-proxy，kv，obkv-client升级版本到1.4.0
+* camellia-redis-proxy，kv，增加gc扫描key数量的监控
+* camellia-redis-proxy，kv，gc扫描时，meta-key和sub-key并发执行
 
 ### fix
 * camellia-redis-proxy，使用ConsensusProxyClusterModeProvider部署为redis-cluster模式时，修复边界情况下slot计算错误的问题