tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Capture exceptions from conflict and write info in magic folder db

This commit is contained in:
David Stainton 2015-08-26 16:50:35 +02:00
parent cdc4bc8e76
commit 264138b44f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/allmydata/frontends/magic_folder.py
View File

@ -518,9 +518,15 @@ class Downloader(QueueMixin):
(name, file_node, metadata) = item (name, file_node, metadata) = item
d = file_node.download_best_version() d = file_node.download_best_version()
def succeeded(res): def succeeded(res):
def do_update_db(result): def do_update_db(result, is_conflicted=False):
filecap = file_node.get_uri() filecap = file_node.get_uri()
s = os.stat(name) full_path = fileutil.abspath_expanduser_unicode(name, base=self._local_path_u)
if is_conflicted:
full_path = full_path + u".conflict" # XXX do we want to mark the conflicted in the db???
try:
s = os.stat(full_path)
except:
raise(Exception("wtf downloaded file %s disappeared" % full_path))
size = s[stat.ST_SIZE] size = s[stat.ST_SIZE]
ctime = s[stat.ST_CTIME] ctime = s[stat.ST_CTIME]
mtime = s[stat.ST_MTIME] mtime = s[stat.ST_MTIME]
@ -528,6 +534,7 @@ class Downloader(QueueMixin):
d2 = defer.succeed(res) d2 = defer.succeed(res)
d2.addCallback(lambda result: self._write_downloaded_file(name, result, self._local_path_u)) d2.addCallback(lambda result: self._write_downloaded_file(name, result, self._local_path_u))
d2.addCallback(do_update_db) d2.addCallback(do_update_db)
d2.addErrback(lambda x: do_update_db(x, is_conflicted=True))
self._count('objects_downloaded') self._count('objects_downloaded')
return d2 return d2
def failed(f): def failed(f):
@ -568,7 +575,10 @@ class Downloader(QueueMixin):
try: try:
fileutil.replace_file(path, replacement_path, backup_path) fileutil.replace_file(path, replacement_path, backup_path)
except fileutil.ConflictError: except fileutil.ConflictError:
is_conflict = True
cls._rename_conflicted_file(path, replacement_path) cls._rename_conflicted_file(path, replacement_path)
if is_conflict:
raise(Exception("Conflict detected..."))
@classmethod @classmethod
def _rename_conflicted_file(self, path, replacement_path): def _rename_conflicted_file(self, path, replacement_path):