You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/11/04 08:29:21 UTC
[iotdb] 01/01: fix disk_space_warning_threshold
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/master1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b1b6b35050bb9fd10ffc362e58587168a34c372d
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Fri Nov 4 16:29:03 2022 +0800
fix disk_space_warning_threshold
---
.../iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java | 2 +-
.../procedure/impl/statemachine/RegionMigrateProcedure.java | 2 +-
node-commons/src/assembly/resources/conf/iotdb-common.properties | 2 +-
.../src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java | 2 +-
.../iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java
index 235a6a7376..f8c6f7b83c 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java
@@ -195,7 +195,7 @@ public class RemoveDataNodeProcedure extends AbstractNodeProcedure<RemoveDataNod
RegionMigrateProcedure regionMigrateProcedure =
new RegionMigrateProcedure(regionId, disableDataNodeLocation, destDataNode);
addChildProcedure(regionMigrateProcedure);
- LOG.info("Submit child procedure, {}", regionMigrateProcedure);
+ LOG.info("Submit child procedure {} for regionId {}", regionMigrateProcedure, regionId);
}
});
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/statemachine/RegionMigrateProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/statemachine/RegionMigrateProcedure.java
index 6a7706ed6e..22509193a7 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/statemachine/RegionMigrateProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/statemachine/RegionMigrateProcedure.java
@@ -142,7 +142,7 @@ public class RegionMigrateProcedure
setFailure(new ProcedureException("Region migrate failed at state: " + state));
} else {
LOG.error(
- "{}, Failed state is not support rollback, failed state {}, originalDataNode: {}",
+ "{}, Failed state [{}] is not support rollback, originalDataNode: {}",
REMOVE_DATANODE_PROCESS,
state,
originalDataNode);
diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties b/node-commons/src/assembly/resources/conf/iotdb-common.properties
index 8e78af7200..4af1129e8d 100644
--- a/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -1163,7 +1163,7 @@ trigger_forward_mqtt_pool_size=4
# Disk remaining threshold at which DataNode is set to ReadOnly status
# Datatype: double(percentage)
-# disk_space_warning_threshold=5.0
+# disk_space_warning_threshold=0.05
####################
### Configurations for tsfile-format
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
index 21a935d5db..f3f1062bb8 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -117,7 +117,7 @@ public class CommonConfig {
private volatile String statusReason = null;
/** Disk Monitor */
- private double diskSpaceWarningThreshold = 5.0;
+ private double diskSpaceWarningThreshold = 0.05;
CommonConfig() {}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index 8e49715cbc..4f5269e211 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@ -1037,8 +1037,8 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
.value();
if (freeDisk != 0 && totalDisk != 0) {
- double freeDiskRatio = (double) freeDisk * 100 / totalDisk;
- loadSample.setDiskUsageRate(100.0 - freeDiskRatio);
+ double freeDiskRatio = (double) freeDisk / totalDisk;
+ loadSample.setDiskUsageRate(1.0 - freeDiskRatio);
// Reset NodeStatus if necessary
if (freeDiskRatio < commonConfig.getDiskSpaceWarningThreshold()) {
commonConfig.setNodeStatus(NodeStatus.ReadOnly);