You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yu...@apache.org on 2020/07/22 13:37:51 UTC
[incubator-iotdb] branch kyy2 updated: rename minimum number of
logs in memory
This is an automated email from the ASF dual-hosted git repository.
yuyuankang pushed a commit to branch kyy2
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/kyy2 by this push:
new 23daa11 rename minimum number of logs in memory
23daa11 is described below
commit 23daa1115a27e2d63b9d5b6a29135ecb7e8d7242
Author: Ring-k <yu...@hotmail.com>
AuthorDate: Wed Jul 22 21:37:36 2020 +0800
rename minimum number of logs in memory
---
.../java/org/apache/iotdb/cluster/config/ClusterConfig.java | 10 +++++-----
.../org/apache/iotdb/cluster/config/ClusterDescriptor.java | 4 ++--
.../org/apache/iotdb/cluster/log/manage/RaftLogManager.java | 12 ++++++------
.../apache/iotdb/cluster/log/manage/RaftLogManagerTest.java | 3 +--
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
index c1fd58e..64b564c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
@@ -63,7 +63,7 @@ public class ClusterConfig {
/**
* max number of committed logs to be saved
*/
- private int maxNumberOfLogs = 100;
+ private int minNumOfLogsInMem = 100;
/**
* max number of committed logs in memory
@@ -216,12 +216,12 @@ public class ClusterConfig {
this.queryTimeoutInSec = queryTimeoutInSec;
}
- public int getMaxNumberOfLogs() {
- return maxNumberOfLogs;
+ public int getMinNumOfLogsInMem() {
+ return minNumOfLogsInMem;
}
- public void setMaxNumberOfLogs(int maxNumberOfLogs) {
- this.maxNumberOfLogs = maxNumberOfLogs;
+ public void setMinNumOfLogsInMem(int minNumOfLogsInMem) {
+ this.minNumOfLogsInMem = minNumOfLogsInMem;
}
public int getLogDeleteCheckIntervalSecond() {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java
index 74bd71b..e9e9e37 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java
@@ -223,8 +223,8 @@ public class ClusterDescriptor {
config.setUseBatchInLogCatchUp(Boolean.parseBoolean(properties.getProperty(
"use_batch_in_catch_up", String.valueOf(config.isUseBatchInLogCatchUp()))));
- config.setMaxNumberOfLogs(Integer.parseInt(
- properties.getProperty("max_number_of_logs", String.valueOf(config.getMaxNumberOfLogs()))));
+ config.setMinNumOfLogsInMem(Integer.parseInt(properties
+ .getProperty("min_num_of_logs_in_mem", String.valueOf(config.getMinNumOfLogsInMem()))));
config.setMaxNumOfLogsInMem(Integer.parseInt(properties
.getProperty("max_num_of_logs_in_mem", String.valueOf(config.getMaxNumOfLogsInMem()))));
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/RaftLogManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/RaftLogManager.java
index e3850e6..1e4bde5 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/RaftLogManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/RaftLogManager.java
@@ -61,9 +61,9 @@ public class RaftLogManager {
/**
- * max number of committed logs to be saved
+ * minimum number of committed logs in memory
*/
- private int maxNumberOfLogs = ClusterDescriptor.getInstance().getConfig().getMaxNumberOfLogs();
+ private int minNumOfLogsInMem = ClusterDescriptor.getInstance().getConfig().getMinNumOfLogsInMem();
public RaftLogManager(StableEntryManager stableEntryManager, LogApplier applier, String name) {
@@ -530,8 +530,8 @@ public class RaftLogManager {
}
@TestOnly
- public void setMaxNumberOfLogs(int maxNumberOfLogs) {
- this.maxNumberOfLogs = maxNumberOfLogs;
+ public void setMinNumOfLogsInMem(int minNumOfLogsInMem) {
+ this.minNumOfLogsInMem = minNumOfLogsInMem;
}
public void close() {
@@ -574,10 +574,10 @@ public class RaftLogManager {
*/
public void checkDeleteLog() {
synchronized (this) {
- if (committedEntryManager.getTotalSize() <= maxNumberOfLogs) {
+ if (committedEntryManager.getTotalSize() <= minNumOfLogsInMem) {
return;
}
- long removeSize = committedEntryManager.getTotalSize() - maxNumberOfLogs;
+ long removeSize = committedEntryManager.getTotalSize() - minNumOfLogsInMem;
long compactIndex = committedEntryManager.getDummyIndex() + removeSize;
try {
logger.info(
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/RaftLogManagerTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/RaftLogManagerTest.java
index ad69f89..8702c2f 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/RaftLogManagerTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/RaftLogManagerTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import org.apache.iotdb.cluster.common.TestLogApplier;
import org.apache.iotdb.cluster.common.TestUtils;
import org.apache.iotdb.cluster.exception.EntryCompactedException;
-import org.apache.iotdb.cluster.exception.EntryUnavailableException;
import org.apache.iotdb.cluster.exception.GetEntriesWrongParametersException;
import org.apache.iotdb.cluster.exception.LogExecutionException;
import org.apache.iotdb.cluster.log.Log;
@@ -1026,7 +1025,7 @@ public class RaftLogManagerTest {
int maxNumberOfLogs = 100;
List<Log> testLogs1;
- raftLogManager.setMaxNumberOfLogs(maxNumberOfLogs);
+ raftLogManager.setMinNumOfLogsInMem(maxNumberOfLogs);
testLogs1 = TestUtils.prepareNodeLogs(130);
raftLogManager.append(testLogs1);
try {