From dbb8007ea5ab97b7247f5201ee56f5fab1a16eae Mon Sep 17 00:00:00 2001 From: backguynn Date: Tue, 12 Dec 2023 11:17:16 +0900 Subject: [PATCH 1/2] check response http status code --- pkg/agent/manager/loadbalancer/loadbalancer.go | 5 +++-- pkg/api/request.go | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkg/agent/manager/loadbalancer/loadbalancer.go b/pkg/agent/manager/loadbalancer/loadbalancer.go index 43f7449..5a05399 100644 --- a/pkg/agent/manager/loadbalancer/loadbalancer.go +++ b/pkg/agent/manager/loadbalancer/loadbalancer.go @@ -760,16 +760,17 @@ func (m *Manager) deleteLoadBalancer(ns, name string) error { }(loxiClient, ch) } + var err error isError := true for _, errCh := range errChList { - err := <-errCh + err = <-errCh if err == nil { isError = false break } } if isError { - return fmt.Errorf("failed to delete loxiLB LoadBalancer") + return fmt.Errorf("failed to delete loxiLB LoadBalancer. err: %v", err) } if lb.inRange { ipPool.ReturnIPAddr(lb.LbModel.Service.ExternalIP, lb.IdentIPAM) diff --git a/pkg/api/request.go b/pkg/api/request.go index 091ce7f..0e48c7a 100644 --- a/pkg/api/request.go +++ b/pkg/api/request.go @@ -119,22 +119,26 @@ func (l *LoxiRequest) Do(ctx context.Context) *LoxiResponse { resp, err := l.client.Client.Do(req) if err != nil { - return &LoxiResponse{err: err} + statusCode := 0 + if resp != nil { + statusCode = resp.StatusCode + } + return &LoxiResponse{statusCode: statusCode, err: err} } defer resp.Body.Close() respByte, err := io.ReadAll(resp.Body) if err != nil { - return &LoxiResponse{err: err} + return &LoxiResponse{statusCode: resp.StatusCode, err: err} } if resp.StatusCode == http.StatusOK { if err := json.Unmarshal(respByte, &result); err != nil { - return &LoxiResponse{err: err} + return &LoxiResponse{statusCode: resp.StatusCode, err: err} } if result.Result != "Success" { - return &LoxiResponse{err: errors.New(result.Result)} + return &LoxiResponse{statusCode: resp.StatusCode, err: errors.New(result.Result)} } } From 506e84ace92225cb3e01c5f601fc3a1982aa3c6c Mon Sep 17 00:00:00 2001 From: backguynn Date: Fri, 22 Dec 2023 12:35:45 +0900 Subject: [PATCH 2/2] add log msg for debug --- pkg/agent/manager/loadbalancer/loadbalancer.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/agent/manager/loadbalancer/loadbalancer.go b/pkg/agent/manager/loadbalancer/loadbalancer.go index 42897ec..985cf3a 100644 --- a/pkg/agent/manager/loadbalancer/loadbalancer.go +++ b/pkg/agent/manager/loadbalancer/loadbalancer.go @@ -695,16 +695,17 @@ func (m *Manager) addLoadBalancer(svc *corev1.Service) error { } isError := true + var errCheck error for _, errCh := range errChList { - err := <-errCh - if err == nil { + errCheck = <-errCh + if errCheck == nil { isError = false } } if isError { retIPAMOnErr = isError - klog.Errorf("failed to add load-balancer") - return fmt.Errorf("failed to add loxiLB loadBalancer") + klog.Errorf("failed to add load-balancer. err: %v", errCheck) + return fmt.Errorf("failed to add loxiLB loadBalancer. err: %v", errCheck) } m.lbCache[cacheKey].LbModelList = append(m.lbCache[cacheKey].LbModelList, lbModelList...) if ingSvcPair.InRange || ingSvcPair.StaticIP {