Skip to content

Commit

Permalink
Merge pull request #87 from backguynn/main
Browse files Browse the repository at this point in the history
check response http status code
  • Loading branch information
backguynn committed Jan 8, 2024
2 parents e1cb1b8 + 8e17844 commit dd03ad9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
14 changes: 8 additions & 6 deletions pkg/agent/manager/loadbalancer/loadbalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -760,16 +761,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)
Expand Down
12 changes: 8 additions & 4 deletions pkg/api/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
}
}

Expand Down

0 comments on commit dd03ad9

Please sign in to comment.