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 e9e46995cce [branch-2.1](regression-test) fix test_chema_change_fail
(#33753) #33788
e9e46995cce is described below
commit e9e46995cce4f9725864d1b2b96e7c29002e40f2
Author: yujun <yu.jun.re...@gmail.com>
AuthorDate: Wed Apr 17 18:16:27 2024 +0800
[branch-2.1](regression-test) fix test_chema_change_fail (#33753) #33788
---
be/src/olap/schema_change.cpp | 9 ++++++---
.../suites/schema_change_p2/test_schema_change_fail.groovy | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/be/src/olap/schema_change.cpp b/be/src/olap/schema_change.cpp
index 34b216fc546..c5ae7793c47 100644
--- a/be/src/olap/schema_change.cpp
+++ b/be/src/olap/schema_change.cpp
@@ -789,14 +789,17 @@ Status
SchemaChangeHandler::_do_process_alter_tablet_v2(const TAlterTabletReqV2&
do {
RowsetSharedPtr max_rowset;
// get history data to be converted and it will check if there is
hold in base tablet
- if (!_get_versions_to_be_changed(base_tablet,
&versions_to_be_changed, &max_rowset)) {
+ res = _get_versions_to_be_changed(base_tablet,
&versions_to_be_changed, &max_rowset);
+ if (!res) {
LOG(WARNING) << "fail to get version to be changed. res=" <<
res;
break;
}
DBUG_EXECUTE_IF("SchemaChangeJob.process_alter_tablet.alter_fail",
{
- LOG(WARNING) << "inject alter tablet failed. base_tablet=" <<
request.base_tablet_id
- << ", new_tablet=" << request.new_tablet_id;
+ res = Status::InternalError(
+ "inject alter tablet failed. base_tablet={},
new_tablet={}",
+ request.base_tablet_id, request.new_tablet_id);
+ LOG(WARNING) << "inject error. res=" << res;
break;
});
diff --git
a/regression-test/suites/schema_change_p2/test_schema_change_fail.groovy
b/regression-test/suites/schema_change_p2/test_schema_change_fail.groovy
index 134002f6c05..7580e3d9282 100644
--- a/regression-test/suites/schema_change_p2/test_schema_change_fail.groovy
+++ b/regression-test/suites/schema_change_p2/test_schema_change_fail.groovy
@@ -18,12 +18,12 @@
import org.apache.doris.regression.util.DebugPoint
import org.apache.doris.regression.util.NodeType
-suite('test_schema_change_fail', 'nonConcurrent') {
+suite('test_schema_change_fail', 'p0,p2,nonConcurrent') {
def frontends = sql_return_maparray('show frontends')
def backends = sql_return_maparray('show backends')
def forceReplicaNum =
getFeConfig('force_olap_table_replication_num').toInteger()
- if (frontends.size() < 2 || backends.size() < 3 || forceReplicaNum == 1) {
+ if (frontends.size() < 2 || backends.size() < 3 || forceReplicaNum == 1 ||
forceReplicaNum == 2) {
return
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
