facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity

localcache: don't fail on file removal if the file is not there

Browse Source 
If another process deletes files managed by localcache, then, the gc step would
fail. This patch prevents the failure and add interesting information to debug
the problem.
This commit is contained in:
Laurent Charignon 2015-12-02 10:40:49 -08:00
parent 9947ff9cc6
commit e388dd5709
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
remotefilelog/fileserverclient.py
View File

@ -8,6 +8,7 @@
from mercurial.i18n import _
from mercurial import util, sshpeer, hg, error, util, wireproto
import os, socket, lz4, time, grp, io
import errno
# Statistics for debugging
fetchcost = 0
@ -520,14 +521,29 @@ class localcache(object):
path = os.path.join(root, file)
key = os.path.relpath(path, cachepath)
count += 1
stat = os.stat(path)
try:
stat = os.stat(path)
except OSError as e:
if e.errno != errno.ENOENT: # errno.ENOENT = no such file or directory
raise
msg = _("warning: file %s was removed by another process\n")
ui.warn(msg % path)
continue
originalsize += stat.st_size
if key in keepkeys or stat.st_atime > limit:
queue.put((stat.st_atime, path, stat))
size += stat.st_size
else:
os.remove(path)
try:
os.remove(path)
except OSError as e:
if e.errno != errno.ENOENT: # errno.ENOENT = no such file or directory
raise
msg = _("warning: file %s was removed by another process\n")
ui.warn(msg % path)
continue
removed += 1
ui.progress(_removing, None)
@ -539,7 +555,13 @@ class localcache(object):
while queue and size > limit and size > 0:
ui.progress(_truncating, removedexcess, unit="bytes", total=excess)
atime, oldpath, stat = queue.get()
os.remove(oldpath)
try:
os.remove(oldpath)
except OSError as e:
if e.errno != errno.ENOENT: # errno.ENOENT = no such file or directory
raise
msg = _("warning: file %s was removed by another process\n")
ui.warn(msg % oldpath)
size -= stat.st_size
removed += 1
removedexcess += stat.st_size