(iotdb) branch master updated: Make Drop database timeout return message more detailed (#12082)

[chenyz]

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

chenyz 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 1b9c712dfd7 Make Drop database timeout return message more detailed 
(#12082)
1b9c712dfd7 is described below

commit 1b9c712dfd7235f1966b678cfba98d447d35956a
Author: Chen YZ <43774645+cpau...@users.noreply.github.com>
AuthorDate: Wed Feb 28 09:28:59 2024 +0800

    Make Drop database timeout return message more detailed (#12082)
    
    Make Drop database timeout return message more detailed
---
 .../config/executor/ClusterConfigTaskExecutor.java         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
index 4a240d6b055..e230a70591d 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
@@ -377,7 +377,12 @@ public class ClusterConfigTaskExecutor implements 
IConfigTaskExecutor {
             "Failed to execute delete database {} in config node, status is 
{}.",
             deleteDatabaseStatement.getPrefixPath(),
             tsStatus);
-        future.setException(new IoTDBException(tsStatus.getMessage(), 
tsStatus.getCode()));
+        if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) 
{
+          future.setException(
+              new BatchProcessException(tsStatus.subStatus.toArray(new 
TSStatus[0])));
+        } else {
+          future.setException(new IoTDBException(tsStatus.message, 
tsStatus.getCode()));
+        }
       } else {
         future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
       }
@@ -1828,7 +1833,12 @@ public class ClusterConfigTaskExecutor implements 
IConfigTaskExecutor {
             "Failed to execute delete timeseries {} in config node, status is 
{}.",
             deleteTimeSeriesStatement.getPathPatternList(),
             tsStatus);
-        future.setException(new IoTDBException(tsStatus.getMessage(), 
tsStatus.getCode()));
+        if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) 
{
+          future.setException(
+              new BatchProcessException(tsStatus.subStatus.toArray(new 
TSStatus[0])));
+        } else {
+          future.setException(new IoTDBException(tsStatus.getMessage(), 
tsStatus.getCode()));
+        }
       } else {
         future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
       }