This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 9cb7ba8daf8 [Fix](warmup) Fix wrongly skip download task for warmup
job when rowsets have multi segments (#56663)
9cb7ba8daf8 is described below
commit 9cb7ba8daf868f455449fd50d4e2fff6068413f1
Author: bobhan1 <[email protected]>
AuthorDate: Tue Sep 30 19:24:04 2025 +0800
[Fix](warmup) Fix wrongly skip download task for warmup job when rowsets
have multi segments (#56663)
### What problem does this PR solve?
introduced in https://github.com/apache/doris/pull/54611
Related PR: #xxx
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
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 cbd45613444..fe61facd222 100644
--- a/be/src/cloud/cloud_warm_up_manager.cpp
+++ b/be/src/cloud/cloud_warm_up_manager.cpp
@@ -221,26 +221,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]
