You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/12/19 07:04:44 UTC
[incubator-iotdb] 01/01: fix a bug of deleting sg
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch fix_jira_375
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 639cf975b81ca659a93e53e33b9d6d23647b1754
Author: lta <li...@163.com>
AuthorDate: Thu Dec 19 15:04:13 2019 +0800
fix a bug of deleting sg
---
.../org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java | 2 +-
.../java/org/apache/iotdb/db/exception/ConfigAdjusterException.java | 4 +++-
server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java b/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
index cbea8c1..9d9dfed 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
@@ -149,7 +149,7 @@ public class IoTDBConfigDynamicAdapter implements IDynamicAdapter {
CONFIG.setMaxMemtableNumber(maxMemTableNum);
CONFIG.setTsFileSizeThreshold(tsFileSizeThreshold);
CONFIG.setMemtableSizeThreshold(memtableSizeInByte);
- if (LOGGER.isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled() && initialized) {
LOGGER.debug(
"After adjusting, max memTable num is {}, tsFile threshold is {}, memtableSize is {}, memTableSizeFloorThreshold is {}, storage group = {}, total timeseries = {}, the max number of timeseries among storage groups = {}",
maxMemTableNum, tsFileSizeThreshold, memtableSizeInByte, memTableSizeFloorThreshold,
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java b/server/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java
index 87b2258..16cee20 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java
@@ -25,7 +25,9 @@ public class ConfigAdjusterException extends ProcessException {
private static final long serialVersionUID = 3502288856999147687L;
public ConfigAdjusterException(String action) {
- super(String.format("IoTDB system load is too large to %s", action));
+ super(String.format(
+ "IoTDB system load is too large to %s, please increase memory or disable the enable_parameter_adapter in iotdb-engine.properties",
+ action));
errorCode = TSStatusCode.CONFIG_ADJUSTER.getStatusCode();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index 0f18e3c..104829f 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -647,7 +647,8 @@ public class MManager {
mNodeCache.clear();
IoTDBConfigDynamicAdapter.getInstance().addOrDeleteStorageGroup(-1);
mgraph.deleteStorageGroup(delStorageGroup);
- seriesNumberInStorageGroups.remove(delStorageGroup);
+ IoTDBConfigDynamicAdapter.getInstance()
+ .addOrDeleteTimeSeries(seriesNumberInStorageGroups.remove(delStorageGroup) * (-1));
ActiveTimeSeriesCounter.getInstance().delete(delStorageGroup);
} catch (PathException e) {
try {