From 14d1438ab6bf2263d3e953cac116d3fc574e97f8 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sat, 23 Apr 2022 13:26:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_ip_address_dao_test.go | 2 +- internal/rpc/services/service_node_cluster.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/db/models/node_ip_address_dao_test.go b/internal/db/models/node_ip_address_dao_test.go index 727819d6..15ab9279 100644 --- a/internal/db/models/node_ip_address_dao_test.go +++ b/internal/db/models/node_ip_address_dao_test.go @@ -56,7 +56,7 @@ func TestNodeIPAddressDAO_UpdateAddressHealthCount(t *testing.T) { dbs.NotifyReady() var tx *dbs.Tx - isChanged, err := SharedNodeIPAddressDAO.UpdateAddressHealthCount(tx, 1, true, 3, 3) + isChanged, err := SharedNodeIPAddressDAO.UpdateAddressHealthCount(tx, 1, true, 3, 3, false) if err != nil { t.Fatal(err) } diff --git a/internal/rpc/services/service_node_cluster.go b/internal/rpc/services/service_node_cluster.go index 074c6804..58617839 100644 --- a/internal/rpc/services/service_node_cluster.go +++ b/internal/rpc/services/service_node_cluster.go @@ -313,12 +313,15 @@ func (this *NodeClusterService) FindNodeClusterHealthCheckConfig(ctx context.Con return nil, err } - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedNodeClusterDAO.FindClusterHealthCheckConfig(tx, req.NodeClusterId) if err != nil { return nil, err } + if config == nil { + return &pb.FindNodeClusterHealthCheckConfigResponse{HealthCheckJSON: nil}, nil + } configJSON, err := json.Marshal(config) if err != nil { return nil, err