From 9958cd07cb94004d187ed53d0279499c73d196e8 Mon Sep 17 00:00:00 2001 From: yujun777 Date: Wed, 17 Apr 2024 12:06:02 +0800 Subject: [PATCH 1/2] fix test_schema_change_fail --- be/src/olap/schema_change.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/be/src/olap/schema_change.cpp b/be/src/olap/schema_change.cpp index 2fab18d7858f49..0f80bfb3085b04 100644 --- a/be/src/olap/schema_change.cpp +++ b/be/src/olap/schema_change.cpp @@ -815,14 +815,17 @@ Status SchemaChangeJob::_do_process_alter_tablet(const TAlterTabletReqV2& reques 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(&versions_to_be_changed, &max_rowset)) { + res = _get_versions_to_be_changed(&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; }); From a9f7b1c652970f4a8c0f1895d4d80f2ecb1e3a7a Mon Sep 17 00:00:00 2001 From: yujun777 Date: Wed, 17 Apr 2024 15:13:40 +0800 Subject: [PATCH 2/2] update --- .../suites/schema_change_p2/test_schema_change_fail.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f7ec1b42f0c1bd..238d1377bd6b2f 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,7 +18,7 @@ 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') { if (isCloudMode()) { return } @@ -26,7 +26,7 @@ suite('test_schema_change_fail', '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 }