This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 141589366ba branch-3.1: [fix](compaction) use rowset meta FS in
segcompaction and add RPC client ready check #55951 (#55988)
141589366ba is described below
commit 141589366bacb1abce876427befa6bea021a7bc7
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sun Sep 14 00:24:30 2025 +0800
branch-3.1: [fix](compaction) use rowset meta FS in segcompaction and add
RPC client ready check #55951 (#55988)
Cherry-picked from #55951
Co-authored-by: Luwei <[email protected]>
---
be/src/olap/rowset/beta_rowset_writer.cpp | 3 +--
be/src/util/thrift_rpc_helper.cpp | 2 +-
be/src/util/thrift_rpc_helper.h | 2 ++
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/be/src/olap/rowset/beta_rowset_writer.cpp
b/be/src/olap/rowset/beta_rowset_writer.cpp
index 3d15a2293fa..0eea64eb0ee 100644
--- a/be/src/olap/rowset/beta_rowset_writer.cpp
+++ b/be/src/olap/rowset/beta_rowset_writer.cpp
@@ -377,8 +377,7 @@ Status
BetaRowsetWriter::_load_noncompacted_segment(segment_v2::SegmentSharedPtr
.is_doris_table = true,
.cache_base_path {},
};
- auto s = segment_v2::Segment::open(io::global_local_filesystem(), path,
- _rowset_meta->tablet_id(), segment_id,
rowset_id(),
+ auto s = segment_v2::Segment::open(fs, path, _rowset_meta->tablet_id(),
segment_id, rowset_id(),
_context.tablet_schema, reader_options,
&segment);
if (!s.ok()) {
LOG(WARNING) << "failed to open segment. " << path << ":" << s;
diff --git a/be/src/util/thrift_rpc_helper.cpp
b/be/src/util/thrift_rpc_helper.cpp
index c8c0c417b2a..09d5bbefbf4 100644
--- a/be/src/util/thrift_rpc_helper.cpp
+++ b/be/src/util/thrift_rpc_helper.cpp
@@ -53,7 +53,7 @@ using apache::thrift::transport::TSocket;
using apache::thrift::transport::TTransport;
using apache::thrift::transport::TBufferedTransport;
-ExecEnv* ThriftRpcHelper::_s_exec_env;
+ExecEnv* ThriftRpcHelper::_s_exec_env = nullptr;
void ThriftRpcHelper::setup(ExecEnv* exec_env) {
_s_exec_env = exec_env;
diff --git a/be/src/util/thrift_rpc_helper.h b/be/src/util/thrift_rpc_helper.h
index 3b2bfb45517..a0a73ad483b 100644
--- a/be/src/util/thrift_rpc_helper.h
+++ b/be/src/util/thrift_rpc_helper.h
@@ -47,6 +47,8 @@ public:
static Status rpc(const std::string& ip, const int32_t port,
std::function<void(ClientConnection<T>&)> callback, int
timeout_ms);
+ ExecEnv* get_exec_env() { return _s_exec_env; }
+
private:
static ExecEnv* _s_exec_env;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
