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

wangbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new fa1b09d5d1c [Fix]log and fix policy daemon check (#38532)
fa1b09d5d1c is described below

commit fa1b09d5d1c2459e35e70a2f88a36603e9dc8653
Author: wangbo <wan...@apache.org>
AuthorDate: Wed Jul 31 11:11:33 2024 +0800

    [Fix]log and fix policy daemon check (#38532)
    
    ## Proposed changes
    
    1 add log for policy daemon check when exception.
    2 reset exception content.
---
 .../test_workload_sched_policy.groovy                    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy 
b/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
index 9539a5b244d..1f772bc04ff 100644
--- 
a/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
+++ 
b/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
@@ -267,15 +267,23 @@ suite("test_workload_sched_policy") {
                     lastTime = System.currentTimeMillis()
                 }
                 try {
-                    sql "select k0,k1,k2,k3,k4,k5,k6,count(distinct k13) from 
regression_test_load_p0_insert.baseall group by k0,k1,k2,k3,k4,k5,k6"
+                    sql "select k0 as 
policy_test_tag,k1,k2,k3,k4,k5,k6,count(distinct k13) from 
regression_test_load_p0_insert.baseall group by k0,k1,k2,k3,k4,k5,k6"
                 } catch (Exception e) {
-                    assertTrue(e.getMessage().contains("query canceled by 
workload scheduler"))
+                    boolean ret = e.getMessage().contains("cancelled by 
workload policy")
+                    if (!ret) {
+                        logger.info("policy_test_tag " + e.getMessage())
+                    }
+                    assertTrue(ret, "policy daemon check failed")
                 }
 
                 try {
-                    sql "select count(1) from 
regression_test_load_p0_insert.baseall"
+                    sql "select count(1) as policy_test_tag from 
regression_test_load_p0_insert.baseall"
                 } catch (Exception e) {
-                    assertTrue(e.getMessage().contains("query canceled by 
workload scheduler"))
+                    boolean ret = e.getMessage().contains("cancelled by 
workload policy")
+                    if (!ret) {
+                        logger.info("policy_test_tag " + e.getMessage())
+                    }
+                    assertTrue(ret, "policy daemon check failed")
                 }
 
                 Thread.sleep(1000)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to