You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/01/13 07:12:47 UTC
[iotdb] branch jira5324_cp created (now c7eb188c24)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a change to branch jira5324_cp
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at c7eb188c24 [IOTDB-5324] Fix wal cann't be deleted in destDataNode after region migration when data_replication_factor is 1 in IoTConsensus (#8836)
This branch includes the following new commits:
new c7eb188c24 [IOTDB-5324] Fix wal cann't be deleted in destDataNode after region migration when data_replication_factor is 1 in IoTConsensus (#8836)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: [IOTDB-5324] Fix wal cann't be deleted in destDataNode after region migration when data_replication_factor is 1 in IoTConsensus (#8836)
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch jira5324_cp
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c7eb188c24a550bab69702fb4e73592ccba32167
Author: Potato <ta...@apache.org>
AuthorDate: Fri Jan 13 09:47:38 2023 +0800
[IOTDB-5324] Fix wal cann't be deleted in destDataNode after region migration when data_replication_factor is 1 in IoTConsensus (#8836)
Signed-off-by: OneSizeFitQuorum <ta...@apache.org>
---
.../iotdb/consensus/iot/IoTConsensusServerImpl.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensusServerImpl.java b/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensusServerImpl.java
index b36468d6c6..f8a4316db9 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensusServerImpl.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensusServerImpl.java
@@ -132,10 +132,7 @@ public class IoTConsensusServerImpl {
this.logDispatcher = new LogDispatcher(this, clientManager);
reader = (ConsensusReqReader) stateMachine.read(new GetConsensusReqReaderPlan());
long currentSearchIndex = reader.getCurrentSearchIndex();
- if (1 == configuration.size()) {
- // only one configuration means single replica.
- reader.setSafelyDeletedSearchIndex(Long.MAX_VALUE);
- }
+ checkAndUpdateSafeDeletedSearchIndex();
this.searchIndex = new AtomicLong(currentSearchIndex);
this.consensusGroupId = thisNode.getGroupId().toString();
this.metrics = new IoTConsensusServerMetrics(this);
@@ -606,6 +603,7 @@ public class IoTConsensusServerImpl {
logger.info("[IoTConsensus] log dispatcher to {} removed and cleanup", targetPeer);
// step 2, update configuration
configuration.remove(targetPeer);
+ checkAndUpdateSafeDeletedSearchIndex();
// step 3, persist configuration
persistConfigurationUpdate();
logger.info("[IoTConsensus] configuration updated to {}", this.configuration);
@@ -792,4 +790,14 @@ public class IoTConsensusServerImpl {
reader.setSafelyDeletedSearchIndex(searchIndex.get());
}
}
+
+ /**
+ * only one configuration means single replica, then we can set safelyDeletedSearchIndex to
+ * Long.MAX_VALUE.
+ */
+ public void checkAndUpdateSafeDeletedSearchIndex() {
+ if (configuration.size() == 1) {
+ reader.setSafelyDeletedSearchIndex(Long.MAX_VALUE);
+ }
+ }
}