Added allow_dir_exist to MakeDirectory + clarified comments

Author: oandreeva-nv

src/filesystem/api.cc

@@ -619,11 +619,12 @@ ReadBinaryProto(const std::string& path, google::protobuf::MessageLite* msg)
 }
 
 Status
-MakeDirectory(const std::string& dir, const bool recursive)
+MakeDirectory(
+    const std::string& dir, const bool recursive, const bool allow_dir_exist)
 {
   std::shared_ptr<FileSystem> fs;
   RETURN_IF_ERROR(fsm_.GetFileSystem(dir, fs));
-  return fs->MakeDirectory(dir, recursive);
+  return fs->MakeDirectory(dir, recursive, allow_dir_exist);
 }
 
 Status

src/filesystem/api.h

@@ -158,7 +158,7 @@ Status LocalizePath(
 /// \param path The path of the directory or file.
 /// \param recursive If true, will fetch all sub-directories in
 /// the provided path.
-/// \param mount_dir If specified, will use provided local directory
+/// \param mount_dir If not empty, will use provided local directory
 /// for localization.
 /// \param localized Returns the LocalizedPath object
 /// representing the local copy of the path.
@@ -205,8 +205,14 @@ Status ReadBinaryProto(
 /// \param dir The path to the directory.
 /// \param recursive Whether the parent directories will be created
 /// if not exist.
+/// \param allow_dir_exist Controls the behavior on condition,
+/// when `dir` already exists. If true and `dir` exists, returns success.
+/// If false and `dir` exists, fails with `Status::Code::INTERNAL`
+/// and reports errno EEXIST. Default value: false.
 /// \return Error status if the directory can't be created
-Status MakeDirectory(const std::string& dir, const bool recursive);
+Status MakeDirectory(
+    const std::string& dir, const bool recursive,
+    const bool allow_dir_exist = false);
 
 /// Create a temporary directory of the specified filesystem type.
 /// \param type The type of the filesystem.

src/filesystem/implementations/as.h

@@ -94,7 +94,9 @@ class ASFileSystem : public FileSystem {
   Status WriteBinaryFile(
       const std::string& path, const char* contents,
       const size_t content_len) override;
-  Status MakeDirectory(const std::string& dir, const bool recursive) override;
+  Status MakeDirectory(
+      const std::string& dir, const bool recursive,
+      const bool allow_dir_exist) override;
   Status MakeTemporaryDirectory(std::string* temp_dir) override;
   Status DeletePath(const std::string& path) override;
 
@@ -489,7 +491,8 @@ ASFileSystem::WriteBinaryFile(
 }
 
 Status
-ASFileSystem::MakeDirectory(const std::string& dir, const bool recursive)
+ASFileSystem::MakeDirectory(
+    const std::string& dir, const bool recursive, const bool allow_dir_exist)
 {
   return Status(
       Status::Code::UNSUPPORTED,

src/filesystem/implementations/common.h

@@ -92,7 +92,8 @@ class FileSystem {
       const std::string& path, const char* contents,
       const size_t content_len) = 0;
   virtual Status MakeDirectory(
-      const std::string& dir, const bool recursive) = 0;
+      const std::string& dir, const bool recursive,
+      const bool allow_dir_exist) = 0;
   virtual Status MakeTemporaryDirectory(std::string* temp_dir) = 0;
   virtual Status DeletePath(const std::string& path) = 0;
 };

src/filesystem/implementations/gcs.h

@@ -83,7 +83,9 @@ class GCSFileSystem : public FileSystem {
   Status WriteBinaryFile(
       const std::string& path, const char* contents,
       const size_t content_len) override;
-  Status MakeDirectory(const std::string& dir, const bool recursive) override;
+  Status MakeDirectory(
+      const std::string& dir, const bool recursive,
+      const bool allow_dir_exist) override;
   Status MakeTemporaryDirectory(std::string* temp_dir) override;
   Status DeletePath(const std::string& path) override;
 
@@ -474,7 +476,8 @@ GCSFileSystem::WriteBinaryFile(
 }
 
 Status
-GCSFileSystem::MakeDirectory(const std::string& dir, const bool recursive)
+GCSFileSystem::MakeDirectory(
+    const std::string& dir, const bool recursive, const bool allow_dir_exist)
 {
   return Status(
       Status::Code::UNSUPPORTED,

src/filesystem/implementations/local.h

@@ -57,7 +57,9 @@ class LocalFileSystem : public FileSystem {
   Status WriteBinaryFile(
       const std::string& path, const char* contents,
       const size_t content_len) override;
-  Status MakeDirectory(const std::string& dir, const bool recursive) override;
+  Status MakeDirectory(
+      const std::string& dir, const bool recursive,
+      const bool allow_dir_exist) override;
   Status MakeTemporaryDirectory(std::string* temp_dir) override;
   Status DeletePath(const std::string& path) override;
 };
@@ -248,22 +250,23 @@ LocalFileSystem::WriteBinaryFile(
 }
 
 Status
-LocalFileSystem::MakeDirectory(const std::string& dir, const bool recursive)
+LocalFileSystem::MakeDirectory(
+    const std::string& dir, const bool recursive, const bool allow_dir_exist)
 {
 #ifdef _WIN32
   if (mkdir(dir.c_str()) == -1)
 #else
   if (mkdir(dir.c_str(), S_IRWXU) == -1)
 #endif
   {
-    // Return success if directory already exists
-    if (errno == EEXIST) {
+    // Return success if directory already exists and it is permitted
+    if (allow_dir_exist && errno == EEXIST) {
       return Status::Success;
     }
     // In all other cases only allow the error due to parent directory
     // does not exist, if 'recursive' is requested
     if ((errno == ENOENT) && (!dir.empty()) && recursive) {
-      RETURN_IF_ERROR(MakeDirectory(DirName(dir), recursive));
+      RETURN_IF_ERROR(MakeDirectory(DirName(dir), recursive, allow_dir_exist));
       // Retry the creation
 #ifdef _WIN32
       if (mkdir(dir.c_str()) == -1)

src/filesystem/implementations/s3.h

@@ -159,7 +159,9 @@ class S3FileSystem : public FileSystem {
   Status WriteBinaryFile(
       const std::string& path, const char* contents,
       const size_t content_len) override;
-  Status MakeDirectory(const std::string& dir, const bool recursive) override;
+  Status MakeDirectory(
+      const std::string& dir, const bool recursive,
+      const bool allow_dir_exist) override;
   Status MakeTemporaryDirectory(std::string* temp_dir) override;
   Status DeletePath(const std::string& path) override;
 
@@ -668,7 +670,8 @@ S3FileSystem::LocalizePath(
     tmp_folder = mount_dir.empty() ? std::string(env_mount_dir) : mount_dir;
     tmp_folder =
         JoinPath({tmp_folder, path.substr(path.find_last_of('/') + 1)});
-    RETURN_IF_ERROR(triton::core::MakeDirectory(tmp_folder, true));
+    RETURN_IF_ERROR(triton::core::MakeDirectory(
+        tmp_folder, true /*recursive*/, true /*allow_dir_exist*/));
   }
 
   // Specify contents to be downloaded
@@ -780,7 +783,8 @@ S3FileSystem::WriteBinaryFile(
 }
 
 Status
-S3FileSystem::MakeDirectory(const std::string& dir, const bool recursive)
+S3FileSystem::MakeDirectory(
+    const std::string& dir, const bool recursive, const bool allow_dir_exist)
 {
   return Status(
       Status::Code::UNSUPPORTED,