You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2021/05/28 01:07:40 UTC
[iotdb] branch master updated: Fix TotalSeriesNumber in MManager
counted twice when recovering (#3276)
This is an automated email from the ASF dual-hosted git repository.
sunzesong 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 363bda9 Fix TotalSeriesNumber in MManager counted twice when recovering (#3276)
363bda9 is described below
commit 363bda92dbdb0f2f4739138ec858c91bb7c81efb
Author: Haonan <hh...@outlook.com>
AuthorDate: Fri May 28 09:07:02 2021 +0800
Fix TotalSeriesNumber in MManager counted twice when recovering (#3276)
---
server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 7 +------
.../test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java | 4 +++-
2 files changed, 4 insertions(+), 7 deletions(-)
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 098d40f..bac2ad5 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
@@ -248,16 +248,11 @@ public class MManager {
isRecovering = true;
int lineNumber = initFromLog(logFile);
- List<PartialPath> storageGroups = mtree.getAllStorageGroupPaths();
- for (PartialPath sg : storageGroups) {
- MNode node = mtree.getNodeByPath(sg);
- totalSeriesNumber.addAndGet(node.getMeasurementMNodeCount());
- }
logWriter = new MLogWriter(config.getSchemaDir(), MetadataConstant.METADATA_LOG);
logWriter.setLogNum(lineNumber);
isRecovering = false;
- } catch (IOException | MetadataException e) {
+ } catch (IOException e) {
logger.error(
"Cannot recover all MTree from file, we try to recover as possible as we can", e);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
index f81c638..cb8960a 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
@@ -1269,7 +1269,7 @@ public class MManagerBasicTest {
}
@Test
- public void testTotalSeriesNumber() {
+ public void testTotalSeriesNumber() throws Exception {
MManager manager = IoTDB.metaManager;
try {
@@ -1312,6 +1312,8 @@ public class MManagerBasicTest {
null);
assertEquals(6, manager.getTotalSeriesNumber());
+ EnvironmentUtils.restartDaemon();
+ assertEquals(6, manager.getTotalSeriesNumber());
manager.deleteTimeseries(new PartialPath("root.laptop.d2.s1"));
assertEquals(5, manager.getTotalSeriesNumber());
manager.deleteStorageGroups(Collections.singletonList(new PartialPath("root.laptop")));