This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch iotdb-3791
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/iotdb-3791 by this push:
new 2dd00fad8b add lock back
2dd00fad8b is described below
commit 2dd00fad8bc30018975df3c378d030a7b24dfd3e
Author: Jinrui.Zhang <[email protected]>
AuthorDate: Thu Jul 14 22:12:53 2022 +0800
add lock back
---
.../service/MultiLeaderRPCServiceProcessor.java | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCServiceProcessor.java
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCServiceProcessor.java
index 36c040c983..e0ddd7f256 100644
---
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCServiceProcessor.java
+++
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCServiceProcessor.java
@@ -73,21 +73,21 @@ public class MultiLeaderRPCServiceProcessor implements
MultiLeaderConsensusIServ
StepTracker.trace("syncLogPrepare", 10, prepareStartTime,
System.nanoTime());
// We use synchronized to ensure atomicity of executing multiple logs
long lockWaitingStartTime = System.nanoTime();
- // synchronized (impl.getStateMachine()) {
- StepTracker.trace("syncLogWaitingLock", 10, lockWaitingStartTime,
System.nanoTime());
- StepTracker.trace("req.getBatches().size()", 10, 0,
req.getBatches().size() * 1000_000L);
- for (TLogBatch batch : req.getBatches()) {
- long writeOneBatch = System.nanoTime();
- statuses.add(
- impl.getStateMachine()
- .write(
- impl.buildIndexedConsensusRequestForRemoteRequest(
- batch.isFromWAL()
- ? new MultiLeaderConsensusRequest(batch.data)
- : new ByteBufferConsensusRequest(batch.data))));
- StepTracker.trace("writeOneBatch", 400, writeOneBatch,
System.nanoTime());
+ synchronized (impl.getStateMachine()) {
+ StepTracker.trace("syncLogWaitingLock", 10, lockWaitingStartTime,
System.nanoTime());
+ StepTracker.trace("req.getBatches().size()", 10, 0,
req.getBatches().size() * 1000_000L);
+ for (TLogBatch batch : req.getBatches()) {
+ long writeOneBatch = System.nanoTime();
+ statuses.add(
+ impl.getStateMachine()
+ .write(
+ impl.buildIndexedConsensusRequestForRemoteRequest(
+ batch.isFromWAL()
+ ? new MultiLeaderConsensusRequest(batch.data)
+ : new ByteBufferConsensusRequest(batch.data))));
+ StepTracker.trace("writeOneBatch", 400, writeOneBatch,
System.nanoTime());
+ }
}
- // }
logger.debug("Execute TSyncLogReq for {} with result {}",
req.consensusGroupId, statuses);
resultHandler.onComplete(new TSyncLogRes(statuses));
} catch (Exception e) {