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 aa3be14e58e [log](cloud) Print txn id when prepare/commit rowset
(#36068)
aa3be14e58e is described below
commit aa3be14e58eee21007050dce46f04966758a3f20
Author: Gavin Chou <[email protected]>
AuthorDate: Sat Jun 8 23:46:59 2024 +0800
[log](cloud) Print txn id when prepare/commit rowset (#36068)
Previous implementation does not print txn_id when prepare/commit rowset
---
be/src/cloud/cloud_meta_mgr.cpp | 6 ++++--
cloud/src/meta-service/meta_service.cpp | 8 +++++---
gensrc/proto/cloud.proto | 1 +
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/be/src/cloud/cloud_meta_mgr.cpp b/be/src/cloud/cloud_meta_mgr.cpp
index 4bf62c9dc7f..a14ec2b0497 100644
--- a/be/src/cloud/cloud_meta_mgr.cpp
+++ b/be/src/cloud/cloud_meta_mgr.cpp
@@ -651,11 +651,12 @@ Status
CloudMetaMgr::sync_tablet_delete_bitmap(CloudTablet* tablet, int64_t old_
Status CloudMetaMgr::prepare_rowset(const RowsetMeta& rs_meta,
RowsetMetaSharedPtr* existed_rs_meta) {
VLOG_DEBUG << "prepare rowset, tablet_id: " << rs_meta.tablet_id()
- << ", rowset_id: " << rs_meta.rowset_id();
+ << ", rowset_id: " << rs_meta.rowset_id() << " txn_id: " <<
rs_meta.txn_id();
CreateRowsetRequest req;
CreateRowsetResponse resp;
req.set_cloud_unique_id(config::cloud_unique_id);
+ req.set_txn_id(rs_meta.txn_id());
RowsetMetaPB doris_rs_meta = rs_meta.get_rowset_pb(/*skip_schema=*/true);
doris_rowset_meta_to_cloud(req.mutable_rowset_meta(),
std::move(doris_rs_meta));
@@ -676,10 +677,11 @@ Status CloudMetaMgr::prepare_rowset(const RowsetMeta&
rs_meta,
Status CloudMetaMgr::commit_rowset(const RowsetMeta& rs_meta,
RowsetMetaSharedPtr* existed_rs_meta) {
VLOG_DEBUG << "commit rowset, tablet_id: " << rs_meta.tablet_id()
- << ", rowset_id: " << rs_meta.rowset_id();
+ << ", rowset_id: " << rs_meta.rowset_id() << " txn_id: " <<
rs_meta.txn_id();
CreateRowsetRequest req;
CreateRowsetResponse resp;
req.set_cloud_unique_id(config::cloud_unique_id);
+ req.set_txn_id(rs_meta.txn_id());
RowsetMetaPB rs_meta_pb = rs_meta.get_rowset_pb();
doris_rowset_meta_to_cloud(req.mutable_rowset_meta(),
std::move(rs_meta_pb));
diff --git a/cloud/src/meta-service/meta_service.cpp
b/cloud/src/meta-service/meta_service.cpp
index 5bba013ab67..b234a48d88a 100644
--- a/cloud/src/meta-service/meta_service.cpp
+++ b/cloud/src/meta-service/meta_service.cpp
@@ -1003,7 +1003,8 @@ void
MetaServiceImpl::prepare_rowset(::google::protobuf::RpcController* controll
prepare_rowset.SerializeToString(&val);
DCHECK_GT(prepare_rowset.expiration(), 0);
txn->put(prepare_rs_key, val);
- LOG(INFO) << "xxx put prepare_rs_key " << hex(prepare_rs_key) << "
value_size " << val.size();
+ LOG(INFO) << "put prepare_rs_key " << hex(prepare_rs_key) << " value_size
" << val.size()
+ << " txn_id " << request->txn_id();
err = txn->commit();
if (err != TxnErrorCode::TXN_OK) {
code = cast_as<ErrCategory::COMMIT>(err);
@@ -1130,8 +1131,9 @@ void
MetaServiceImpl::commit_rowset(::google::protobuf::RpcController* controlle
DCHECK_GT(rowset_meta.txn_expiration(), 0);
auto tmp_rs_val = rowset_meta.SerializeAsString();
txn->put(tmp_rs_key, tmp_rs_val);
- LOG(INFO) << "xxx put tmp_rs_key " << hex(tmp_rs_key) << " delete
recycle_rs_key "
- << hex(recycle_rs_key) << " value_size " << tmp_rs_val.size();
+ LOG(INFO) << "put tmp_rs_key " << hex(tmp_rs_key) << " delete
recycle_rs_key "
+ << hex(recycle_rs_key) << " value_size " << tmp_rs_val.size() <<
" txn_id "
+ << request->txn_id();
err = txn->commit();
if (err != TxnErrorCode::TXN_OK) {
code = cast_as<ErrCategory::COMMIT>(err);
diff --git a/gensrc/proto/cloud.proto b/gensrc/proto/cloud.proto
index b69c393c2fa..43a03f7b602 100644
--- a/gensrc/proto/cloud.proto
+++ b/gensrc/proto/cloud.proto
@@ -918,6 +918,7 @@ message CreateRowsetRequest {
optional string cloud_unique_id = 1; // For auth
optional doris.RowsetMetaCloudPB rowset_meta = 2;
optional bool temporary = 3;
+ optional int64 txn_id = 4;
}
message CreateRowsetResponse {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
