[iotdb] branch kyy updated: delete

[yuyuankang]

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

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


The following commit(s) were added to refs/heads/kyy by this push:
     new 324689e  delete
324689e is described below

commit 324689ec293fe368e04be0add6533db663d97e03
Author: Ring-k <yuyuank...@hotmail.com>
AuthorDate: Mon Oct 26 19:10:31 2020 +0800

    delete
---
 .../iotdb/cluster/server/member/MetaGroupMember.java      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
index e5da6fa..8f231d7 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
@@ -120,6 +120,7 @@ import org.apache.iotdb.cluster.utils.ClusterUtils;
 import org.apache.iotdb.cluster.utils.PartitionUtils;
 import org.apache.iotdb.cluster.utils.PartitionUtils.Intervals;
 import org.apache.iotdb.cluster.utils.StatusUtils;
+import org.apache.iotdb.cluster.utils.nodetool.function.Status;
 import org.apache.iotdb.db.conf.IoTDBConstant;
 import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.engine.StorageEngine;
@@ -1655,10 +1656,16 @@ public class MetaGroupMember extends RaftMember {
         status = forwardPlan(plan, partitionGroup);
       }
       if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-        // execution failed, record the error message
-        errorCodePartitionGroups.add(String.format("[%s@%s:%s]",
-            status.getCode(), partitionGroup.getHeader(),
-            status.getMessage()));
+        if (plan instanceof DeleteTimeSeriesPlan
+            && status.getCode() == 
TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode()) {
+          status = StatusUtils.OK;
+        } else {
+          // execution failed, record the error message
+          errorCodePartitionGroups.add(String.format("[%s@%s:%s]",
+              status.getCode(), partitionGroup.getHeader(),
+              status.getMessage()));
+        }
+
       }
     }
     if (errorCodePartitionGroups.isEmpty()) {