This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 5247e0ff3ac [fix](clone) Increase robustness for clone #36642 (#37413)
5247e0ff3ac is described below
commit 5247e0ff3acc2d64b3eaeb118ece9e2916a54d4b
Author: deardeng <[email protected]>
AuthorDate: Tue Jul 9 17:18:14 2024 +0800
[fix](clone) Increase robustness for clone #36642 (#37413)
cherry pick from #36642
---
be/src/olap/single_replica_compaction.cpp | 7 ++++++-
be/src/olap/task/engine_clone_task.cpp | 16 ++++++++++++++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/be/src/olap/single_replica_compaction.cpp
b/be/src/olap/single_replica_compaction.cpp
index 3843052c43f..7381f5d3c69 100644
--- a/be/src/olap/single_replica_compaction.cpp
+++ b/be/src/olap/single_replica_compaction.cpp
@@ -589,7 +589,12 @@ Status SingleReplicaCompaction::_finish_clone(const
string& clone_dir,
}
// clear clone dir
std::filesystem::path clone_dir_path(clone_dir);
- std::filesystem::remove_all(clone_dir_path);
+ std::error_code ec;
+ std::filesystem::remove_all(clone_dir_path, ec);
+ if (ec) {
+ LOG(WARNING) << "failed to remove=" << clone_dir_path << " msg=" <<
ec.message();
+ return Status::IOError("failed to remove {}, due to {}", clone_dir,
ec.message());
+ }
LOG(INFO) << "finish to clone data, clear downloaded data. res=" << res
<< ", tablet=" << _tablet->tablet_id() << ", clone_dir=" <<
clone_dir;
return res;
diff --git a/be/src/olap/task/engine_clone_task.cpp
b/be/src/olap/task/engine_clone_task.cpp
index 8dc098bb093..62af1fec61a 100644
--- a/be/src/olap/task/engine_clone_task.cpp
+++ b/be/src/olap/task/engine_clone_task.cpp
@@ -623,7 +623,13 @@ Status EngineCloneTask::_download_files(DataDir* data_dir,
const std::string& re
/// 2. Call _finish_xx_clone() to revise the tablet meta.
Status EngineCloneTask::_finish_clone(Tablet* tablet, const std::string&
clone_dir, int64_t version,
bool is_incremental_clone) {
- Defer remove_clone_dir {[&]() { std::filesystem::remove_all(clone_dir); }};
+ Defer remove_clone_dir {[&]() {
+ std::error_code ec;
+ std::filesystem::remove_all(clone_dir, ec);
+ if (ec) {
+ LOG(WARNING) << "failed to remove=" << clone_dir << " msg=" <<
ec.message();
+ }
+ }};
// check clone dir existed
bool exists = true;
@@ -654,7 +660,13 @@ Status EngineCloneTask::_finish_clone(Tablet* tablet,
const std::string& clone_d
bool contain_binlog = false;
RowsetBinlogMetasPB rowset_binlog_metas_pb;
if (binlog_metas_file_exists) {
- auto binlog_meta_filesize =
std::filesystem::file_size(binlog_metas_file);
+ std::error_code ec;
+ auto binlog_meta_filesize =
std::filesystem::file_size(binlog_metas_file, ec);
+ if (ec) {
+ LOG(WARNING) << "get file size error" << ec.message();
+ return Status::IOError("can't retrive file_size of {}, due to {}",
binlog_metas_file,
+ ec.message());
+ }
if (binlog_meta_filesize > 0) {
contain_binlog = true;
RETURN_IF_ERROR(read_pb(binlog_metas_file,
&rowset_binlog_metas_pb));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
