Audit-service HA election through mysql

doleyzi · Apr 8, 2024 · 3f38ef3 · 3f38ef3
1 parent 716323a
commit 3f38ef3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/inlong-audit/audit-service/src/main/java/elector/api/Selector.java b/inlong-audit/audit-service/src/main/java/elector/api/Selector.java
@@ -38,5 +38,5 @@ public abstract class Selector {
 
     public abstract boolean rebuildSelectorDBSource();
 
-    public abstract boolean close();
+    public abstract void close();
 }
diff --git a/inlong-audit/audit-service/src/main/java/elector/impl/SelectorImpl.java b/inlong-audit/audit-service/src/main/java/elector/impl/SelectorImpl.java
@@ -173,32 +173,33 @@ class ElectorWorkerThread implements Runnable {
 
         public void run() {
             while (running) {
-                try {
-                    if (canElector) {
-                        dbDataSource.leaderSelector();
-                    }
+                if (canElector) {
+                    dbDataSource.leaderSelector();
+                }
+
+                String leaderId = dbDataSource.getCurrentLeader();
+                if (StringUtils.isNotEmpty(leaderId)) {
+                    if (selectorConfig.getLeaderId().equals(leaderId)) {
+                        if (!isLeader
+                                && selectorConfig.getSelectorChangeListener() != null) {
+                            selectorConfig.getSelectorChangeListener().leaderChanged(true);
+                        }
 
-                    String leaderId = dbDataSource.getCurrentLeader();
-                    if (StringUtils.isNotEmpty(leaderId)) {
-                        if (selectorConfig.getLeaderId().equals(leaderId)) {
-                            if (!isLeader
-                                    && selectorConfig.getSelectorChangeListener() != null) {
-                                selectorConfig.getSelectorChangeListener().leaderChanged(true);
-                            }
-
-                            isLeader = true;
-                            sleepTime = selectorConfig.getTryToBeLeaderInterval();
-                        } else {
-                            if (isLeader
-                                    && selectorConfig.getSelectorChangeListener() != null) {
-                                selectorConfig.getSelectorChangeListener().leaderChanged(false);
-                            }
-
-                            isLeader = false;
-                            sleepTime = selectorConfig.getTryToBeLeaderInterval()
-                                    + random.nextInt(RANDOM_BOUND);
+                        isLeader = true;
+                        sleepTime = selectorConfig.getTryToBeLeaderInterval();
+                    } else {
+                        if (isLeader
+                                && selectorConfig.getSelectorChangeListener() != null) {
+                            selectorConfig.getSelectorChangeListener().leaderChanged(false);
                         }
+
+                        isLeader = false;
+                        sleepTime = selectorConfig.getTryToBeLeaderInterval()
+                                + random.nextInt(RANDOM_BOUND);
                     }
+                }
+
+                try {
                     TimeUnit.SECONDS.sleep(sleepTime);
                 } catch (Exception exception) {
                     logger.error("Exception :{}", exception.getMessage());