Revert "修复偶尔写坏数据问题"

This reverts commit 7df7bc1
jd-opensource · Jul 7, 2020 · e4a4296 · e4a4296
1 parent 7df7bc1
commit e4a4296
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/journalkeeper-core/src/main/java/io/journalkeeper/core/server/Leader.java b/journalkeeper-core/src/main/java/io/journalkeeper/core/server/Leader.java
@@ -77,6 +77,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
+import static io.journalkeeper.core.api.RaftJournal.INTERNAL_PARTITION;
 import static io.journalkeeper.core.server.MetricNames.METRIC_APPEND_ENTRIES_RPC;
 import static io.journalkeeper.core.server.ThreadNames.FLUSH_JOURNAL_THREAD;
 import static io.journalkeeper.core.server.ThreadNames.LEADER_APPEND_ENTRY_THREAD;
@@ -539,13 +540,15 @@ protected void doStart() {
 
     private void appendLeaderAnnouncementEntry() {
         // Leader announcement
-        byte[] payload = InternalEntriesSerializeSupport.serialize(new LeaderAnnouncementEntry(currentTerm, serverUri));
-        updateClusterState(
-                new UpdateClusterStateRequest(
-                        new UpdateRequest(payload, RaftJournal.INTERNAL_PARTITION, 1
-                        )
-                )
-        );
+        try {
+            byte[] payload = InternalEntriesSerializeSupport.serialize(new LeaderAnnouncementEntry(currentTerm, serverUri));
+            JournalEntry journalEntry = journalEntryParser.createJournalEntry(payload);
+            journalEntry.setTerm(currentTerm);
+            journalEntry.setPartition(INTERNAL_PARTITION);
+            appendAndCallback(Collections.singletonList(journalEntry), null, null);
+        } catch (InterruptedException e) {
+            logger.warn("Exception: ", e);
+        }
     }
 
     private void takeSnapshotPeriodically() {