From 97bd521804d8b54230ec114c2dddf64c6c491dde Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Wed, 4 Jun 2025 14:15:01 +0200
Subject: directory_map: Correctly report fatal on failures to read from
 workspace roots

---
 .../build_engine/base_maps/directory_map.cpp       | 15 ++++++++---
 src/buildtool/file_system/file_root.hpp            | 31 +++++++++++++---------
 2 files changed, 30 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/buildtool/build_engine/base_maps/directory_map.cpp b/src/buildtool/build_engine/base_maps/directory_map.cpp
index 0cdd7977..522b0f7d 100644
--- a/src/buildtool/build_engine/base_maps/directory_map.cpp
+++ b/src/buildtool/build_engine/base_maps/directory_map.cpp
@@ -33,7 +33,7 @@ auto BuildMaps::Base::CreateDirectoryEntriesMap(
             (*logger)(
                 fmt::format("Cannot determine workspace root for repository {}",
                             key.repository),
-                true);
+                /*fatal=*/true);
             return;
         }
         if (ws_root->IsAbsent()) {
@@ -43,9 +43,9 @@ auto BuildMaps::Base::CreateDirectoryEntriesMap(
                 missing_root = *absent_tree;
             }
             (*logger)(fmt::format("Would have to read directory entries of "
-                                  "absent root {}.",
+                                  "absent root {}",
                                   missing_root),
-                      true);
+                      /*fatal=*/true);
             return;
         }
         auto dir_path = key.module.empty() ? "." : key.module;
@@ -56,7 +56,14 @@ auto BuildMaps::Base::CreateDirectoryEntriesMap(
                 FileRoot::DirectoryEntries::pairs_t{}});
             return;
         }
-        (*setter)(ws_root->ReadDirectory(dir_path));
+        if (auto read_dir = ws_root->ReadDirectory(dir_path)) {
+            (*setter)(*std::move(read_dir));
+            return;
+        }
+        (*logger)(fmt::format("Failed to read directory {} from repository {}",
+                              dir_path,
+                              key.repository),
+                  /*fatal=*/true);
     };
     return AsyncMapConsumer<BuildMaps::Base::ModuleName,
                             FileRoot::DirectoryEntries>{directory_reader, jobs};
diff --git a/src/buildtool/file_system/file_root.hpp b/src/buildtool/file_system/file_root.hpp
index 684c5215..3384f55e 100644
--- a/src/buildtool/file_system/file_root.hpp
+++ b/src/buildtool/file_system/file_root.hpp
@@ -564,7 +564,7 @@ class FileRoot {
     /// \brief Read entries of directory from non-absent source root.
     /// Returns value only for valid entries.
     [[nodiscard]] auto ReadDirectory(std::filesystem::path const& dir_path)
-        const noexcept -> DirectoryEntries {
+        const noexcept -> std::optional<DirectoryEntries> {
         try {
             if (std::holds_alternative<RootGit>(root_)) {
                 auto const& git_root = std::get<RootGit>(root_);
@@ -577,10 +577,11 @@ class FileRoot {
                         // it directly
                         return DirectoryEntries{&(*root_tree)};
                     }
-                    Logger::Log(LogLevel::Warning,
-                                "Asked to read invalid Git source tree {}",
-                                root_tree->FileRootHash());
-                    return DirectoryEntries{DirectoryEntries::pairs_t{}};
+                    Logger::Log(
+                        LogLevel::Debug,
+                        "Failed to read root directory of Git source tree {}",
+                        root_tree->FileRootHash());
+                    return std::nullopt;
                 }
                 if (auto entry = root_tree->LookupEntryByPath(dir_path)) {
                     if (ignore_special_ or
@@ -593,32 +594,38 @@ class FileRoot {
                         }
                     }
                     Logger::Log(
-                        LogLevel::Warning,
-                        "Asked to read invalid subdir {} of Git source tree {}",
+                        LogLevel::Debug,
+                        "Failed to read subdir {} of Git source tree {}",
                         dir_path.string(),
                         root_tree->FileRootHash());
-                    return DirectoryEntries{DirectoryEntries::pairs_t{}};
+                    return std::nullopt;
                 }
             }
             else if (std::holds_alternative<fs_root_t>(root_)) {
                 DirectoryEntries::pairs_t map{};
+                auto const subdir_path = std::get<fs_root_t>(root_) / dir_path;
                 if (FileSystemManager::ReadDirectory(
-                        std::get<fs_root_t>(root_) / dir_path,
+                        subdir_path,
                         [&map](const auto& name, auto type) {
                             map.emplace(name.string(), type);
                             return true;
                         },
                         /*allow_upwards=*/false,
                         ignore_special_,
-                        /*log_failure_at=*/LogLevel::Warning)) {
+                        /*log_failure_at=*/LogLevel::Debug)) {
                     return DirectoryEntries{std::move(map)};
                 }
+                Logger::Log(LogLevel::Debug,
+                            "Failed to read file source directory {}",
+                            subdir_path.string());
+                return std::nullopt;
             }
         } catch (std::exception const& ex) {
-            Logger::Log(LogLevel::Error,
-                        "reading directory {} failed with:\n{}",
+            Logger::Log(LogLevel::Debug,
+                        "Reading source directory {} failed with:\n{}",
                         dir_path.string(),
                         ex.what());
+            return std::nullopt;
         }
         return DirectoryEntries{DirectoryEntries::pairs_t{}};
     }
-- 
cgit v1.2.3