[iotdb] branch template_restart_bug updated (afb0854 -> 07ed796)

[ta...@apache.org]

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

tanxinyu pushed a change to branch template_restart_bug
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


 discard afb0854  fix
     new 07ed796  fix

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (afb0854)
            \
             N -- N -- N   refs/heads/template_restart_bug (07ed796)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 3 +++
 1 file changed, 3 insertions(+)

[iotdb] 01/01: fix

[ta...@apache.org]

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

tanxinyu pushed a commit to branch template_restart_bug
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 07ed79657fddf6af62ad842a851089f012a225b8
Author: LebronAl <TX...@gmail.com>
AuthorDate: Mon Jul 19 16:34:06 2021 +0800

    fix
---
 server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 6 ++++++
 1 file changed, 6 insertions(+)

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 674c90e..b1c7234 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
@@ -1089,14 +1089,18 @@ public class MManager {
       }
       node = mtree.getDeviceNodeWithAutoCreating(path, sgLevel);
       if (!(node.left instanceof StorageGroupMNode)) {
+        logger.warn("autoCreateDeviceMNode begins:{}", node.left.getPartialPath());
         logWriter.autoCreateDeviceMNode(new AutoCreateDeviceMNodePlan(node.left.getPartialPath()));
+        logger.warn("autoCreateDeviceMNode success:{}", node.left.getPartialPath());
       }
       return node;
     } catch (StorageGroupAlreadySetException e) {
       // ignore set storage group concurrently
       node = mtree.getDeviceNodeWithAutoCreating(path, sgLevel);
       if (!(node.left instanceof StorageGroupMNode)) {
+        logger.warn("autoCreateDeviceMNode begins:{}", node.left.getPartialPath());
         logWriter.autoCreateDeviceMNode(new AutoCreateDeviceMNodePlan(node.left.getPartialPath()));
+        logger.warn("autoCreateDeviceMNode success:{}", node.left.getPartialPath());
       }
       return node;
     }
@@ -1980,7 +1984,9 @@ public class MManager {
       if (!deviceMNode.left.isUseTemplate()) {
         deviceMNode.left.setUseTemplate(true);
         try {
+          logger.warn("setUsingDeviceTemplate begins:{}", deviceMNode.left.getPartialPath());
           logWriter.setUsingDeviceTemplate(deviceMNode.left.getPartialPath());
+          logger.warn("setUsingDeviceTemplate success:{}", deviceMNode.left.getPartialPath());
         } catch (IOException e) {
           throw new MetadataException(e);
         }