ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-12 16:02:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Workaround.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-11-03 02:53:57 +00:00
parent 6b4dc3ac4c
commit a2e18bf43e
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,11 +46,13 @@ class MagicFolder(service.MultiService):
name = 'magic-folder' name = 'magic-folder'
def __init__(self, client, upload_dircap, collective_dircap, local_path_u, dbfile, def __init__(self, client, upload_dircap, collective_dircap, local_path_u, dbfile,
pending_delay=1.0, clock=reactor): pending_delay=1.0, clock=None):
precondition_abspath(local_path_u) precondition_abspath(local_path_u)
service.MultiService.__init__(self) service.MultiService.__init__(self)
immediate = clock is not None
clock = clock or reactor
db = magicfolderdb.get_magicfolderdb(dbfile, create_version=(magicfolderdb.SCHEMA_v1, 1)) db = magicfolderdb.get_magicfolderdb(dbfile, create_version=(magicfolderdb.SCHEMA_v1, 1))
if db is None: if db is None:
return Failure(Exception('ERROR: Unable to load magic folder db.')) return Failure(Exception('ERROR: Unable to load magic folder db.'))
@ -62,7 +64,7 @@ class MagicFolder(service.MultiService):
upload_dirnode = self._client.create_node_from_uri(upload_dircap) upload_dirnode = self._client.create_node_from_uri(upload_dircap)
collective_dirnode = self._client.create_node_from_uri(collective_dircap) collective_dirnode = self._client.create_node_from_uri(collective_dircap)
self.uploader = Uploader(client, local_path_u, db, upload_dirnode, pending_delay, clock) self.uploader = Uploader(client, local_path_u, db, upload_dirnode, pending_delay, clock, immediate)
self.downloader = Downloader(client, local_path_u, db, collective_dirnode, upload_dirnode.get_readonly_uri(), clock) self.downloader = Downloader(client, local_path_u, db, collective_dirnode, upload_dirnode.get_readonly_uri(), clock)
def startService(self): def startService(self):
@ -163,10 +165,12 @@ class QueueMixin(HookMixin):
class Uploader(QueueMixin): class Uploader(QueueMixin):
def __init__(self, client, local_path_u, db, upload_dirnode, pending_delay, clock): def __init__(self, client, local_path_u, db, upload_dirnode, pending_delay, clock,
immediate=False):
QueueMixin.__init__(self, client, local_path_u, db, 'uploader', clock) QueueMixin.__init__(self, client, local_path_u, db, 'uploader', clock)
self.is_ready = False self.is_ready = False
self._immediate = immediate
if not IDirectoryNode.providedBy(upload_dirnode): if not IDirectoryNode.providedBy(upload_dirnode):
raise AssertionError("The URI in '%s' does not refer to a directory." raise AssertionError("The URI in '%s' does not refer to a directory."
@ -288,7 +292,10 @@ class Uploader(QueueMixin):
self._pending.add(relpath_u) self._pending.add(relpath_u)
self._count('objects_queued') self._count('objects_queued')
if self.is_ready: if self.is_ready:
self._clock.callLater(0, self._turn_deque) if self._immediate: # for tests
self._turn_deque()
else:
self._clock.callLater(0, self._turn_deque)
def _when_queue_is_empty(self): def _when_queue_is_empty(self):
return defer.succeed(None) return defer.succeed(None)

9
src/allmydata/test/test_cli_magic_folder.py
View File

@ -115,15 +115,6 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
dbfile, pending_delay=0.2, clock=clock) dbfile, pending_delay=0.2, clock=clock)
magicfolder.downloader._turn_delay = 0 magicfolder.downloader._turn_delay = 0
orig = magicfolder.uploader._append_to_deque
# the _append_to_deque method queues a _turn_deque, so we
# immediately trigger it by wrapping _append_to_deque
def wrap(*args, **kw):
x = orig(*args, **kw)
clock.advance(0) # _turn_delay is always 0 for the tests
return x
magicfolder.uploader._append_to_deque = wrap
magicfolder.setServiceParent(self.get_client(client_num)) magicfolder.setServiceParent(self.get_client(client_num))
magicfolder.ready() magicfolder.ready()
return magicfolder return magicfolder