Merge branch 'tickets/DM-39783'

lsst · Jun 24, 2023 · 62ffa04 · 62ffa04
2 parents 4e1c41f + 8cac934
commit 62ffa04
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/replica/FileUtils.cc b/src/replica/FileUtils.cc
@@ -256,10 +256,22 @@ void FileUtils::verifyFolders(string const& requestorContext, vector<string> con
         }
         boost::system::error_code ec;
         if (createMissingFolders) {
-            if (!fs::create_directories(path, ec)) {
+            if (fs::exists(path, ec)) {
+                bool const isDirectory = fs::is_directory(path, ec);
                 if (ec.value() != 0) {
-                    throw runtime_error(context + " failed to create folder '" + folder +
-                                        "' or its intermediate subfolders, error: " + ec.message());
+                    throw runtime_error(context + " failed to check if the path '" + folder +
+                                        "' is a directory, error: " + ec.message());
+                }
+                if (!isDirectory) {
+                    throw runtime_error(context + " specified path '" + folder +
+                                        "' is not a valid directory");
+                }
+            } else {
+                if (!fs::create_directories(path, ec)) {
+                    if (ec.value() != 0) {
+                        throw runtime_error(context + " failed to create folder '" + folder +
+                                            "' or its intermediate subfolders, error: " + ec.message());
+                    }
                 }
             }
         }

diff --git a/src/replica/testFileUtils.cc b/src/replica/testFileUtils.cc
@@ -201,6 +201,10 @@ BOOST_AUTO_TEST_CASE(FileUtils_verifyFolders) {
         // Now launch the method to force create the folder.
         BOOST_REQUIRE_NO_THROW({ FileUtils::verifyFolders("TEST", folders, createMissingFolders); });
 
+        // Repeat the preious operation. It should not fail since the method first checks
+        // if the path already exists and if it's a valid directory before creating the one.
+        BOOST_REQUIRE_NO_THROW({ FileUtils::verifyFolders("TEST", folders, createMissingFolders); });
+
         // Make another run w/o attempting creating a folder
         BOOST_REQUIRE_NO_THROW({ FileUtils::verifyFolders("TEST", folders, !createMissingFolders); });