This is an automated email from the ASF dual-hosted git repository.

kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 832e18d092540ac0b561a48a4e75fb7ba0d91c2a
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 0ac0cdfc61..6e09323dbd 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>
@@ -387,9 +388,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);
@@ -542,6 +549,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

Reply via email to