Revert "[Enhancement](compaction) Do not set failure time when cumula…

…tive compaction dealing with delete rowset (apache#43466)"

This reverts commit 55f450c.

be/src/cloud/cloud_cumulative_compaction.cpp

@@ -92,10 +92,6 @@ Status CloudCumulativeCompaction::prepare_compact() {
             // plus 1 to skip the delete version.
             // NOTICE: after that, the cumulative point may be larger than max version of this tablet, but it doesn't matter.
             update_cumulative_point();
-            if (!config::enable_sleep_between_delete_cumu_compaction) {
-                st = Status::Error<CUMULATIVE_NO_SUITABLE_VERSION>(
-                        "_last_delete_version.first not equal to -1");
-            }
         }
         return st;
     }

be/src/cloud/cloud_storage_engine.cpp

@@ -677,8 +677,7 @@ Status CloudStorageEngine::_submit_cumulative_compaction_task(const CloudTabletS
     auto st = compaction->prepare_compact();
     if (!st.ok()) {
         long now = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
-        if (st.is<ErrorCode::CUMULATIVE_NO_SUITABLE_VERSION>() &&
-            st.msg() != "_last_delete_version.first not equal to -1") {
+        if (st.is<ErrorCode::CUMULATIVE_NO_SUITABLE_VERSION>()) {
             // Backoff strategy if no suitable version
             tablet->last_cumu_no_suitable_version_ms = now;
         }

be/src/common/config.cpp

@@ -1402,7 +1402,6 @@ DEFINE_mBool(enable_delete_bitmap_merge_on_compaction, "false");
 // Enable validation to check the correctness of table size.
 DEFINE_Bool(enable_table_size_correctness_check, "false");
 DEFINE_Bool(force_regenerate_rowsetid_on_start_error, "false");
-DEFINE_mBool(enable_sleep_between_delete_cumu_compaction, "false");
 
 // clang-format off
 #ifdef BE_TEST

be/src/common/config.h

@@ -1487,8 +1487,6 @@ DECLARE_Bool(force_regenerate_rowsetid_on_start_error);
 DECLARE_mBool(enable_delete_bitmap_merge_on_compaction);
 // Enable validation to check the correctness of table size.
 DECLARE_Bool(enable_table_size_correctness_check);
-// Enable sleep 5s between delete cumulative compaction.
-DECLARE_mBool(enable_sleep_between_delete_cumu_compaction);
 
 #ifdef BE_TEST
 // test s3

be/src/olap/tablet.cpp

@@ -1740,26 +1740,15 @@ Status Tablet::prepare_compaction_and_calculate_permits(
         }
 
         if (!res.ok()) {
+            tablet->set_last_cumu_compaction_failure_time(UnixMillis());
             permits = 0;
-            // if we meet a delete version, should increase the cumulative point to let base compaction handle the delete version.
-            // no need to wait 5s.
-            if (!(res.msg() == "_last_delete_version.first not equal to -1") ||
-                config::enable_sleep_between_delete_cumu_compaction) {
-                tablet->set_last_cumu_compaction_failure_time(UnixMillis());
-            }
             if (!res.is<CUMULATIVE_NO_SUITABLE_VERSION>()) {
                 DorisMetrics::instance()->cumulative_compaction_request_failed->increment(1);
                 return Status::InternalError("prepare cumulative compaction with err: {}", res);
             }
             // return OK if OLAP_ERR_CUMULATIVE_NO_SUITABLE_VERSION, so that we don't need to
             // print too much useless logs.
             // And because we set permits to 0, so even if we return OK here, nothing will be done.
-            LOG_INFO(
-                    "cumulative compaction meet delete rowset, increase cumu point without other "
-                    "operation.")
-                    .tag("tablet id:", tablet->tablet_id())
-                    .tag("after cumulative compaction, cumu point:",
-                         tablet->cumulative_layer_point());
             return Status::OK();
         }
     } else if (compaction_type == CompactionType::BASE_COMPACTION) {