Merge pull request #71756 from cockroachdb/blathers/backport-release-…

…21.2-71749 release-21.2: server: avoid panic in NodesUI
cockroachdb · Oct 20, 2021 · c5a6b26 · c5a6b26
2 parents 49ddb0e + d612c5e
commit c5a6b26
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/server/status.go b/pkg/server/status.go
@@ -1388,6 +1388,9 @@ func (s *statusServer) NodesUI(
 	}
 
 	internalResp, _, err := s.nodesHelper(ctx, 0 /* limit */, 0 /* offset */)
+	if err != nil {
+		return nil, err
+	}
 	resp := &serverpb.NodesResponseExternal{
 		Nodes:            make([]serverpb.NodeResponse, len(internalResp.Nodes)),
 		LivenessByNodeID: internalResp.LivenessByNodeID,