From 93b91f8602867807d06b2defec6e4f3fcc68f3f4 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Mon, 23 Oct 2017 01:16:29 -0400 Subject: [PATCH 1/4] block session startup on joinNetwork --- lbrynet/core/Session.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lbrynet/core/Session.py b/lbrynet/core/Session.py index f390c6d26..41742305c 100644 --- a/lbrynet/core/Session.py +++ b/lbrynet/core/Session.py @@ -260,8 +260,7 @@ class Session(object): addresses.append(value) return addresses - def start_dht(addresses): - self.dht_node.joinNetwork(addresses) + def start_dht(join_network_result): self.peer_finder.run_manage_loop() self.hash_announcer.run_manage_loop() return True @@ -283,6 +282,7 @@ class Session(object): dl = defer.DeferredList(ds) dl.addCallback(join_resolved_addresses) + dl.addCallback(self.dht_node.joinNetwork) dl.addCallback(start_dht) return dl From 4e4eb5e24c160d2f3b3c9aac67c85640a3670821 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Mon, 23 Oct 2017 01:17:25 -0400 Subject: [PATCH 2/4] fix external ip --- lbrynet/daemon/Daemon.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py index 9860306fa..aa4590c75 100644 --- a/lbrynet/daemon/Daemon.py +++ b/lbrynet/daemon/Daemon.py @@ -569,7 +569,8 @@ class Daemon(AuthJSONRPCServer): peer_port=self.peer_port, use_upnp=self.use_upnp, wallet=wallet, - is_generous=conf.settings['is_generous_host'] + is_generous=conf.settings['is_generous_host'], + external_ip=self.platform['ip'] ) self.startup_status = STARTUP_STAGES[2] From 529a11043bcaa0a119e8105324bc4c83135a24f8 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Mon, 23 Oct 2017 01:17:54 -0400 Subject: [PATCH 3/4] don't block file manager setup on all the streams being resumed --- lbrynet/file_manager/EncryptedFileManager.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lbrynet/file_manager/EncryptedFileManager.py b/lbrynet/file_manager/EncryptedFileManager.py index b0f9966a1..fd96aa8f0 100644 --- a/lbrynet/file_manager/EncryptedFileManager.py +++ b/lbrynet/file_manager/EncryptedFileManager.py @@ -53,9 +53,9 @@ class EncryptedFileManager(object): def setup(self): yield self._open_db() yield self._add_to_sd_identifier() - yield self._start_lbry_files() - if self.auto_re_reflect is True: - safe_start_looping_call(self.lbry_file_reflector, self.auto_re_reflect_interval) + # don't block on starting the lbry files + self._start_lbry_files() + log.info("Started file manager") def get_lbry_file_status(self, lbry_file): return self._get_lbry_file_status(lbry_file.rowid) @@ -119,6 +119,9 @@ class EncryptedFileManager(object): self._set_options_and_restore(rowid, stream_hash, options) for rowid, stream_hash, options in files_and_options ]) + + if self.auto_re_reflect is True: + safe_start_looping_call(self.lbry_file_reflector, self.auto_re_reflect_interval) log.info("Started %i lbry files", len(self.lbry_files)) @defer.inlineCallbacks From 4b0082d5bc8cb903498a2360500b2f3bee45c4aa Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Mon, 23 Oct 2017 01:20:02 -0400 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60b016130..ebffb776f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,9 @@ at anytime. * ### Fixed - * - * + * Fixed slow startup for nodes with many lbry files + * Fixed setting the external ip on startup + * Fixed session startup not blocking on joining the dht ### Deprecated *