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 4a914fe1b88 [Fix](case) remove useless test (#45409)
4a914fe1b88 is described below
commit 4a914fe1b88c9477b95414ef48880e3f59e0f854
Author: wangbo <wan...@selectdb.com>
AuthorDate: Mon Dec 16 11:17:01 2024 +0800
[Fix](case) remove useless test (#45409)
---
be/src/agent/workload_group_listener.cpp | 1 +
be/src/agent/workload_group_listener.h | 3 +-
.../test_workload_sched_policy.groovy | 57 ----------------------
3 files changed, 3 insertions(+), 58 deletions(-)
diff --git a/be/src/agent/workload_group_listener.cpp
b/be/src/agent/workload_group_listener.cpp
index 7b688b7dcdf..0cd5a3ee1ac 100644
--- a/be/src/agent/workload_group_listener.cpp
+++ b/be/src/agent/workload_group_listener.cpp
@@ -17,6 +17,7 @@
#include "agent/workload_group_listener.h"
+#include "runtime/exec_env.h"
#include "runtime/workload_group/workload_group.h"
#include "runtime/workload_group/workload_group_manager.h"
#include "util/mem_info.h"
diff --git a/be/src/agent/workload_group_listener.h
b/be/src/agent/workload_group_listener.h
index f596535908d..9578a36f70d 100644
--- a/be/src/agent/workload_group_listener.h
+++ b/be/src/agent/workload_group_listener.h
@@ -20,10 +20,11 @@
#include <glog/logging.h>
#include "agent/topic_listener.h"
-#include "runtime/exec_env.h"
namespace doris {
+class ExecEnv;
+
class WorkloadGroupListener : public TopicListener {
public:
~WorkloadGroupListener() {}
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 06e10688397..ca18c5a17e0 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
@@ -235,61 +235,4 @@ suite("test_workload_sched_policy") {
sql "drop user test_alter_policy_user"
sql "drop workload policy test_alter_policy"
-
- // daemon thread alter test
- def thread1 = new Thread({
- def startTime = System.currentTimeMillis()
- def curTime = System.currentTimeMillis()
- def totalTime = 30 * 60 * 1000 // 30min
-
- connect('test_policy_user', '12345', context.config.jdbcUrl) {
- sql "set workload_group=policy_group"
- boolean flag = false
- long lastTime = System.currentTimeMillis()
-
- while (curTime - startTime <= totalTime) {
- if (curTime - lastTime > 20000) {
- if (flag) {
- connect('root', '', context.config.jdbcUrl) {
- sql "alter workload policy
test_cancel_query_policy properties('workload_group'='policy_group2');"
- sql "alter workload policy
test_cancel_query_policy2 properties('workload_group'='policy_group');"
- }
- flag = false
- } else {
- connect('root', '', context.config.jdbcUrl) {
- sql "alter workload policy
test_cancel_query_policy properties('workload_group'='policy_group');"
- sql "alter workload policy
test_cancel_query_policy2 properties('workload_group'='policy_group2');"
- }
- flag = true
- }
- lastTime = System.currentTimeMillis()
- }
- try {
- 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) {
- 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) as policy_test_tag from
regression_test_load_p0_insert.baseall"
- } catch (Exception e) {
- 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)
- curTime = System.currentTimeMillis()
- }
- }
- })
- thread1.setDaemon(true)
- thread1.start()
-
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
