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 465090c1471 [fix](merge-cloud) Fix incorrect num_expired in
`recycle_rowsets()` (#34022)
465090c1471 is described below
commit 465090c14717e3a25b6ed84f21e816a1ffacb618
Author: Lei Zhang <27994433+swjtu-zhang...@users.noreply.github.com>
AuthorDate: Tue Apr 23 20:58:30 2024 +0800
[fix](merge-cloud) Fix incorrect num_expired in `recycle_rowsets()` (#34022)
---
cloud/src/recycler/recycler.cpp | 2 +-
cloud/src/recycler/s3_accessor.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cloud/src/recycler/recycler.cpp b/cloud/src/recycler/recycler.cpp
index 3222a8e2e14..05744bc596d 100644
--- a/cloud/src/recycler/recycler.cpp
+++ b/cloud/src/recycler/recycler.cpp
@@ -1550,7 +1550,7 @@ int InstanceRecycler::recycle_rowsets() {
LOG(WARNING) << "failed to delete recycle rowset kv,
instance_id=" << instance_id_;
return;
}
- num_recycled.fetch_add(rowset_keys.size(),
std::memory_order_relaxed);
+ num_recycled.fetch_add(rowset_keys_to_delete.size(),
std::memory_order_relaxed);
});
return 0;
};
diff --git a/cloud/src/recycler/s3_accessor.cpp
b/cloud/src/recycler/s3_accessor.cpp
index eb119485341..543f84f87fc 100644
--- a/cloud/src/recycler/s3_accessor.cpp
+++ b/cloud/src/recycler/s3_accessor.cpp
@@ -187,7 +187,8 @@ int S3Accessor::delete_objects(const
std::vector<std::string>& relative_paths) {
LOG_INFO("delete object")
.tag("endpoint", conf_.endpoint)
.tag("bucket", conf_.bucket)
- .tag("key", key);
+ .tag("key", key)
+ .tag("size", objects.size());
objects.emplace_back().SetKey(std::move(key));
}
if (objects.empty()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
