From 69d6ffd990b7426ed1dcca66390f7581bf6d8dbf Mon Sep 17 00:00:00 2001 From: cheatfate Date: Tue, 19 Jan 2021 14:13:36 +0200 Subject: [PATCH] Remove watchTask(). --- beacon_chain/sync_manager.nim | 54 ----------------------------------- 1 file changed, 54 deletions(-) diff --git a/beacon_chain/sync_manager.nim b/beacon_chain/sync_manager.nim index 2e630d9a6..e207ed80d 100644 --- a/beacon_chain/sync_manager.nim +++ b/beacon_chain/sync_manager.nim @@ -1044,59 +1044,6 @@ proc syncLoop[A, B](man: SyncManager[A, B]) {.async.} = debug "Synchronization loop started", topics = "syncman" - proc watchTask() {.async.} = - const - MaxPauseTime = int(SECONDS_PER_SLOT) * int(SLOTS_PER_EPOCH) # 06:24 - MinPauseTime = int(SECONDS_PER_SLOT) * 5 # 01:00 - - pauseTime = MinPauseTime - - while true: - let op1 = man.queue.opcounter - await sleepAsync(chronos.seconds(pauseTime)) - let op2 = man.queue.opcounter - let (_, _, _, pending) = man.getWorkersStats() - if pending == 0: - pauseTime = MinPauseTime - else: - if (op2 - op1 == 0'u64) and (pending > 1): - # Syncing is NOT progressing, we double `pauseTime` value, but value - # could not be bigger then `MaxPauseTime`. - pauseTime = - block: - let newPauseTime = pauseTime * 2 - if newPauseTime > MaxPauseTime: - MaxPauseTime - else: - newPauseTime - info "Syncing process is not progressing, reset the queue", - start_op = op1, end_op = op2, - pending_workers_count = pending, - reset_to_slot = man.queue.outSlot, - pause_time = $(chronos.seconds(pauseTime)), - local_head_slot = man.getLocalHeadSlot(), topics = "syncman" - await man.queue.resetWait(none[Slot]()) - else: - # Syncing progressing, so reduce `pauseTime` value in half, but value - # could not be less then `MinPauseTime`. - pauseTime = - block: - let newPauseTime = (pauseTime * 3) div 4 - if newPauseTime < MinPauseTime: - MinPauseTime - else: - newPauseTime - - debug "Synchronization watch loop tick", - wall_head_slot = man.getLocalWallSlot(), - local_head_slot = man.getLocalHeadSlot(), - queue_start_slot = man.queue.startSlot, - queue_last_slot = man.queue.lastSlot, - pause_time = $(chronos.seconds(pauseTime)), - avg_sync_speed = man.avgSyncSpeed, - ins_sync_speed = man.insSyncSpeed, - pending_workers_count = pending, topics = "syncman" - proc averageSpeedTask() {.async.} = while true: let wallSlot = man.getLocalWallSlot() @@ -1117,7 +1064,6 @@ proc syncLoop[A, B](man: SyncManager[A, B]) {.async.} = 1_000_000_000.0 man.timeLeft = chronos.nanoseconds(int64(nsec)) - asyncSpawn watchTask() asyncSpawn averageSpeedTask() while true: