From ec191ccd59fb03257e82ee0151343b71f6b2e345 Mon Sep 17 00:00:00 2001 From: Bolek Kulbabinski <1416262+bolekk@users.noreply.github.com> Date: Thu, 19 Nov 2026 09:54:30 -0800 Subject: [PATCH] deployment: keep NOPs views when one node has malformed metadata A single node with an unparsable JD chain ID made NodeInfo return a non-ErrMissingNodeMetadata error, so GenerateNopsView and GenerateNOPsViewV2 discarded every node. Continue with the partial node list instead and log a warning. Co-Authored-By: Claude Opus 5.5 --- deployment/common/view/nops.go | 31 +++++++++++++++-------- deployment/common/view/nops_test.go | 38 +++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/deployment/common/view/nops.go b/deployment/common/view/nops.go index edc5c018b7b..eb35046dfa8 100644 --- a/deployment/common/view/nops.go +++ b/deployment/common/view/nops.go @@ -72,14 +72,27 @@ type OCRKeyView struct { KeyBundleID string `json:"keyBundleID"` } +// nodeInfoBestEffort returns node info for all nodes found in JD. A node with malformed +// metadata (e.g. an unparsable chain ID) is kept with partial info instead of failing the view. +func nodeInfoBestEffort(lggr logger.Logger, nodeIDs []string, oc cldf_offchain.Client) (deployment.Nodes, error) { + nodes, err := deployment.NodeInfo(nodeIDs, oc) + if err == nil { + return nodes, nil + } + if len(nodes) == 0 && !errors.Is(err, deployment.ErrMissingNodeMetadata) { + return nil, fmt.Errorf("failed to get node info: %w", err) + } + lggr.Warnf("Incomplete node metadata, continuing with partial node info: %v", err) + + return nodes, nil +} + // GenerateNopsView generates a view of nodes with their details func GenerateNopsView(lggr logger.Logger, nodeIDs []string, oc cldf_offchain.Client) (map[string]NopView, error) { nv := make(map[string]NopView) - nodes, err := deployment.NodeInfo(nodeIDs, oc) - if errors.Is(err, deployment.ErrMissingNodeMetadata) { - lggr.Warnf("Missing node metadata: %s", err.Error()) - } else if err != nil { - return nv, fmt.Errorf("failed to get node info: %w", err) + nodes, err := nodeInfoBestEffort(lggr, nodeIDs, oc) + if err != nil { + return nv, err } nodesResp, err := oc.ListNodes(context.Background(), &nodev1.ListNodesRequest{ Filter: &nodev1.ListNodesRequest_Filter{ @@ -159,11 +172,9 @@ type NopNameRemapper func(nodeName string) string // GenerateNOPsViewV2 generates a view of nodes with their details in a new format. // `deploymentKey` refers to the deployment identifier (e.g., "keystone", "cre", "ccip", "data-feeds"), which usually refers to the CLD domain. func GenerateNOPsViewV2(ctx context.Context, lggr logger.Logger, nodeIDs []string, oc cldf_offchain.Client, deploymentKey string, nopNameRemapperFunc NopNameRemapper) (map[string]NopViewV2, error) { - nodes, err := deployment.NodeInfo(nodeIDs, oc) - if errors.Is(err, deployment.ErrMissingNodeMetadata) { - lggr.Warnf("Missing node metadata: %s", err.Error()) - } else if err != nil { - return nil, fmt.Errorf("failed to get node info: %w", err) + nodes, err := nodeInfoBestEffort(lggr, nodeIDs, oc) + if err != nil { + return nil, err } nodesResp, err := oc.ListNodes(ctx, &nodev1.ListNodesRequest{ Filter: &nodev1.ListNodesRequest_Filter{ diff --git a/deployment/common/view/nops_test.go b/deployment/common/view/nops_test.go index 3f3f0a67c62..82b8bcd5778 100644 --- a/deployment/common/view/nops_test.go +++ b/deployment/common/view/nops_test.go @@ -106,6 +106,23 @@ func TestGenerateNopsView(t *testing.T) { assert.Empty(t, v) }) + t.Run("node with malformed chain ID is kept and does not drop other nodes", func(t *testing.T) { + malformedJDService := &customJDService{ + NodeServiceClient: jdService, + chainConfigs: map[string][]*nodev1.ChainConfig{ + "node_2": {malformedEVMChainConfig(p2pIDs[1])}, + }, + } + + v2, err := GenerateNOPsViewV2(t.Context(), lggr, nodeIDs, malformedJDService, "test", nil) + require.NoError(t, err) + require.Len(t, v2["testnop"].Nodes, 3) + + v1, err := GenerateNopsView(lggr, nodeIDs, malformedJDService) + require.NoError(t, err) + require.Len(t, v1, 3) + }) + t.Run("error from ListNodes", func(t *testing.T) { // Create a custom JD service that returns an error for ListNodes errorJDService := &customJDService{ @@ -136,6 +153,7 @@ func assertLabelExists(t *testing.T, labels []LabelView, key, expectedValue stri type customJDService struct { nodev1.NodeServiceClient listNodesError error + chainConfigs map[string][]*nodev1.ChainConfig *test.UnimplementedCSAServiceClient *test.UnimplementedJobServiceClient } @@ -146,3 +164,23 @@ func (s *customJDService) ListNodes(ctx context.Context, req *nodev1.ListNodesRe } return s.NodeServiceClient.ListNodes(ctx, req, opts...) } + +func (s *customJDService) ListNodeChainConfigs(ctx context.Context, req *nodev1.ListNodeChainConfigsRequest, opts ...grpc.CallOption) (*nodev1.ListNodeChainConfigsResponse, error) { + for _, id := range req.GetFilter().GetNodeIds() { + if cfgs, ok := s.chainConfigs[id]; ok { + return &nodev1.ListNodeChainConfigsResponse{ChainConfigs: cfgs}, nil + } + } + return s.NodeServiceClient.ListNodeChainConfigs(ctx, req, opts...) +} + +// malformedEVMChainConfig mimics a node exporting its chain ID combined with the chain name. +func malformedEVMChainConfig(peerID string) *nodev1.ChainConfig { + return &nodev1.ChainConfig{ + Chain: &nodev1.Chain{Id: "11155111 ethereum-testnet-sepolia", Type: nodev1.ChainType_CHAIN_TYPE_EVM}, + Ocr2Config: &nodev1.OCR2Config{ + P2PKeyBundle: &nodev1.OCR2Config_P2PKeyBundle{PeerId: peerID}, + OcrKeyBundle: &nodev1.OCR2Config_OCRKeyBundle{}, + }, + } +}