This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new c3a92258117 branch-3.0-pick: [log](mow) optimize some log for mow
table (#51093) (#51232)
c3a92258117 is described below
commit c3a92258117272602dfc5c1e80045afd3199bf21
Author: zhannngchen <[email protected]>
AuthorDate: Mon May 26 14:53:45 2025 +0800
branch-3.0-pick: [log](mow) optimize some log for mow table (#51093)
(#51232)
cherry-pick #51093
---
be/src/cloud/cloud_meta_mgr.cpp | 2 +-
cloud/src/meta-service/meta_service.cpp | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/be/src/cloud/cloud_meta_mgr.cpp b/be/src/cloud/cloud_meta_mgr.cpp
index 7435dfa5263..4054c3b20fd 100644
--- a/be/src/cloud/cloud_meta_mgr.cpp
+++ b/be/src/cloud/cloud_meta_mgr.cpp
@@ -559,7 +559,7 @@ Status
CloudMetaMgr::sync_tablet_rowsets_unlocked(CloudTablet* tablet,
resp.stats(), req.idx(),
&delete_bitmap, full_sync,
sync_stats);
if (st.is<ErrorCode::ROWSETS_EXPIRED>() && tried++ < retry_times) {
- LOG_WARNING("rowset meta is expired, need to retry")
+ LOG_INFO("rowset meta is expired, need to retry")
.tag("tablet", tablet->tablet_id())
.tag("tried", tried)
.error(st);
diff --git a/cloud/src/meta-service/meta_service.cpp
b/cloud/src/meta-service/meta_service.cpp
index 78daf880c54..36b32063a96 100644
--- a/cloud/src/meta-service/meta_service.cpp
+++ b/cloud/src/meta-service/meta_service.cpp
@@ -2037,6 +2037,7 @@ void
MetaServiceImpl::update_delete_bitmap(google::protobuf::RpcController* cont
size_t total_txn_put_keys = 0;
size_t total_txn_put_bytes = 0;
size_t total_txn_size = 0;
+ size_t total_txn_count = 0;
for (size_t i = 0; i < request->rowset_ids_size(); ++i) {
auto& key = delete_bitmap_keys.delete_bitmap_keys(i);
auto& val = request->segment_delete_bitmaps(i);
@@ -2046,12 +2047,13 @@ void
MetaServiceImpl::update_delete_bitmap(google::protobuf::RpcController* cont
if (txn->approximate_bytes() + key.size() * 3 + val.size() >
config::max_txn_commit_byte) {
LOG(INFO) << "fdb txn size more than " <<
config::max_txn_commit_byte
<< ", current size: " << txn->approximate_bytes()
- << " lock_id=" << request->lock_id() << " initiator=" <<
request->initiator()
- << ", need to commit";
+ << ", tablet_id: " << tablet_id << " lock_id=" <<
request->lock_id()
+ << " initiator=" << request->initiator() << ", need to
commit";
err = txn->commit();
total_txn_put_keys += txn->num_put_keys();
total_txn_put_bytes += txn->put_bytes();
total_txn_size += txn->approximate_bytes();
+ total_txn_count++;
if (err != TxnErrorCode::TXN_OK) {
code = cast_as<ErrCategory::COMMIT>(err);
ss << "failed to update delete bitmap, err=" << err << "
tablet_id=" << tablet_id
@@ -2099,6 +2101,7 @@ void
MetaServiceImpl::update_delete_bitmap(google::protobuf::RpcController* cont
total_txn_put_keys += txn->num_put_keys();
total_txn_put_bytes += txn->put_bytes();
total_txn_size += txn->approximate_bytes();
+ total_txn_count++;
if (err != TxnErrorCode::TXN_OK) {
code = cast_as<ErrCategory::COMMIT>(err);
ss << "failed to update delete bitmap, err=" << err << " tablet_id="
<< tablet_id
@@ -2117,7 +2120,7 @@ void
MetaServiceImpl::update_delete_bitmap(google::protobuf::RpcController* cont
<< " total_value_count=" << total_value_count << " unlock=" <<
unlock
<< " total_txn_put_keys=" << total_txn_put_keys
<< " total_txn_put_bytes=" << total_txn_put_bytes
- << " total_txn_size=" << total_txn_size;
+ << " total_txn_size=" << total_txn_size << " total_txn_count="
<< total_txn_count;
}
void MetaServiceImpl::get_delete_bitmap(google::protobuf::RpcController*
controller,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
