This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 8198a31563d [fix](testcases) make all auto partition P2 cases
nonConcurrent (#31708) (#31821)
8198a31563d is described below
commit 8198a31563d72283be7e1a5591727cb059e2393d
Author: zclllyybb <[email protected]>
AuthorDate: Wed Mar 6 09:12:02 2024 +0800
[fix](testcases) make all auto partition P2 cases nonConcurrent (#31708)
(#31821)
make all auto partition P2 cases nonConcurrent
---
.../java/org/apache/doris/service/FrontendServiceImpl.java | 10 +++++++++-
.../auto_partition/diff_data/stress_test_diff_date_list.groovy | 2 +-
.../high_concur_load/stress_test_high_concurrency_load.groovy | 2 +-
.../same_data/stress_test_same_date_range.groovy | 2 +-
.../two_stream_load/stress_test_two_stream_load.groovy | 2 +-
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index ee47ea52067..e8fac1ca4f3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -3280,7 +3280,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
if (!Env.getCurrentEnv().isMaster()) {
errorStatus.setStatusCode(TStatusCode.NOT_MASTER);
errorStatus.addToErrorMsgs(NOT_MASTER_ERR_MSG);
- LOG.error("failed to createPartition: {}", NOT_MASTER_ERR_MSG);
+ LOG.warn("failed to createPartition: {}", NOT_MASTER_ERR_MSG);
return result;
}
@@ -3288,6 +3288,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
if (db == null) {
errorStatus.setErrorMsgs(Lists.newArrayList(String.format("dbId=%d
is not exists", dbId)));
result.setStatus(errorStatus);
+ LOG.warn("send create partition error status: {}", result);
return result;
}
@@ -3296,6 +3297,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
errorStatus.setErrorMsgs(
(Lists.newArrayList(String.format("dbId=%d tableId=%d is
not exists", dbId, tableId))));
result.setStatus(errorStatus);
+ LOG.warn("send create partition error status: {}", result);
return result;
}
@@ -3303,12 +3305,14 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
errorStatus.setErrorMsgs(
Lists.newArrayList(String.format("dbId=%d tableId=%d is
not olap table", dbId, tableId)));
result.setStatus(errorStatus);
+ LOG.warn("send create partition error status: {}", result);
return result;
}
if (request.partitionValues == null) {
errorStatus.setErrorMsgs(Lists.newArrayList("partitionValues
should not null."));
result.setStatus(errorStatus);
+ LOG.warn("send create partition error status: {}", result);
return result;
}
@@ -3321,6 +3325,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
Lists.newArrayList(
"Only support single partition of RANGE,
partitionValues size should equal 1."));
result.setStatus(errorStatus);
+ LOG.warn("send create partition error status: {}", result);
return result;
}
partitionValues.add(request.partitionValues.get(i));
@@ -3332,6 +3337,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
} catch (AnalysisException ex) {
errorStatus.setErrorMsgs(Lists.newArrayList(ex.getMessage()));
result.setStatus(errorStatus);
+ LOG.warn("send create partition error status: {}", result);
return result;
}
@@ -3345,6 +3351,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
LOG.warn(errorMessage);
errorStatus.setErrorMsgs(Lists.newArrayList(errorMessage));
result.setStatus(errorStatus);
+ LOG.warn("send create partition error status: {}", result);
return result;
}
@@ -3357,6 +3364,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
errorStatus.setErrorMsgs(
Lists.newArrayList(String.format("create partition
failed. error:%s", e.getMessage())));
result.setStatus(errorStatus);
+ LOG.warn("send create partition error status: {}", result);
return result;
}
}
diff --git
a/regression-test/suites/partition_p2/auto_partition/diff_data/stress_test_diff_date_list.groovy
b/regression-test/suites/partition_p2/auto_partition/diff_data/stress_test_diff_date_list.groovy
index e01cd127a50..72549e18d99 100644
---
a/regression-test/suites/partition_p2/auto_partition/diff_data/stress_test_diff_date_list.groovy
+++
b/regression-test/suites/partition_p2/auto_partition/diff_data/stress_test_diff_date_list.groovy
@@ -21,7 +21,7 @@ import java.nio.file.Paths
import java.net.URL
import java.io.File
-suite("stress_test_diff_date_list") {
+suite("stress_test_diff_date_list", "p2,nonConcurrent") {
sql """ADMIN SET FRONTEND CONFIG ('max_auto_partition_num' = '10000000')"""
diff --git
a/regression-test/suites/partition_p2/auto_partition/high_concur_load/stress_test_high_concurrency_load.groovy
b/regression-test/suites/partition_p2/auto_partition/high_concur_load/stress_test_high_concurrency_load.groovy
index abe71301500..124088047f5 100644
---
a/regression-test/suites/partition_p2/auto_partition/high_concur_load/stress_test_high_concurrency_load.groovy
+++
b/regression-test/suites/partition_p2/auto_partition/high_concur_load/stress_test_high_concurrency_load.groovy
@@ -21,7 +21,7 @@ import java.nio.file.Paths
import java.net.URL
import java.io.File
-suite("stress_test_high_concurrency_load") {
+suite("stress_test_high_concurrency_load", "p2,nonConcurrent") {
sql """ADMIN SET FRONTEND CONFIG ('max_auto_partition_num' = '10000000')"""
diff --git
a/regression-test/suites/partition_p2/auto_partition/same_data/stress_test_same_date_range.groovy
b/regression-test/suites/partition_p2/auto_partition/same_data/stress_test_same_date_range.groovy
index 931856f8d25..e081e3bf093 100644
---
a/regression-test/suites/partition_p2/auto_partition/same_data/stress_test_same_date_range.groovy
+++
b/regression-test/suites/partition_p2/auto_partition/same_data/stress_test_same_date_range.groovy
@@ -21,7 +21,7 @@ import java.nio.file.Paths
import java.net.URL
import java.io.File
-suite("stress_test_same_date_range") {
+suite("stress_test_same_date_range", "p2,nonConcurrent") {
sql """ADMIN SET FRONTEND CONFIG ('max_auto_partition_num' = '10000000')"""
diff --git
a/regression-test/suites/partition_p2/auto_partition/two_stream_load/stress_test_two_stream_load.groovy
b/regression-test/suites/partition_p2/auto_partition/two_stream_load/stress_test_two_stream_load.groovy
index f137e748204..bd0f7d1aa2d 100644
---
a/regression-test/suites/partition_p2/auto_partition/two_stream_load/stress_test_two_stream_load.groovy
+++
b/regression-test/suites/partition_p2/auto_partition/two_stream_load/stress_test_two_stream_load.groovy
@@ -21,7 +21,7 @@ import java.nio.file.Paths
import java.net.URL
import java.io.File
-suite("stress_test_two_stream_load") {
+suite("stress_test_two_stream_load", "p2,nonConcurrent") {
sql """ADMIN SET FRONTEND CONFIG ('max_auto_partition_num' = '10000000')"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
