[iotdb] branch rel/0.13 updated: fix concurrent auto create aligned timeseries (#7553)

[haonan]

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 2d2df6a90b fix concurrent auto create aligned timeseries (#7553)
2d2df6a90b is described below

commit 2d2df6a90b4f09a6b44356629cb4aff2b97bd99b
Author: Marcos_Zyk <38524330+marcos...@users.noreply.github.com>
AuthorDate: Mon Oct 10 15:47:35 2022 +0800

    fix concurrent auto create aligned timeseries (#7553)
---
 .../src/main/java/org/apache/iotdb/db/metadata/MManager.java | 12 +++++++++++-
 1 file changed, 11 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 9be5fc84db..2e8333553b 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
@@ -2213,7 +2213,17 @@ public class MManager {
       encodings.add(getDefaultEncoding(dataType));
       
compressors.add(TSFileDescriptor.getInstance().getConfig().getCompressor());
     }
-    createAlignedTimeSeries(prefixPath, measurements, dataTypes, encodings, 
compressors);
+    try {
+      createAlignedTimeSeries(prefixPath, measurements, dataTypes, encodings, 
compressors);
+    } catch (PathAlreadyExistException | AliasAlreadyExistException e) {
+      if (logger.isDebugEnabled()) {
+        logger.debug(
+            "Ignore PathAlreadyExistException and AliasAlreadyExistException 
when Concurrent inserting"
+                + " non-exist aligned time series {} under device {}",
+            measurements,
+            prefixPath);
+      }
+    }
   }
 
   // endregion