This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new ec9c05d55dd branch-3.1: [Fix](warmup) Fix wrongly skip download task
for warmup job when rowsets have multi segments #56663 (#56680)
ec9c05d55dd is described below
commit ec9c05d55dda84871e8f595035c2b40a398f3299
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Oct 11 11:27:01 2025 +0800
branch-3.1: [Fix](warmup) Fix wrongly skip download task for warmup job
when rowsets have multi segments #56663 (#56680)
Cherry-picked from #56663
Co-authored-by: bobhan1 <[email protected]>
---
be/src/cloud/cloud_warm_up_manager.cpp | 37 +++++++++++++++++-----------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/be/src/cloud/cloud_warm_up_manager.cpp
b/be/src/cloud/cloud_warm_up_manager.cpp
index 4f086b67032..c87de1f5fe4 100644
--- a/be/src/cloud/cloud_warm_up_manager.cpp
+++ b/be/src/cloud/cloud_warm_up_manager.cpp
@@ -212,26 +212,25 @@ void CloudWarmUpManager::handle_jobs() {
auto tablet_meta = tablet->tablet_meta();
auto rs_metas = snapshot_rs_metas(tablet.get());
for (auto& [_, rs] : rs_metas) {
- for (int64_t seg_id = 0; seg_id < rs->num_segments();
seg_id++) {
- auto storage_resource = rs->remote_storage_resource();
- if (!storage_resource) {
- LOG(WARNING) << storage_resource.error();
- continue;
- }
-
- int64_t expiration_time =
- tablet_meta->ttl_seconds() == 0 ||
rs->newest_write_timestamp() <= 0
- ? 0
- : rs->newest_write_timestamp() +
tablet_meta->ttl_seconds();
- if (expiration_time <= UnixSeconds()) {
- expiration_time = 0;
- }
- if (!tablet->add_rowset_warmup_state(*rs,
WarmUpState::TRIGGERED_BY_JOB)) {
- LOG(INFO) << "found duplicate warmup task for rowset "
<< rs->rowset_id()
- << ", skip it";
- continue;
- }
+ auto storage_resource = rs->remote_storage_resource();
+ if (!storage_resource) {
+ LOG(WARNING) << storage_resource.error();
+ continue;
+ }
+ int64_t expiration_time =
+ tablet_meta->ttl_seconds() == 0 ||
rs->newest_write_timestamp() <= 0
+ ? 0
+ : rs->newest_write_timestamp() +
tablet_meta->ttl_seconds();
+ if (expiration_time <= UnixSeconds()) {
+ expiration_time = 0;
+ }
+ if (!tablet->add_rowset_warmup_state(*rs,
WarmUpState::TRIGGERED_BY_JOB)) {
+ LOG(INFO) << "found duplicate warmup task for rowset " <<
rs->rowset_id()
+ << ", skip it";
+ continue;
+ }
+ for (int64_t seg_id = 0; seg_id < rs->num_segments();
seg_id++) {
// 1st. download segment files
submit_download_tasks(
storage_resource.value()->remote_segment_path(*rs,
seg_id),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
