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 b44c47fc10 [fix] (remote storage) fix bug for storage policy (#11597)
b44c47fc10 is described below
commit b44c47fc101bb93deb8ea73164138aa2f628f9cb
Author: pengxiangyu <[email protected]>
AuthorDate: Tue Aug 9 09:05:48 2022 +0800
[fix] (remote storage) fix bug for storage policy (#11597)
---
be/src/olap/compaction.cpp | 3 +++
be/src/olap/storage_policy_mgr.cpp | 2 ++
2 files changed, 5 insertions(+)
diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp
index 5b1620d884..e31a5952a7 100644
--- a/be/src/olap/compaction.cpp
+++ b/be/src/olap/compaction.cpp
@@ -303,6 +303,9 @@ Status
Compaction::find_longest_consecutive_version(std::vector<RowsetSharedPtr>
}
Status Compaction::check_version_continuity(const
std::vector<RowsetSharedPtr>& rowsets) {
+ if (rowsets.empty()) {
+ return Status::OK();
+ }
RowsetSharedPtr prev_rowset = rowsets.front();
for (size_t i = 1; i < rowsets.size(); ++i) {
RowsetSharedPtr rowset = rowsets[i];
diff --git a/be/src/olap/storage_policy_mgr.cpp
b/be/src/olap/storage_policy_mgr.cpp
index 57da5408f9..e330dc3229 100644
--- a/be/src/olap/storage_policy_mgr.cpp
+++ b/be/src/olap/storage_policy_mgr.cpp
@@ -62,6 +62,8 @@ void StoragePolicyMgr::periodic_put(const std::string& name,
const StoragePolicy
s3_conf.max_connections = policy->s3_max_conn;
s3_conf.request_timeout_ms = policy->s3_request_timeout_ms;
s3_conf.connect_timeout_ms = policy->s3_conn_timeout_ms;
+ s3_conf.bucket = policy->bucket;
+ s3_conf.prefix = policy->root_path;
s3_fs = std::make_shared<io::S3FileSystem>(std::move(s3_conf),
name);
io::FileSystemMap::instance()->insert(name, s3_fs);
_policy_map.emplace(name, policy);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
