[iotdb] branch master updated: Fix mlog recover log level (#1883)

[qiaojialin]

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

qiaojialin 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 aecbd40   Fix mlog recover log level (#1883)
aecbd40 is described below

commit aecbd40f02eb5028ac291a0dd125a263c540ed53
Author: SilverNarcissus <151250...@smail.nju.edu.cn>
AuthorDate: Wed Oct 28 16:54:08 2020 +0800

     Fix mlog recover log level (#1883)
---
 server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 98fa38b..f850353 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
@@ -325,7 +325,14 @@ public class MManager {
         }
         break;
       case MetadataOperationType.SET_STORAGE_GROUP:
-        setStorageGroup(new PartialPath(args[1]));
+        try {
+          setStorageGroup(new PartialPath(args[1]));
+        }
+        // two time series may set one storage group concurrently,
+        // that's normal in our concurrency control protocol
+        catch (MetadataException e){
+          logger.info("concurrently operate set storage group cmd {} twice", 
cmd);
+        }
         break;
       case MetadataOperationType.DELETE_STORAGE_GROUP:
         deleteStorageGroups(Collections.singletonList(new 
PartialPath(args[1])));