1

Author: koarz

be/src/io/fs/local_file_reader.cpp

@@ -46,16 +46,20 @@
 
 namespace doris {
 namespace io {
-
-std::atomic_bool BeConfDataDirReader::be_config_data_dir_list_initing = false;
+// 1: initing 2: inited 0: before init
+std::atomic_int BeConfDataDirReader::be_config_data_dir_list_state = 0;
 
 std::vector<doris::DataDirInfo> BeConfDataDirReader::be_config_data_dir_list;
 
 void BeConfDataDirReader::get_data_dir_by_file_path(io::Path* file_path,
                                                     std::string* data_dir_arg) {
-#ifndef BE_TEST
-    be_config_data_dir_list_initing.wait(true);
-#endif
+    int state = be_config_data_dir_list_state.load(std::memory_order_acquire);
+    if (state == 0) [[unlikely]] {
+        return;
+    } else if (state == 1) [[unlikely]] {
+        be_config_data_dir_list_state.wait(1);
+    }
+
     for (const auto& data_dir_info : be_config_data_dir_list) {
         if (data_dir_info.path.size() >= file_path->string().size()) {
             continue;
@@ -71,10 +75,10 @@ void BeConfDataDirReader::init_be_conf_data_dir(
         const std::vector<doris::StorePath>& store_paths,
         const std::vector<doris::StorePath>& spill_store_paths,
         const std::vector<doris::CachePath>& cache_paths) {
-    be_config_data_dir_list_initing.store(true);
+    be_config_data_dir_list_state.store(1, std::memory_order_release);
     Defer defer {[]() {
-        be_config_data_dir_list_initing.store(false, std::memory_order_release);
-        be_config_data_dir_list_initing.notify_all();
+        be_config_data_dir_list_state.store(2, std::memory_order_release);
+        be_config_data_dir_list_state.notify_all();
     }};
     for (int i = 0; i < store_paths.size(); i++) {
         DataDirInfo data_dir_info;

be/src/io/fs/local_file_reader.h

@@ -35,7 +35,7 @@ struct CachePath;
 namespace doris::io {
 
 struct BeConfDataDirReader {
-    static std::atomic_bool be_config_data_dir_list_initing;
+    static std::atomic_int be_config_data_dir_list_state;
     static std::vector<doris::DataDirInfo> be_config_data_dir_list;
 
     static void get_data_dir_by_file_path(Path* file_path, std::string* data_dir_arg);