diff --git a/server/src/main/java/com/github/dtprj/dongting/raft/store/ChainWriter.java b/server/src/main/java/com/github/dtprj/dongting/raft/store/ChainWriter.java index 01421fc0..8a12a81c 100644 --- a/server/src/main/java/com/github/dtprj/dongting/raft/store/ChainWriter.java +++ b/server/src/main/java/com/github/dtprj/dongting/raft/store/ChainWriter.java @@ -78,11 +78,11 @@ public ChainWriter(RaftGroupConfigEx config, String fiberNamePrefix, int writePe protected abstract void forceFinish(WriteTask writeTask); - public void startForceFiber() { + public void start() { forceFiber.start(); } - public FiberFuture shutdownForceFiber() { + public FiberFuture stop() { this.close = true; needForceCondition.signal(); if (forceFiber.isStarted()) { diff --git a/server/src/main/java/com/github/dtprj/dongting/raft/store/IdxFileQueue.java b/server/src/main/java/com/github/dtprj/dongting/raft/store/IdxFileQueue.java index e58c2039..f648bae9 100644 --- a/server/src/main/java/com/github/dtprj/dongting/raft/store/IdxFileQueue.java +++ b/server/src/main/java/com/github/dtprj/dongting/raft/store/IdxFileQueue.java @@ -129,7 +129,7 @@ public FiberFrame> initRestorePos() throws Exception { } log.info("restore from index: {}, pos: {}", restoreIndex, restoreStartPos); flushFiber.start(); - chainWriter.startForceFiber(); + chainWriter.start(); return FiberFrame.completedFrame(new Pair<>(restoreIndex, restoreStartPos)); } else { nextIndex = restoreIndex + 1; @@ -150,7 +150,7 @@ private FrameCallResult afterLoad(Long restoreIndexPos) { log.info("restore from index: {}, pos: {}", finalRestoreIndex, restoreIndexPos); setResult(new Pair<>(finalRestoreIndex, restoreIndexPos)); flushFiber.start(); - chainWriter.startForceFiber(); + chainWriter.start(); return Fiber.frameReturn(); } @@ -488,7 +488,7 @@ public FiberFuture close() { if (ex != null) { closeFuture.completeExceptionally(ex); } else { - chainWriter.shutdownForceFiber().registerCallback((v2, ex2) -> { + chainWriter.stop().registerCallback((v2, ex2) -> { if (ex2 != null) { closeFuture.completeExceptionally(ex2); } else { diff --git a/server/src/main/java/com/github/dtprj/dongting/raft/store/LogAppender.java b/server/src/main/java/com/github/dtprj/dongting/raft/store/LogAppender.java index fbe79619..c13ba264 100644 --- a/server/src/main/java/com/github/dtprj/dongting/raft/store/LogAppender.java +++ b/server/src/main/java/com/github/dtprj/dongting/raft/store/LogAppender.java @@ -91,7 +91,7 @@ class LogAppender { public void startFiber() { appendFiber.start(); - chainWriter.startForceFiber(); + chainWriter.start(); } public FiberFuture close() { @@ -107,7 +107,7 @@ public FiberFuture close() { if (ex != null) { closeFuture.completeExceptionally(ex); } else { - chainWriter.shutdownForceFiber().registerCallback((v2, ex2) -> { + chainWriter.stop().registerCallback((v2, ex2) -> { if (ex2 != null) { closeFuture.completeExceptionally(ex2); } else {