Merge branch 'main' into support-custom-network

ava-labs · Oct 1, 2024 · 5168904 · 5168904
2 parents ca86bb4 + bfc2f5f
commit 5168904
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/server/server.go b/server/server.go
@@ -440,8 +440,14 @@ func (s *server) updateClusterInfo() {
 func (s *server) WaitForHealthy(ctx context.Context, _ *rpcpb.WaitForHealthyRequest) (*rpcpb.WaitForHealthyResponse, error) {
 	s.log.Debug("WaitForHealthy")
 
+	s.mu.RLock()
+	if s.network == nil {
+		s.mu.RUnlock()
+		return nil, ErrNotBootstrapped
+	}
 	ctx, cancel := context.WithTimeout(ctx, s.network.GetWaitForHealthyTimeout())
 	defer cancel()
+	s.mu.RUnlock()
 
 	for {
 		s.mu.RLock()