This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 ee5b307e63 [Fix](binlog) Add more log for ingest_binlog && Fix
ingest_binlog not rewrite rowset_meta tablet_uid (#24617)
ee5b307e63 is described below
commit ee5b307e630488128e7fd85f223f5851013932b7
Author: Jack Drogon <jack.xsuper...@gmail.com>
AuthorDate: Thu Sep 21 10:40:08 2023 +0800
[Fix](binlog) Add more log for ingest_binlog && Fix ingest_binlog not
rewrite rowset_meta tablet_uid (#24617)
* Add more log for ingest_binlog && Fix ingest_binlog not rewrite
rowset_meta tablet_uid
Signed-off-by: Jack Drogon <jack.xsuper...@gmail.com>
* Add lost thrift TDebugProtocol
Signed-off-by: Jack Drogon <jack.xsuper...@gmail.com>
---------
Signed-off-by: Jack Drogon <jack.xsuper...@gmail.com>
---
be/src/service/backend_service.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/be/src/service/backend_service.cpp
b/be/src/service/backend_service.cpp
index 98064cf9d9..98f8d554bd 100644
--- a/be/src/service/backend_service.cpp
+++ b/be/src/service/backend_service.cpp
@@ -29,6 +29,7 @@
#include <gen_cpp/Types_types.h>
#include <sys/types.h>
#include <thrift/concurrency/ThreadFactory.h>
+#include <thrift/protocol/TDebugProtocol.h>
#include <time.h>
#include <map>
@@ -390,9 +391,15 @@ void
BackendService::check_storage_format(TCheckStorageFormatResult& result) {
void BackendService::ingest_binlog(TIngestBinlogResult& result,
const TIngestBinlogRequest& request) {
+ LOG(INFO) << "ingest binlog. request: " <<
apache::thrift::ThriftDebugString(request);
+
constexpr uint64_t kMaxTimeoutMs = 1000;
+
TStatus tstatus;
- Defer defer {[&result, &tstatus]() { result.__set_status(tstatus); }};
+ Defer defer {[&result, &tstatus]() {
+ result.__set_status(tstatus);
+ LOG(INFO) << "ingest binlog. result: " <<
apache::thrift::ThriftDebugString(result);
+ }};
auto set_tstatus = [&tstatus](TStatusCode::type code, std::string
error_msg) {
tstatus.__set_status_code(code);
@@ -543,6 +550,7 @@ void BackendService::ingest_binlog(TIngestBinlogResult&
result,
}
RowsetId new_rowset_id = StorageEngine::instance()->next_rowset_id();
rowset_meta->set_rowset_id(new_rowset_id);
+ rowset_meta->set_tablet_uid(local_tablet->tablet_uid());
// Step 5: get all segment files
// Step 5.1: get all segment files size
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
