This is an automated email from the ASF dual-hosted git repository.
liaoxin01 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 c7e635238f4 [chore](recycler) Disable
`enable_mark_delete_rowset_before_recycle` and
`enable_abort_txn_and_job_for_delete_rowset_before_recycle` for recycler
(#66150)
c7e635238f4 is described below
commit c7e635238f4ac7bf971cc93f1d3813ecc4c5a15e
Author: Yixuan Wang <[email protected]>
AuthorDate: Wed Jul 29 12:06:09 2026 +0800
[chore](recycler) Disable `enable_mark_delete_rowset_before_recycle` and
`enable_abort_txn_and_job_for_delete_rowset_before_recycle` for recycler
(#66150)
---
cloud/src/common/config.h | 4 ++--
cloud/test/meta_service_job_test.cpp | 30 ++++++++++++++++++++++++++++++
cloud/test/recycler_test.cpp | 5 -----
3 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/cloud/src/common/config.h b/cloud/src/common/config.h
index a4a2c17441b..37069faa706 100644
--- a/cloud/src/common/config.h
+++ b/cloud/src/common/config.h
@@ -314,8 +314,8 @@ CONF_mBool(enable_load_txn_status_check, "true");
CONF_mBool(enable_tablet_job_check, "true");
CONF_mBool(enable_recycle_delete_rowset_key_check, "true");
-CONF_mBool(enable_mark_delete_rowset_before_recycle, "true");
-CONF_mBool(enable_abort_txn_and_job_for_delete_rowset_before_recycle, "true");
+CONF_mBool(enable_mark_delete_rowset_before_recycle, "false");
+CONF_mBool(enable_abort_txn_and_job_for_delete_rowset_before_recycle, "false");
// Declare a selection strategy for those servers have many ips.
// Note that there should at most one ip match this list.
diff --git a/cloud/test/meta_service_job_test.cpp
b/cloud/test/meta_service_job_test.cpp
index 089418745b3..b2b37084040 100644
--- a/cloud/test/meta_service_job_test.cpp
+++ b/cloud/test/meta_service_job_test.cpp
@@ -95,6 +95,27 @@ static void create_and_refresh_instance(MetaServiceProxy*
service, std::string i
namespace {
const std::string instance_id = "MetaServiceJobTest";
+struct DeleteRowsetRecycleConfigGuard {
+ DeleteRowsetRecycleConfigGuard()
+ : original_enable_mark_delete_rowset_before_recycle(
+ config::enable_mark_delete_rowset_before_recycle),
+
original_enable_abort_txn_and_job_for_delete_rowset_before_recycle(
+
config::enable_abort_txn_and_job_for_delete_rowset_before_recycle) {
+ config::enable_mark_delete_rowset_before_recycle = true;
+ config::enable_abort_txn_and_job_for_delete_rowset_before_recycle =
true;
+ }
+
+ ~DeleteRowsetRecycleConfigGuard() {
+ config::enable_mark_delete_rowset_before_recycle =
+ original_enable_mark_delete_rowset_before_recycle;
+ config::enable_abort_txn_and_job_for_delete_rowset_before_recycle =
+
original_enable_abort_txn_and_job_for_delete_rowset_before_recycle;
+ }
+
+ bool original_enable_mark_delete_rowset_before_recycle;
+ bool original_enable_abort_txn_and_job_for_delete_rowset_before_recycle;
+};
+
void start_compaction_job(MetaService* meta_service, int64_t tablet_id, const
std::string& job_id,
const std::string& initiator, int
base_compaction_cnt,
int cumu_compaction_cnt,
TabletCompactionJobPB::CompactionType type,
@@ -5753,6 +5774,7 @@ TEST(MetaServiceJobTest, ResetStreamingJobOffsetTest) {
// Test: Complete flow - begin_txn -> prepare_rowset -> recycle x 2 -> abort
-> verify commit fails
TEST(MetaServiceJobTest, AbortTxnForRelatedRowsetTest1) {
+ DeleteRowsetRecycleConfigGuard config_guard;
auto meta_service = get_meta_service();
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
@@ -5882,6 +5904,7 @@ TEST(MetaServiceJobTest, AbortTxnForRelatedRowsetTest1) {
// Test: Complete flow - start job -> prepare_rowset -> recycle x 2 -> abort
job -> verify
TEST(MetaServiceJobTest, AbortJobForRelatedRowsetTest1) {
+ DeleteRowsetRecycleConfigGuard config_guard;
auto meta_service = get_meta_service();
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
@@ -6009,6 +6032,7 @@ TEST(MetaServiceJobTest, AbortJobForRelatedRowsetTest1) {
// Test: Complete flow - begin_txn -> prepare_rowset -> commit_rowset ->
recycle x 2 -> abort -> verify commit fails
TEST(MetaServiceJobTest, AbortTxnForRelatedRowsetTest2) {
+ DeleteRowsetRecycleConfigGuard config_guard;
auto meta_service = get_meta_service();
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
@@ -6134,6 +6158,7 @@ TEST(MetaServiceJobTest, AbortTxnForRelatedRowsetTest2) {
// Test: Complete flow - start compaction job -> prepare_rowset ->
commit_rowset -> recycle x 2 -> abort job -> verify
TEST(MetaServiceJobTest, AbortCompactionJobForRelatedRowsetTest2) {
+ DeleteRowsetRecycleConfigGuard config_guard;
auto meta_service = get_meta_service();
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
@@ -6270,6 +6295,7 @@ TEST(MetaServiceJobTest,
AbortCompactionJobForRelatedRowsetTest2) {
// Test: Complete flow - start schema change job -> prepare_rowset ->
commit_rowset -> recycle x 2 -> abort job -> verify
TEST(MetaServiceJobTest, AbortSchemaChangeJobForRelatedRowsetTest2) {
+ DeleteRowsetRecycleConfigGuard config_guard;
auto meta_service = get_meta_service();
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
@@ -6455,6 +6481,7 @@ TEST(MetaServiceJobTest,
AbortSchemaChangeJobForRelatedRowsetTest2) {
// Test: Complete flow - begin_txn -> prepare_rowset -> recycle x 1 ->
commit_rowset -> commit_txn -> verify commit fails
TEST(MetaServiceJobTest, AbortTxnForRelatedRowsetTest3) {
+ DeleteRowsetRecycleConfigGuard config_guard;
auto meta_service = get_meta_service();
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
@@ -6565,6 +6592,7 @@ TEST(MetaServiceJobTest, AbortTxnForRelatedRowsetTest3) {
// Test: Complete flow - start job -> prepare_rowset -> recycle x 1 ->
commit_rowset -> finish job -> verify
TEST(MetaServiceJobTest, AbortJobForRelatedRowsetTest3) {
+ DeleteRowsetRecycleConfigGuard config_guard;
auto meta_service = get_meta_service();
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
@@ -6689,6 +6717,7 @@ TEST(MetaServiceJobTest, AbortJobForRelatedRowsetTest3) {
// Test: Complete flow - begin_txn -> prepare_rowset -> commit_rowset ->
recycle x 1 -> commit_txn -> verify commit fails
TEST(MetaServiceJobTest, AbortTxnForRelatedRowsetTest4) {
+ DeleteRowsetRecycleConfigGuard config_guard;
auto meta_service = get_meta_service();
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
@@ -6812,6 +6841,7 @@ TEST(MetaServiceJobTest, AbortTxnForRelatedRowsetTest4) {
// Test: Complete flow - start job -> prepare_rowset -> commit_rowset ->
recycle x 1 -> finish job -> verify
TEST(MetaServiceJobTest, AbortJobForRelatedRowsetTest4) {
+ DeleteRowsetRecycleConfigGuard config_guard;
auto meta_service = get_meta_service();
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
diff --git a/cloud/test/recycler_test.cpp b/cloud/test/recycler_test.cpp
index 78d5b388bd8..28ce6b0f716 100644
--- a/cloud/test/recycler_test.cpp
+++ b/cloud/test/recycler_test.cpp
@@ -1648,11 +1648,6 @@ TEST(RecyclerTest,
recycle_rowsets_limit_per_tablet_batch) {
return it->size();
};
- ASSERT_EQ(recycler.recycle_rowsets(), 0);
- ASSERT_EQ(recycler.recycle_rowsets(), 0);
- EXPECT_EQ(count_recycle_rowsets(tablet_id0), 3);
- EXPECT_EQ(count_recycle_rowsets(tablet_id1), 3);
-
ASSERT_EQ(recycler.recycle_rowsets(), 0);
ASSERT_EQ(recycler.recycle_rowsets(), 0);
EXPECT_EQ(count_recycle_rowsets(tablet_id0), 1);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
