Potential Race Condition Fix - OS Rename & Chmod

Author: DEKHTIARJonathan

gitdb/db/loose.py

@@ -54,6 +54,7 @@
 import tempfile
 import os
 import sys
+import time
 
 
 __all__ = ('LooseObjectDB', )
@@ -204,8 +205,8 @@ def store(self, istream):
                     writer.close()
             # END assure target stream is closed
         except:
-            if tmp_path:
-                os.remove(tmp_path)
+            with suppress(FileNotFoundError):
+                remove(tmp_path)
             raise
         # END assure tmpfile removal on error
 
@@ -228,9 +229,22 @@ def store(self, istream):
                 rename(tmp_path, obj_path)
             # end rename only if needed
 
-            # make sure its readable for all ! It started out as rw-- tmp file
-            # but needs to be rwrr
-            chmod(obj_path, self.new_objects_mode)
+            # Ensure rename is actually done and file is stable
+            for _ in range(10):  # Retry up to 10 times
+                with suppress(PermissionError):
+                    # make sure its readable for all ! It started out as rw-- tmp file
+                    # but needs to be rwrr
+                    chmod(obj_path, self.new_objects_mode)
+                    break
+                time.sleep(0.1)
+            else:
+                raise PermissionError(
+                    "Impossible to apply `chmod` to file {}".format(obj_path)
+                )
+
+            # Cleanup
+            with suppress(FileNotFoundError):
+                remove(tmp_path)
         # END handle dry_run
 
         istream.binsha = hex_to_bin(hexsha)