optimized sentinel reset (#801)

* optimized sentinel reset * optimized sentinel reset * upgrade clog * check all sentinels slaves * test and fix * test and fix * add comment --------- Co-authored-by: llj李龙姣 <[email protected]>
ctripcorp · May 28, 2024 · 532d66c · 532d66c
1 parent 7389327
commit 532d66c
Show file tree

Hide file tree

Showing 5 changed files with 776 additions and 185 deletions.
diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
         <okhttp3.version>3.12.0</okhttp3.version>
         <influxdb.version>2.7</influxdb.version>
         <hickwall.client.version>1.10-SNAPSHOT</hickwall.client.version>
-        <clogging.version>4.6.3</clogging.version>
+        <clogging.version>4.9.0</clogging.version>
         <credis.version>4.4.1-unstable-SNAPSHOT</credis.version>
         <qconfig.sso.version>1.0.7-SNAPSHOT</qconfig.sso.version>
         <qunaer.common.version>9.2.37</qunaer.common.version>
@@ -286,6 +286,14 @@
                         <groupId>com.ctrip.framework</groupId>
                         <artifactId>vi</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.codehaus.jackson</groupId>
+                        <artifactId>jackson-mapper-asl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.codehaus.jackson</groupId>
+                        <artifactId>jackson-core-asl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>

diff --git a/...e/redis/checker/healthcheck/actions/sentinel/collector/DefaultSentinelHelloCollector.java b/...e/redis/checker/healthcheck/actions/sentinel/collector/DefaultSentinelHelloCollector.java
@@ -237,7 +237,7 @@ public void go() throws Exception {
                             chain.add(new AnalyseHellos(context, checkerConfig));
                             chain.add(new AcquireLeakyBucket(context, leakyBucket));
                             chain.add(new DeleteSentinels(context, sentinelManager));
-                            chain.add(new ResetSentinels(context, metaCache, keyedObjectPool, scheduled, resetExecutor, sentinelManager));
+                            chain.add(new ResetSentinels(context, metaCache, keyedObjectPool, scheduled, resetExecutor, sentinelManager, checkerConfig));
                             chain.add(new AddSentinels(context, sentinelManager, checkerConfig));
                             chain.add(new SetSentinels(context, sentinelManager));
                             chain.execute().addListener(commandFuture -> {