mirror of
https://github.com/LBRYFoundation/LBRY-Vault.git
synced 2025-08-30 17:01:34 +00:00
fix a race condition in synchronizer
wallet.synchronizer gets assigned a newly constructed Synchronizer instance. Synchronizer in tx_response refers to the value of wallet.synchronizer. If the wallet has a missing txn, there could be a race condition that synchronizer asks for a txn and we get the callback from the network WHILE the constructor is still running, in which case wallet.synchronizer would still be None and we would consider the callback "orphan", and the wallet would get "stuck" synchronizing.
This commit is contained in:
parent
2f408e5d07
commit
de4fe9db69
1 changed files with 6 additions and 3 deletions
|
@ -50,6 +50,8 @@ class Synchronizer(ThreadJob):
|
|||
self.requested_histories = {}
|
||||
self.requested_addrs = set()
|
||||
self.lock = Lock()
|
||||
|
||||
self.initialized = False
|
||||
self.initialize()
|
||||
|
||||
def parse_response(self, response):
|
||||
|
@ -84,7 +86,7 @@ class Synchronizer(ThreadJob):
|
|||
return bh2u(hashlib.sha256(status.encode('ascii')).digest())
|
||||
|
||||
def on_address_status(self, response):
|
||||
if self.wallet.synchronizer is None:
|
||||
if self.wallet.synchronizer is None and self.initialized:
|
||||
return # we have been killed, this was just an orphan callback
|
||||
params, result = self.parse_response(response)
|
||||
if not params:
|
||||
|
@ -100,7 +102,7 @@ class Synchronizer(ThreadJob):
|
|||
self.requested_addrs.remove(addr)
|
||||
|
||||
def on_address_history(self, response):
|
||||
if self.wallet.synchronizer is None:
|
||||
if self.wallet.synchronizer is None and self.initialized:
|
||||
return # we have been killed, this was just an orphan callback
|
||||
params, result = self.parse_response(response)
|
||||
if not params:
|
||||
|
@ -131,7 +133,7 @@ class Synchronizer(ThreadJob):
|
|||
self.requested_histories.pop(addr)
|
||||
|
||||
def tx_response(self, response):
|
||||
if self.wallet.synchronizer is None:
|
||||
if self.wallet.synchronizer is None and self.initialized:
|
||||
return # we have been killed, this was just an orphan callback
|
||||
params, result = self.parse_response(response)
|
||||
if not params:
|
||||
|
@ -183,6 +185,7 @@ class Synchronizer(ThreadJob):
|
|||
if self.requested_tx:
|
||||
self.print_error("missing tx", self.requested_tx)
|
||||
self.subscribe_to_addresses(set(self.wallet.get_addresses()))
|
||||
self.initialized = True
|
||||
|
||||
def run(self):
|
||||
'''Called from the network proxy thread main loop.'''
|
||||
|
|
Loading…
Add table
Reference in a new issue