This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 532e2d0893 [IOTDB-3990] Remove useless param in
IndexedConsensusRequest and add some logs. (#6820)
532e2d0893 is described below
commit 532e2d0893ffeb634ba89fc274f5bc20edfd3f01
Author: ZhangHongYin <[email protected]>
AuthorDate: Fri Jul 29 10:17:58 2022 +0800
[IOTDB-3990] Remove useless param in IndexedConsensusRequest and add some
logs. (#6820)
---
.../common/request/IndexedConsensusRequest.java | 20 ++------------------
.../consensus/multileader/MultiLeaderServerImpl.java | 5 +++--
.../multileader/logdispatcher/LogDispatcher.java | 7 ++++++-
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IndexedConsensusRequest.java
b/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IndexedConsensusRequest.java
index de7ac07250..de3aca433b 100644
---
a/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IndexedConsensusRequest.java
+++
b/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IndexedConsensusRequest.java
@@ -19,8 +19,6 @@
package org.apache.iotdb.consensus.common.request;
-import org.apache.iotdb.consensus.multileader.wal.ConsensusReqReader;
-
import java.nio.ByteBuffer;
import java.util.List;
import java.util.Objects;
@@ -31,18 +29,10 @@ public class IndexedConsensusRequest implements
IConsensusRequest {
/** we do not need to serialize these two fields as they are useless in
other nodes. */
private final long searchIndex;
- private final long safelyDeletedSearchIndex;
-
private final List<IConsensusRequest> requests;
public IndexedConsensusRequest(long searchIndex, List<IConsensusRequest>
requests) {
- this(searchIndex, ConsensusReqReader.DEFAULT_SAFELY_DELETED_SEARCH_INDEX,
requests);
- }
-
- public IndexedConsensusRequest(
- long searchIndex, long safelyDeletedSearchIndex, List<IConsensusRequest>
requests) {
this.searchIndex = searchIndex;
- this.safelyDeletedSearchIndex = safelyDeletedSearchIndex;
this.requests = requests;
}
@@ -59,10 +49,6 @@ public class IndexedConsensusRequest implements
IConsensusRequest {
return searchIndex;
}
- public long getSafelyDeletedSearchIndex() {
- return safelyDeletedSearchIndex;
- }
-
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -72,13 +58,11 @@ public class IndexedConsensusRequest implements
IConsensusRequest {
return false;
}
IndexedConsensusRequest that = (IndexedConsensusRequest) o;
- return searchIndex == that.searchIndex
- && safelyDeletedSearchIndex == that.safelyDeletedSearchIndex
- && requests.equals(that.requests);
+ return searchIndex == that.searchIndex && requests.equals(that.requests);
}
@Override
public int hashCode() {
- return Objects.hash(searchIndex, safelyDeletedSearchIndex, requests);
+ return Objects.hash(searchIndex, requests);
}
}
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/MultiLeaderServerImpl.java
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/MultiLeaderServerImpl.java
index a0439bf8c9..5573f6ba9a 100644
---
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/MultiLeaderServerImpl.java
+++
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/MultiLeaderServerImpl.java
@@ -114,9 +114,9 @@ public class MultiLeaderServerImpl {
buildIndexedConsensusRequestForLocalRequest(request);
if (indexedConsensusRequest.getSearchIndex() % 1000 == 0) {
logger.info(
- "DataRegion[{}]: index after build: safeIndex: {}, searchIndex:
{}",
+ "DataRegion[{}]: index after build: safeIndex:{}, searchIndex: {}",
thisNode.getGroupId(),
- indexedConsensusRequest.getSafelyDeletedSearchIndex(),
+ getCurrentSafelyDeletedSearchIndex(),
indexedConsensusRequest.getSearchIndex());
}
// TODO wal and memtable
@@ -174,6 +174,7 @@ public class MultiLeaderServerImpl {
for (int i = 0; i < size; i++) {
configuration.add(Peer.deserialize(buffer));
}
+ logger.info("Recover multiLeader, configuration: {}", configuration);
} catch (IOException e) {
logger.error("Unexpected error occurs when recovering configuration", e);
}
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/LogDispatcher.java
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/LogDispatcher.java
index 8ab54482f1..71ce7caa45 100644
---
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/LogDispatcher.java
+++
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/LogDispatcher.java
@@ -222,7 +222,7 @@ public class LogDispatcher {
PendingBatch batch;
List<TLogBatch> logBatches = new ArrayList<>();
long startIndex = syncStatus.getNextSendingIndex();
- logger.debug("get batch. startIndex: {}", startIndex);
+ logger.debug("[GetBatch] startIndex: {}", startIndex);
long endIndex;
if (bufferedRequest.size() <=
config.getReplication().getMaxRequestPerBatch()) {
// Use drainTo instead of poll to reduce lock overhead
@@ -302,6 +302,11 @@ public class LogDispatcher {
AsyncMultiLeaderServiceClient client =
clientManager.borrowClient(peer.getEndpoint());
TSyncLogReq req =
new TSyncLogReq(peer.getGroupId().convertToTConsensusGroupId(),
batch.getBatches());
+ logger.debug(
+ "Send Batch[startIndex:{}, endIndex:{}] to ConsensusGroup:{}",
+ batch.getStartIndex(),
+ batch.getEndIndex(),
+ peer.getGroupId().convertToTConsensusGroupId());
client.syncLog(req, handler);
} catch (IOException | TException e) {
logger.error("Can not sync logs to peer {} because", peer, e);
