run read_raw_block in executor

This commit is contained in:
Jack Robison 2020-06-09 16:04:14 -04:00
parent cf6a47ecb7
commit 98565eb67c
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 8 additions and 4 deletions

View file

@ -251,7 +251,7 @@ class BlockProcessor:
async def get_raw_blocks(last_height, hex_hashes): async def get_raw_blocks(last_height, hex_hashes):
heights = range(last_height, last_height - len(hex_hashes), -1) heights = range(last_height, last_height - len(hex_hashes), -1)
try: try:
blocks = [self.db.read_raw_block(height) for height in heights] blocks = [await self.db.read_raw_block(height) for height in heights]
self.logger.info(f'read {len(blocks)} blocks from disk') self.logger.info(f'read {len(blocks)} blocks from disk')
return blocks return blocks
except FileNotFoundError: except FileNotFoundError:

View file

@ -479,11 +479,15 @@ class LevelDB:
def raw_block_path(self, height): def raw_block_path(self, height):
return os.path.join(self.env.db_dir, f'{self.raw_block_prefix()}{height:d}') return os.path.join(self.env.db_dir, f'{self.raw_block_prefix()}{height:d}')
def read_raw_block(self, height): async def read_raw_block(self, height):
"""Returns a raw block read from disk. Raises FileNotFoundError """Returns a raw block read from disk. Raises FileNotFoundError
if the block isn't on-disk.""" if the block isn't on-disk."""
with util.open_file(self.raw_block_path(height)) as f:
return f.read(-1) def read():
with util.open_file(self.raw_block_path(height)) as f:
return f.read(-1)
return await asyncio.get_event_loop().run_in_executor(self.executor, read)
def write_raw_block(self, block, height): def write_raw_block(self, block, height):
"""Write a raw block to disk.""" """Write a raw block to disk."""