You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2024/02/17 02:42:41 UTC
(doris) branch branch-2.0 updated: [fix](chmod) change chmod to filesystem::permission to avoid race condition #31032 (#31034)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 97181147f46 [fix](chmod) change chmod to filesystem::permission to avoid race condition #31032 (#31034)
97181147f46 is described below
commit 97181147f46acf845f48717ab93d4e730ac71105
Author: Mingyu Chen <mo...@163.com>
AuthorDate: Sat Feb 17 10:42:34 2024 +0800
[fix](chmod) change chmod to filesystem::permission to avoid race condition #31032 (#31034)
bp #31032
---
be/src/io/fs/local_file_system.cpp | 18 ++++++++++++++++++
be/src/io/fs/local_file_system.h | 5 +++++
be/src/olap/single_replica_compaction.cpp | 4 ++--
be/src/olap/task/engine_clone_task.cpp | 4 ++--
be/src/runtime/snapshot_loader.cpp | 4 ++--
be/src/service/backend_service.cpp | 5 +++--
be/src/service/internal_service.cpp | 6 +++---
7 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/be/src/io/fs/local_file_system.cpp b/be/src/io/fs/local_file_system.cpp
index 830a7db77cb..f7ac1e77e16 100644
--- a/be/src/io/fs/local_file_system.cpp
+++ b/be/src/io/fs/local_file_system.cpp
@@ -46,6 +46,9 @@ namespace doris {
namespace io {
class FileReaderOptions;
+std::filesystem::perms LocalFileSystem::PERMS_OWNER_RW =
+ std::filesystem::perms::owner_read | std::filesystem::perms::owner_write;
+
std::shared_ptr<LocalFileSystem> LocalFileSystem::create(Path path, std::string id) {
return std::shared_ptr<LocalFileSystem>(new LocalFileSystem(std::move(path), std::move(id)));
}
@@ -487,5 +490,20 @@ Status LocalFileSystem::_glob(const std::string& pattern, std::vector<std::strin
return Status::OK();
}
+Status LocalFileSystem::permission(const Path& file, std::filesystem::perms prms) {
+ auto path = absolute_path(file);
+ FILESYSTEM_M(permission_impl(path, prms));
+}
+
+Status LocalFileSystem::permission_impl(const Path& file, std::filesystem::perms prms) {
+ std::error_code ec;
+ std::filesystem::permissions(file, prms, ec);
+ if (ec) {
+ return Status::IOError("failed to change file permission {}: {}", file.native(),
+ errcode_to_str(ec));
+ }
+ return Status::OK();
+}
+
} // namespace io
} // namespace doris
diff --git a/be/src/io/fs/local_file_system.h b/be/src/io/fs/local_file_system.h
index da55cf0dfba..c975e8c410f 100644
--- a/be/src/io/fs/local_file_system.h
+++ b/be/src/io/fs/local_file_system.h
@@ -68,6 +68,10 @@ public:
static bool contain_path(const Path& parent, const Path& sub);
// delete dir or file
Status delete_directory_or_file(const Path& path);
+ // change the file permission of the given path
+ Status permission(const Path& file, std::filesystem::perms prms);
+
+ static std::filesystem::perms PERMS_OWNER_RW;
// read local file and save content to "content"
Status read_file_to_string(const Path& file, std::string* content);
@@ -105,6 +109,7 @@ protected:
Status get_space_info_impl(const Path& path, size_t* capacity, size_t* available);
Status copy_path_impl(const Path& src, const Path& dest);
Status delete_directory_or_file_impl(const Path& path);
+ Status permission_impl(const Path& file, std::filesystem::perms prms);
private:
// a wrapper for glob(), return file list in "res"
diff --git a/be/src/olap/single_replica_compaction.cpp b/be/src/olap/single_replica_compaction.cpp
index d6fbb3954bd..1bbdf95be55 100644
--- a/be/src/olap/single_replica_compaction.cpp
+++ b/be/src/olap/single_replica_compaction.cpp
@@ -485,8 +485,8 @@ Status SingleReplicaCompaction::_download_files(DataDir* data_dir,
<< ", local_file_size=" << local_file_size;
return Status::InternalError("downloaded file size is not equal");
}
- chmod(local_file_path.c_str(), S_IRUSR | S_IWUSR);
- return Status::OK();
+ return io::global_local_filesystem()->permission(local_file_path,
+ io::LocalFileSystem::PERMS_OWNER_RW);
};
RETURN_IF_ERROR(HttpClient::execute_with_retry(DOWNLOAD_FILE_MAX_RETRY, 1, download_cb));
} // Clone files from remote backend
diff --git a/be/src/olap/task/engine_clone_task.cpp b/be/src/olap/task/engine_clone_task.cpp
index 80d9df58640..7abf6fbdc4f 100644
--- a/be/src/olap/task/engine_clone_task.cpp
+++ b/be/src/olap/task/engine_clone_task.cpp
@@ -565,8 +565,8 @@ Status EngineCloneTask::_download_files(DataDir* data_dir, const std::string& re
<< ", local_file_size=" << local_file_size;
return Status::InternalError("downloaded file size is not equal");
}
- chmod(local_file_path.c_str(), S_IRUSR | S_IWUSR);
- return Status::OK();
+ return io::global_local_filesystem()->permission(local_file_path,
+ io::LocalFileSystem::PERMS_OWNER_RW);
};
RETURN_IF_ERROR(HttpClient::execute_with_retry(DOWNLOAD_FILE_MAX_RETRY, 1, download_cb));
} // Clone files from remote backend
diff --git a/be/src/runtime/snapshot_loader.cpp b/be/src/runtime/snapshot_loader.cpp
index af15371ab3c..c4dcc7f34de 100644
--- a/be/src/runtime/snapshot_loader.cpp
+++ b/be/src/runtime/snapshot_loader.cpp
@@ -583,8 +583,8 @@ Status SnapshotLoader::remote_http_download(
<< ", local_file_size=" << local_file_size;
return Status::InternalError("downloaded file size is not equal");
}
- chmod(local_file_path.c_str(), S_IRUSR | S_IWUSR);
- return Status::OK();
+ return io::global_local_filesystem()->permission(
+ local_file_path, io::LocalFileSystem::PERMS_OWNER_RW);
};
RETURN_IF_ERROR(HttpClient::execute_with_retry(kDownloadFileMaxRetry, 1, download_cb));
diff --git a/be/src/service/backend_service.cpp b/be/src/service/backend_service.cpp
index a0fa2066dfc..339c53cf7dd 100644
--- a/be/src/service/backend_service.cpp
+++ b/be/src/service/backend_service.cpp
@@ -46,6 +46,7 @@
#include "gutil/strings/split.h"
#include "gutil/strings/substitute.h"
#include "http/http_client.h"
+#include "io/fs/local_file_system.h"
#include "olap/olap_common.h"
#include "olap/olap_define.h"
#include "olap/rowset/beta_rowset.h"
@@ -268,8 +269,8 @@ void _ingest_binlog(IngestBinlogArg* arg) {
<< ", local_file_size=" << local_file_size;
return Status::InternalError("downloaded file size is not equal");
}
- chmod(local_segment_path.c_str(), S_IRUSR | S_IWUSR);
- return Status::OK();
+ return io::global_local_filesystem()->permission(local_segment_path,
+ io::LocalFileSystem::PERMS_OWNER_RW);
};
auto status = HttpClient::execute_with_retry(max_retry, 1, get_segment_file_cb);
diff --git a/be/src/service/internal_service.cpp b/be/src/service/internal_service.cpp
index 7e93a84050b..acc2e29a3ef 100644
--- a/be/src/service/internal_service.cpp
+++ b/be/src/service/internal_service.cpp
@@ -1216,7 +1216,6 @@ void PInternalServiceImpl::hand_shake(google::protobuf::RpcController* controlle
constexpr char HttpProtocol[] = "http://";
constexpr char DownloadApiPath[] = "/api/_tablet/_download?token=";
constexpr char FileParam[] = "&file=";
-constexpr auto Permissions = S_IRUSR | S_IWUSR;
std::string construct_url(const std::string& host_port, const std::string& token,
const std::string& path) {
@@ -1248,8 +1247,9 @@ static Status download_file_action(std::string& remote_file_url, std::string& lo
return Status::InternalError("downloaded file size is not equal");
}
}
- chmod(local_file_path.c_str(), Permissions);
- return Status::OK();
+
+ return io::global_local_filesystem()->permission(local_file_path,
+ io::LocalFileSystem::PERMS_OWNER_RW);
};
return HttpClient::execute_with_retry(DOWNLOAD_FILE_MAX_RETRY, 1, download_cb);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org