Skip to content

Commit

Permalink
Potential Race Condition Fix - OS Rename & Chmod
Browse files Browse the repository at this point in the history
  • Loading branch information
DEKHTIARJonathan committed Dec 24, 2024
1 parent a8c894f commit 4b84090
Showing 1 changed file with 19 additions and 4 deletions.
23 changes: 19 additions & 4 deletions gitdb/db/loose.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import tempfile
import os
import sys
import time


__all__ = ('LooseObjectDB', )
Expand Down Expand Up @@ -205,7 +206,7 @@ def store(self, istream):
# END assure target stream is closed
except:
if tmp_path:
os.remove(tmp_path)
remove(tmp_path)
raise
# END assure tmpfile removal on error

Expand All @@ -228,9 +229,23 @@ 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
# Retry up to 10 times - exponential wait & retry in ms.
for exp_backoff in [1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 289]:
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(exp_backoff/1000.0)
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)
Expand Down

0 comments on commit 4b84090

Please sign in to comment.