Avoid the race condition if multiple calls to MakeDirs occur simult…

…aneously with overlapping paths.

Based on #644.

PiperOrigin-RevId: 421565838
(cherry picked from commit aa8b3c6)

tools/common/file_system.cc

@@ -19,6 +19,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <cerrno>
+#include <iostream>
 #include <string>
 
 #ifdef __APPLE__
@@ -100,7 +102,13 @@ bool MakeDirs(const std::string &path, int mode) {
   struct stat dir_stats;
   if (stat(path.c_str(), &dir_stats) == 0) {
     // Return true if the directory already exists.
-    return S_ISDIR(dir_stats.st_mode);
+    if (S_ISDIR(dir_stats.st_mode)) {
+      return true;
+    }
+
+    std::cerr << "error: path already exists but is not a directory: "
+              << path << "\n";
+    return false;
   }
 
   // Recurse to create the parent directory.
@@ -109,5 +117,25 @@ bool MakeDirs(const std::string &path, int mode) {
   }
 
   // Create the directory that was requested.
-  return mkdir(path.c_str(), mode) == 0;
+  if (mkdir(path.c_str(), mode) == 0) {
+    return true;
+  }
+
+  // Race condition: The above call to `mkdir` could fail if there are multiple
+  // calls to `MakeDirs` running at the same time with overlapping paths, so
+  // check again to see if the directory exists despite the call failing. If it
+  // does, that's ok.
+  if (errno == EEXIST && stat(path.c_str(), &dir_stats) == 0) {
+    if (S_ISDIR(dir_stats.st_mode)) {
+      return true;
+    }
+
+    std::cerr << "error: path already exists but is not a directory: "
+              << path << "\n";
+    return false;
+  }
+
+  std::cerr << "error: could not create directory: " << path
+            << " (" << strerror(errno) << ")\n";
+  return false;
 }