[iotdb] branch rel/0.12 updated: Fix TotalSeriesNumber in MManager counted twice when recovering (#3278)

[sunzesong]

This is an automated email from the ASF dual-hosted git repository.

sunzesong pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.12 by this push:
     new 36a9cc5  Fix TotalSeriesNumber in MManager counted twice when 
recovering (#3278)
36a9cc5 is described below

commit 36a9cc5bd3881fc4190dd1f4d0d208955caa014c
Author: Haonan <hhao...@outlook.com>
AuthorDate: Fri May 28 09:13:23 2021 +0800

    Fix TotalSeriesNumber in MManager counted twice when recovering (#3278)
---
 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 f6bfb3c..8224995 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
@@ -231,16 +231,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 b5baa6e..26c1d9a 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
@@ -738,7 +738,7 @@ public class MManagerBasicTest {
   }
 
   @Test
-  public void testTotalSeriesNumber() {
+  public void testTotalSeriesNumber() throws Exception {
     MManager manager = IoTDB.metaManager;
 
     try {
@@ -781,6 +781,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")));