forked from sofastack/sofa-jraft
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Some corner cases fixes (sofastack#462)
* (fix) replicator state * (fix) Replicate logs before appliedIndex should be considered success. * (feat) prevent too many block timer created when fail to append entries * (feat) dump threads stack when test hang too long * (fix) code format * (feat) revert readLock for Node#isLeader * (feat) adds test cases for fixes * (feat) Adds RpcUtils to run replicator/rpc closures, sofastack#426 * (fix) testReadIndexFromLearner may hang when learner state is not synced * (fix) format * format * format Co-authored-by: jiachun.fjc <[email protected]>
- Loading branch information
1 parent
e734a5b
commit 0d8c96f
Showing
11 changed files
with
294 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
jraft-core/src/main/java/com/alipay/sofa/jraft/rpc/RpcUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.alipay.sofa.jraft.rpc; | ||
|
|
||
| import java.util.concurrent.Future; | ||
| import java.util.concurrent.SynchronousQueue; | ||
| import java.util.concurrent.ThreadPoolExecutor; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.alipay.sofa.jraft.Closure; | ||
| import com.alipay.sofa.jraft.Status; | ||
| import com.alipay.sofa.jraft.util.NamedThreadFactory; | ||
| import com.alipay.sofa.jraft.util.SystemPropertyUtil; | ||
| import com.alipay.sofa.jraft.util.ThreadPoolUtil; | ||
| import com.alipay.sofa.jraft.util.Utils; | ||
|
|
||
| /** | ||
| * RPC utilities | ||
| * | ||
| * @author boyan([email protected]) | ||
| */ | ||
| public final class RpcUtils { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(RpcUtils.class); | ||
|
|
||
| /** | ||
| * Default jraft closure executor pool minimum size, CPUs by default. | ||
| */ | ||
| public static final int MIN_RPC_CLOSURE_EXECUTOR_POOL_SIZE = SystemPropertyUtil.getInt( | ||
| "jraft.rpc.closure.threadpool.size.min", | ||
| Utils.cpus()); | ||
|
|
||
| /** | ||
| * Default jraft closure executor pool maximum size. | ||
| */ | ||
| public static final int MAX_RPC_CLOSURE_EXECUTOR_POOL_SIZE = SystemPropertyUtil.getInt( | ||
| "jraft.rpc.closure.threadpool.size.max", | ||
| Math.max(100, Utils.cpus() * 5)); | ||
|
|
||
| /** | ||
| * Global thread pool to run rpc closure. | ||
| */ | ||
| private static ThreadPoolExecutor RPC_CLOSURE_EXECUTOR = ThreadPoolUtil | ||
| .newBuilder() | ||
| .poolName("JRAFT_RPC_CLOSURE_EXECUTOR") | ||
| .enableMetric(true) | ||
| .coreThreads( | ||
| MIN_RPC_CLOSURE_EXECUTOR_POOL_SIZE) | ||
| .maximumThreads( | ||
| MAX_RPC_CLOSURE_EXECUTOR_POOL_SIZE) | ||
| .keepAliveSeconds(60L) | ||
| .workQueue(new SynchronousQueue<>()) | ||
| .threadFactory( | ||
| new NamedThreadFactory( | ||
| "JRaft-Rpc-Closure-Executor-", | ||
| true)) // | ||
| .build(); | ||
|
|
||
| /** | ||
| * Run closure with OK status in thread pool. | ||
| */ | ||
| public static Future<?> runClosureInThread(final Closure done) { | ||
| if (done == null) { | ||
| return null; | ||
| } | ||
| return runClosureInThread(done, Status.OK()); | ||
| } | ||
|
|
||
| /** | ||
| * Run a task in thread pool,returns the future object. | ||
| */ | ||
| public static Future<?> runInThread(final Runnable runnable) { | ||
| return RPC_CLOSURE_EXECUTOR.submit(runnable); | ||
| } | ||
|
|
||
| /** | ||
| * Run closure with status in thread pool. | ||
| */ | ||
| public static Future<?> runClosureInThread(final Closure done, final Status status) { | ||
| if (done == null) { | ||
| return null; | ||
| } | ||
|
|
||
| return runInThread(() -> { | ||
| try { | ||
| done.run(status); | ||
| } catch (final Throwable t) { | ||
| LOG.error("Fail to run done closure", t); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private RpcUtils() { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.