RanchiMall/pyflo
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

connector

Browse Source
This commit is contained in:
4tochka 2019-06-03 17:34:52 +04:00
parent 14d8645132
commit 9e91e4decd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pybtc/connector/block_loader.py
View File

@ -64,9 +64,9 @@ class BlockLoader:
self.rpc_batch_limit = 10 self.rpc_batch_limit = 10
self.worker_tasks = [self.loop.create_task(self.start_worker(i)) for i in range(self.worker_limit)] self.worker_tasks = [self.loop.create_task(self.start_worker(i)) for i in range(self.worker_limit)]
target_height = self.parent.node_last_block - self.parent.deep_sync_limit target_height = self.parent.node_last_block - self.parent.deep_sync_limit
height = self.parent.last_block_height + 1 self.height = self.parent.last_block_height + 1
while height < target_height: while self.height < target_height:
new_requests = 0 new_requests = 0
if self.parent.block_preload._store_size < self.parent.block_preload_cache_limit: if self.parent.block_preload._store_size < self.parent.block_preload_cache_limit:
try: try:
@ -83,12 +83,12 @@ class BlockLoader:
for i in self.worker_busy: for i in self.worker_busy:
if not self.worker_busy[i]: if not self.worker_busy[i]:
self.worker_busy[i] = True self.worker_busy[i] = True
if height <= self.parent.last_block_height: if self.height <= self.parent.last_block_height:
height = self.parent.last_block_height + 1 self.height = self.parent.last_block_height + 1
await self.pipe_sent_msg(self.worker[i].writer, b'rpc_batch_limit', await self.pipe_sent_msg(self.worker[i].writer, b'rpc_batch_limit',
int_to_bytes(self.rpc_batch_limit)) int_to_bytes(self.rpc_batch_limit))
await self.pipe_sent_msg(self.worker[i].writer, b'get', int_to_bytes(height)) await self.pipe_sent_msg(self.worker[i].writer, b'get', int_to_bytes(height))
height += self.rpc_batch_limit self.height += self.rpc_batch_limit
new_requests += 1 new_requests += 1
if not new_requests: if not new_requests:
await asyncio.sleep(1) await asyncio.sleep(1)
@ -200,7 +200,9 @@ class BlockLoader:
else: else:
self.parent.utxo.checkpoints.append(i) self.parent.utxo.checkpoints.append(i)
if msg_type == b'failed':
self.height = bytes_to_int(msg)
continue
# def disconnect(self,ip): # def disconnect(self,ip):
# """ Disconnect peer """ # """ Disconnect peer """
# p = self.out_connection_pool[self.outgoing_connection[ip]["pool"]] # p = self.out_connection_pool[self.outgoing_connection[ip]["pool"]]
@ -326,6 +328,7 @@ class Worker:
self.log.critical("load blocks error") self.log.critical("load blocks error")
self.log.critical(str(traceback.format_exc())) self.log.critical(str(traceback.format_exc()))
await self.pipe_sent_msg(b'result', pickle.dumps([])) await self.pipe_sent_msg(b'result', pickle.dumps([]))
await self.pipe_sent_msg(b'failed', pickle.dumps(height))
async def message_loop(self): async def message_loop(self):
@ -345,6 +348,7 @@ class Worker:
if msg_type == b'rpc_batch_limit': if msg_type == b'rpc_batch_limit':
self.rpc_batch_limit = bytes_to_int(msg) self.rpc_batch_limit = bytes_to_int(msg)
continue continue
except: except:
pass pass