gavinchou commented on code in PR #33605:
URL: https://github.com/apache/doris/pull/33605#discussion_r1562466909
##########
be/src/cloud/cloud_storage_engine.cpp:
##########
@@ -296,7 +296,36 @@ void CloudStorageEngine::sync_storage_vault() {
void CloudStorageEngine::_refresh_storage_vault_info_thread_callback() {
while (!_stop_background_threads_latch.wait_for(
std::chrono::seconds(config::refresh_s3_info_interval_s))) {
+<<<<<<< HEAD
sync_storage_vault();
+=======
Review Comment:
conflict block !
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
