From fbbdd94fea18a913a6e7a397c68e61b1c4b02bed Mon Sep 17 00:00:00 2001 From: Shay Zluf Date: Mon, 7 Dec 2020 12:16:23 +0200 Subject: [PATCH] Resolve panic on shutdown with offline eth1 node (#8033) * Resolve panic on shutdown with offline eth1 node * Move fix tne right place nishant feedback * fix log message Co-authored-by: Nishant Das --- beacon-chain/powchain/service.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beacon-chain/powchain/service.go b/beacon-chain/powchain/service.go index 79c4674195..6fa0ce3802 100644 --- a/beacon-chain/powchain/service.go +++ b/beacon-chain/powchain/service.go @@ -255,6 +255,10 @@ func (s *Service) Start() { } go func() { s.waitForConnection() + if s.ctx.Err() != nil { + log.Info("Context closed, exiting pow goroutine") + return + } s.run(s.ctx.Done()) }() } @@ -674,7 +678,6 @@ func (s *Service) initPOWService() { return default: ctx := s.ctx - header, err := s.eth1DataFetcher.HeaderByNumber(ctx, nil) if err != nil { log.Errorf("Unable to retrieve latest ETH1.0 chain header: %v", err)