Skip to content

Commit 1b9c712

Browse files
authored
Make Drop database timeout return message more detailed (apache#12082)
Make Drop database timeout return message more detailed
1 parent 086445c commit 1b9c712

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,12 @@ public SettableFuture<ConfigTaskResult> deleteDatabase(
377377
"Failed to execute delete database {} in config node, status is {}.",
378378
deleteDatabaseStatement.getPrefixPath(),
379379
tsStatus);
380-
future.setException(new IoTDBException(tsStatus.getMessage(), tsStatus.getCode()));
380+
if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
381+
future.setException(
382+
new BatchProcessException(tsStatus.subStatus.toArray(new TSStatus[0])));
383+
} else {
384+
future.setException(new IoTDBException(tsStatus.message, tsStatus.getCode()));
385+
}
381386
} else {
382387
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
383388
}
@@ -1828,7 +1833,12 @@ public SettableFuture<ConfigTaskResult> deleteTimeSeries(
18281833
"Failed to execute delete timeseries {} in config node, status is {}.",
18291834
deleteTimeSeriesStatement.getPathPatternList(),
18301835
tsStatus);
1831-
future.setException(new IoTDBException(tsStatus.getMessage(), tsStatus.getCode()));
1836+
if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
1837+
future.setException(
1838+
new BatchProcessException(tsStatus.subStatus.toArray(new TSStatus[0])));
1839+
} else {
1840+
future.setException(new IoTDBException(tsStatus.getMessage(), tsStatus.getCode()));
1841+
}
18321842
} else {
18331843
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
18341844
}

0 commit comments

Comments
 (0)