LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge branch 'master' into integration_test_setup_cleanup_timeouts

Browse source
This commit is contained in:
FemtosecondLaser 2021-11-29 21:50:05 +00:00 committed by GitHub
commit e00c3db71a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lbry/wallet/server/block_processor.py
View file

@ -1524,10 +1524,11 @@ class BlockProcessor:
self.db.tx_counts.append(self.tx_count) self.db.tx_counts.append(self.tx_count)
cached_max_reorg_depth = self.daemon.cached_height() - self.env.reorg_limit cached_max_reorg_depth = self.daemon.cached_height() - self.env.reorg_limit
if height >= cached_max_reorg_depth:
self.db.prefix_db.touched_or_deleted.stage_put( # if height >= cached_max_reorg_depth:
key_args=(height,), value_args=(self.touched_claim_hashes, self.removed_claim_hashes) self.db.prefix_db.touched_or_deleted.stage_put(
) key_args=(height,), value_args=(self.touched_claim_hashes, self.removed_claim_hashes)
)
self.height = height self.height = height
self.db.headers.append(block.header) self.db.headers.append(block.header)
@ -1556,7 +1557,6 @@ class BlockProcessor:
now = time.time() now = time.time()
self.db.wall_time += now - self.db.last_flush self.db.wall_time += now - self.db.last_flush
self.db.last_flush = now self.db.last_flush = now
self.db.write_db_state() self.db.write_db_state()
def clear_after_advance_or_reorg(self): def clear_after_advance_or_reorg(self):

2
lbry/wallet/server/db/elasticsearch/sync.py
View file

@ -11,6 +11,7 @@ from lbry.wallet.server.db.elasticsearch.constants import ALL_FIELDS
async def get_recent_claims(env, index_name='claims', db=None): async def get_recent_claims(env, index_name='claims', db=None):
log = logging.getLogger()
need_open = db is None need_open = db is None
db = db or LevelDB(env) db = db or LevelDB(env)
try: try:
@ -20,6 +21,7 @@ async def get_recent_claims(env, index_name='claims', db=None):
return return
if need_open: if need_open:
await db.initialize_caches() await db.initialize_caches()
log.info(f"catching up ES ({db.es_sync_height}) to leveldb height: {db.db_height}")
cnt = 0 cnt = 0
touched_claims = set() touched_claims = set()
deleted_claims = set() deleted_claims = set()

2
scripts/dht_node.py
View file

@ -105,4 +105,4 @@ if __name__ == '__main__':
"Format: host:port Example: lbrynet1.lbry.com:4444") "Format: host:port Example: lbrynet1.lbry.com:4444")
parser.add_argument("--metrics_port", default=0, type=int, help="Port for Prometheus and raw CSV metrics. 0 to disable. Default: 0") parser.add_argument("--metrics_port", default=0, type=int, help="Port for Prometheus and raw CSV metrics. 0 to disable. Default: 0")
args = parser.parse_args() args = parser.parse_args()
asyncio.run(main(args.host, args.port, args.db_file, args.bootstrap_node, args.prometheus_port)) asyncio.run(main(args.host, args.port, args.db_file, args.bootstrap_node, args.metrics_port))