update case

zhangstar333 · Mar 7, 2024 · ee0a348 · ee0a348
1 parent 59aa367
commit ee0a348
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
@@ -1090,22 +1090,22 @@ private void waitRpc(List<Triple<BackendExecStates, BackendServiceProxy, Future<
     private void waitPipelineRpc(List<Triple<PipelineExecContexts, BackendServiceProxy,
             Future<PExecPlanFragmentResult>>> futures, long leftTimeMs,
             String operation) throws RpcException, UserException {
+        long currentTimeMillis = System.currentTimeMillis();
+        long elapsed = (currentTimeMillis - timeoutDeadline) / 1000 + queryOptions.getExecutionTimeout();
+        String msg = String.format(
+                "timeout before waiting %s rpc, query timeout:%d, already elapsed:%d, left for this:%d",
+                operation, queryOptions.getExecutionTimeout(), elapsed, leftTimeMs);
+        LOG.warn("Query {} {}", DebugUtil.printId(queryId), msg);
+        if (!queryOptions.isSetExecutionTimeout() || !queryOptions.isSetQueryTimeout()) {
+            LOG.warn("Query {} does not set timeout info, execution timeout: is_set:{}, value:{}"
+                    + ", query timeout: is_set:{}, value: {}, "
+                    + "coordinator timeout deadline {}, cur time millis: {}",
+                    DebugUtil.printId(queryId),
+                    queryOptions.isSetExecutionTimeout(), queryOptions.getExecutionTimeout(),
+                    queryOptions.isSetQueryTimeout(), queryOptions.getQueryTimeout(),
+                    timeoutDeadline, currentTimeMillis);
+        }
         if (leftTimeMs <= 0) {
-            long currentTimeMillis = System.currentTimeMillis();
-            long elapsed = (currentTimeMillis - timeoutDeadline) / 1000 + queryOptions.getExecutionTimeout();
-            String msg = String.format(
-                    "timeout before waiting %s rpc, query timeout:%d, already elapsed:%d, left for this:%d",
-                    operation, queryOptions.getExecutionTimeout(), elapsed, leftTimeMs);
-            LOG.warn("Query {} {}", DebugUtil.printId(queryId), msg);
-            if (!queryOptions.isSetExecutionTimeout() || !queryOptions.isSetQueryTimeout()) {
-                LOG.warn("Query {} does not set timeout info, execution timeout: is_set:{}, value:{}"
-                                + ", query timeout: is_set:{}, value: {}, "
-                                + "coordinator timeout deadline {}, cur time millis: {}",
-                        DebugUtil.printId(queryId),
-                        queryOptions.isSetExecutionTimeout(), queryOptions.getExecutionTimeout(),
-                        queryOptions.isSetQueryTimeout(), queryOptions.getQueryTimeout(),
-                        timeoutDeadline, currentTimeMillis);
-            }
             throw new UserException(msg);
         }
 

diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy b/regression-test/pipeline/p0/conf/regression-conf.groovy
@@ -56,7 +56,7 @@ excludeGroups = ""
 // this suites will not be executed
 // load_stream_fault_injection may cause bad disk
 
-excludeSuites = "test_index_failure_injection,test_dump_image,test_profile,test_spark_load,test_refresh_mtmv,test_bitmap_filter,test_information_schema_external,test_base_insert_job"
+excludeSuites = "test_index_failure_injection,test_dump_image,test_profile,test_spark_load,test_refresh_mtmv,test_bitmap_filter,test_information_schema_external"
 
 // this directories will not be executed
 excludeDirectories = "workload_manager_p1,nereids_rules_p0/subquery"

diff --git a/regression-test/suites/fault_injection_p0/test_memtable_flush_fault.groovy b/regression-test/suites/fault_injection_p0/test_memtable_flush_fault.groovy
@@ -56,6 +56,7 @@ suite("test_memtable_flush_fault", "nonConcurrent") {
         sql insert_sql
         sql "sync"
     } catch (Exception e){
+        logger.info(e.getMessage())
         assertTrue(e.getMessage().contains("[IO_ERROR]dbug_be_memtable_submit_flush_error"))
     } finally {
         GetDebugPoint().disableDebugPointForAllBEs("FlushToken.submit_flush_error")

diff --git a/regression-test/suites/job_p0/test_base_insert_job.groovy b/regression-test/suites/job_p0/test_base_insert_job.groovy
@@ -20,7 +20,7 @@ import java.time.format.DateTimeFormatter;
 import java.time.Instant;
 import java.time.ZoneId;
 
-suite("test_base_insert_job") {
+suite("test_base_insert_job", "nonConcurrent") {
     def tableName = "t_test_BASE_inSert_job"
     def jobName = "insert_recovery_test_base_insert_job"
     def jobMixedName = "Insert_recovery_Test_base_insert_job"