[iotdb] branch rel/1.2 updated: [IOTDB-6113] Load: Fix setDatabase does not print logs and set failure except DATABASE_ALREADY_EXISTS (#10855)

[rong]

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

rong pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/1.2 by this push:
     new d21d8344cd8 [IOTDB-6113] Load: Fix setDatabase does not print logs and 
set failure except DATABASE_ALREADY_EXISTS (#10855)
d21d8344cd8 is described below

commit d21d8344cd8308b7bff29eabd9d7324096e9b3f6
Author: Itami Sho <42286868+mini...@users.noreply.github.com>
AuthorDate: Mon Aug 14 20:35:09 2023 +0800

    [IOTDB-6113] Load: Fix setDatabase does not print logs and set failure 
except DATABASE_ALREADY_EXISTS (#10855)
---
 .../execution/config/executor/ClusterConfigTaskExecutor.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 8395791c226..a2c4783e266 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
@@ -268,16 +268,17 @@ public class ClusterConfigTaskExecutor implements 
IConfigTaskExecutor {
       if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
         // If database already exists when loading, we do not throw exceptions 
to avoid printing too
         // many logs
-        if ((TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode() == 
tsStatus.getCode()
-            && databaseSchemaStatement.getEnablePrintExceptionLog())) {
+        if (TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode() == 
tsStatus.getCode()
+            && !databaseSchemaStatement.getEnablePrintExceptionLog()) {
+          future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
+        } else {
           LOGGER.warn(
               "Failed to execute create database {} in config node, status is 
{}.",
               databaseSchemaStatement.getDatabasePath(),
               tsStatus);
           future.setException(new IoTDBException(tsStatus.message, 
tsStatus.code));
-        } else {
-          future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
         }
+
       } else {
         future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
       }