From 7998d04554608be65d4b4e3d0bc318148aa6009b Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 30 Sep 2021 19:52:53 +0200 Subject: [PATCH] node/pkg/processor: increase timeout for observed VAAs to 24 hours In cases where we observed a VAA, there is no possibility of gossip DoS. Increase the timeout to 24 hours to facilitate manual interventions (like submission of governance VAAs or node restarts/catchup). Keep the existing five minute timeout for observation-less VAAs. Change-Id: Ic626108190bd60cf812daadbe191b31cc48c7296 --- node/pkg/processor/cleanup.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/pkg/processor/cleanup.go b/node/pkg/processor/cleanup.go index d67c4f9f..5a514e53 100644 --- a/node/pkg/processor/cleanup.go +++ b/node/pkg/processor/cleanup.go @@ -82,7 +82,7 @@ func (p *Processor) handleCleanup(ctx context.Context) { p.logger.Info("expiring submitted VAA", zap.String("digest", hash), zap.Duration("delta", delta)) delete(p.state.vaaSignatures, hash) aggregationStateExpiration.Inc() - case !s.submitted && s.retryCount >= 10: + case !s.submitted && ((s.ourMsg != nil && s.retryCount >= 2880 /* 24 hours */) || (s.ourMsg == nil && s.retryCount >= 10 /* 5 minutes */)): // Clearly, this horse is dead and continued beatings won't bring it closer to quorum. p.logger.Info("expiring unsubmitted VAA after exhausting retries", zap.String("digest", hash), zap.Duration("delta", delta)) delete(p.state.vaaSignatures, hash) @@ -97,7 +97,7 @@ func (p *Processor) handleCleanup(ctx context.Context) { p.logger.Info("resubmitting VAA observation", zap.String("digest", hash), zap.Duration("delta", delta), - zap.Int("retry", 1)) + zap.Uint("retry", s.retryCount)) p.sendC <- s.ourMsg s.retryCount += 1 aggregationStateRetries.Inc()