You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/09/21 06:22:38 UTC

[iotdb] branch rel/0.13 updated: [To rel/0.13][IOTDB-4483] Mismatching error log when recovering storage group (#7377)

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

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


The following commit(s) were added to refs/heads/rel/0.13 by this push:
     new 60f6c0e1e3 [To rel/0.13][IOTDB-4483] Mismatching error log when recovering storage group  (#7377)
60f6c0e1e3 is described below

commit 60f6c0e1e324b0bd186bb432677879c5a18b4d03
Author: Alan Choo <43...@users.noreply.github.com>
AuthorDate: Wed Sep 21 14:22:29 2022 +0800

    [To rel/0.13][IOTDB-4483] Mismatching error log when recovering storage group  (#7377)
---
 .../main/java/org/apache/iotdb/db/engine/StorageEngine.java | 13 ++-----------
 .../engine/storagegroup/virtualSg/StorageGroupManager.java  |  6 ++++++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index 4195118312..6ef91ccb28 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -865,17 +865,8 @@ public class StorageEngine implements IService {
         throw new BatchProcessException(results);
       }
     }
-    VirtualStorageGroupProcessor virtualStorageGroupProcessor;
-    try {
-      virtualStorageGroupProcessor = getProcessor(insertTabletPlan.getDevicePath());
-    } catch (StorageEngineException e) {
-      throw new StorageEngineException(
-          String.format(
-              "Get StorageGroupProcessor of device %s " + "failed",
-              insertTabletPlan.getDevicePath()),
-          e);
-    }
-
+    VirtualStorageGroupProcessor virtualStorageGroupProcessor =
+        getProcessor(insertTabletPlan.getDevicePath());
     getSeriesSchemas(insertTabletPlan, virtualStorageGroupProcessor);
     virtualStorageGroupProcessor.insertTablet(insertTabletPlan);
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/StorageGroupManager.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/StorageGroupManager.java
index b3a8d6cd9c..fb864ac89f 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/StorageGroupManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/StorageGroupManager.java
@@ -179,6 +179,9 @@ public class StorageGroupManager {
         }
       } else {
         // not finished recover, refuse the request
+        logger.warn(
+            "the sg {} may not ready now, please wait and retry later",
+            storageGroupMNode.getFullPath());
         throw new StorageGroupNotReadyException(
             storageGroupMNode.getFullPath(), TSStatusCode.STORAGE_GROUP_NOT_READY.getStatusCode());
       }
@@ -215,6 +218,9 @@ public class StorageGroupManager {
         }
       } else {
         // not finished recover, refuse the request
+        logger.warn(
+            "the sg {} may not ready now, please wait and retry later",
+            storageGroupMNode.getFullPath());
         throw new StorageGroupNotReadyException(
             storageGroupMNode.getFullPath(), TSStatusCode.STORAGE_GROUP_NOT_READY.getStatusCode());
       }