fixes

Author: julienrbrt

pkg/sync/sync_service.go

@@ -364,7 +364,7 @@ func (syncService *SyncService[H]) initFromP2PWithRetry(ctx context.Context, pee
 	backoff := 1 * time.Second
 	maxBackoff := 10 * time.Second
 
-	timeoutTimer := time.NewTimer(time.Minute * 5)
+	timeoutTimer := time.NewTimer(time.Minute * 2)
 	defer timeoutTimer.Stop()
 
 	for {
@@ -400,6 +400,13 @@ func (syncService *SyncService[H]) retryInitInBackground() {
 	maxBackoff := 5 * time.Minute
 
 	for {
+		select {
+		case <-syncService.bgCtx.Done():
+			syncService.logger.Info().Msg("background retry cancelled")
+			return
+		case <-time.After(backoff):
+		}
+
 		ok, err := syncService.tryInit(syncService.bgCtx)
 		if ok {
 			syncService.logger.Info().Msg("successfully initialized store from P2P in background")
@@ -408,13 +415,6 @@ func (syncService *SyncService[H]) retryInitInBackground() {
 
 		syncService.logger.Info().Err(err).Dur("retry_in", backoff).Msg("background retry: headers not yet available from peers")
 
-		select {
-		case <-syncService.bgCtx.Done():
-			syncService.logger.Info().Msg("background retry cancelled")
-			return
-		case <-time.After(backoff):
-		}
-
 		backoff *= 2
 		if backoff > maxBackoff {
 			backoff = maxBackoff