From 9dd6b1e85aff324008c391ca6c2c34fc91e256a2 Mon Sep 17 00:00:00 2001 From: yujun Date: Wed, 17 Apr 2024 17:17:41 +0800 Subject: [PATCH] fix test_schema_change_fail --- be/src/olap/schema_change.cpp | 9 ++++++--- .../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 34b216fc546e8b..c5ae7793c47455 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 134002f6c05dff..7580e3d9282b13 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 }