minor revise errors

Author: CMGS

client/clientpool.go

@@ -2,7 +2,6 @@ package client
 
 import (
 	"context"
-	"errors"
 	"sync"
 	"time"
 
@@ -34,7 +33,7 @@ type Pool struct {
 // NewCoreRPCClientPool .
 func NewCoreRPCClientPool(ctx context.Context, config *PoolConfig) (*Pool, error) {
 	if len(config.EruAddrs) == 0 {
-		return nil, errors.New("core addr not set")
+		return nil, types.ErrBadIPAddress
 	}
 	c := &Pool{rpcClients: []*clientWithStatus{}}
 	for _, addr := range config.EruAddrs {
@@ -63,7 +62,7 @@ func NewCoreRPCClientPool(ctx context.Context, config *PoolConfig) (*Pool, error
 
 	if allFailed {
 		log.Error("[NewCoreRPCClientPool] all connections failed")
-		return nil, errors.New("all connections failed")
+		return nil, types.ErrAllConnectionsFailed
 	}
 
 	go func() {

client/utils/servicepusher.go

@@ -2,7 +2,6 @@ package utils
 
 import (
 	"context"
-	"errors"
 	"os"
 	"strings"
 	"sync"
@@ -11,6 +10,7 @@ import (
 	"github.com/cornelk/hashmap"
 	"github.com/go-ping/ping"
 	"github.com/projecteru2/core/log"
+	"github.com/projecteru2/core/types"
 	"golang.org/x/exp/slices"
 )
 
@@ -132,7 +132,7 @@ func (p *EndpointPusher) checkReachability(host string) (err error) {
 		return
 	}
 	if pinger.Statistics().PacketsRecv != 1 {
-		return errors.New("icmp packet lost")
+		return types.ErrICMPLost
 	}
 	return
 }

cluster/calcium/build.go

@@ -45,7 +45,7 @@ func (c *Calcium) BuildImage(ctx context.Context, opts *types.BuildOptions) (ch
 	case types.BuildFromExist:
 		refs, node, resp, err = c.buildFromExist(ctx, opts)
 	default:
-		return nil, logger.ErrWithTracing(ctx, errors.WithStack(errors.New("unknown build type")))
+		return nil, logger.ErrWithTracing(ctx, errors.WithStack(types.ErrUnknownBuildType))
 	}
 	if err != nil {
 		return nil, logger.ErrWithTracing(ctx, err)

cluster/calcium/workload.go

@@ -30,15 +30,6 @@ func (c *Calcium) ListNodeWorkloads(ctx context.Context, nodename string, labels
 	return workloads, logger.ErrWithTracing(ctx, errors.WithStack(err))
 }
 
-func (c *Calcium) getWorkloadNode(ctx context.Context, id string) (*types.Node, error) {
-	w, err := c.GetWorkload(ctx, id)
-	if err != nil {
-		return nil, err
-	}
-	node, err := c.GetNode(ctx, w.Nodename, nil)
-	return node, err
-}
-
 // GetWorkload get a workload
 func (c *Calcium) GetWorkload(ctx context.Context, id string) (workload *types.Workload, err error) {
 	logger := log.WithField("Calcium", "GetWorkload").WithField("id", id)
@@ -54,3 +45,12 @@ func (c *Calcium) GetWorkloads(ctx context.Context, ids []string) (workloads []*
 	workloads, err = c.store.GetWorkloads(ctx, ids)
 	return workloads, log.WithField("Calcium", "GetWorkloads").WithField("ids", ids).ErrWithTracing(ctx, errors.WithStack(err))
 }
+
+func (c *Calcium) getWorkloadNode(ctx context.Context, id string) (*types.Node, error) {
+	w, err := c.GetWorkload(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+	node, err := c.GetNode(ctx, w.Nodename, nil)
+	return node, err
+}

engine/virt/helper.go

@@ -9,6 +9,8 @@ import (
 	coretypes "github.com/projecteru2/core/types"
 )
 
+const sep = "@"
+
 func (v *Virt) parseVolumes(volumes []string) ([]string, error) {
 	vols := []string{}
 
@@ -44,8 +46,6 @@ func (v *Virt) parseVolumes(volumes []string) ([]string, error) {
 	return vols, nil
 }
 
-const sep = "@"
-
 func splitUserImage(combined string) (user, imageName string, err error) {
 	inputErr := fmt.Errorf("input: \"%s\" not valid", combined)
 	if len(combined) < 1 {

resources/volume/models/info.go

@@ -165,7 +165,7 @@ func (v *Volume) SetNodeResourceCapacity(ctx context.Context, node string, nodeR
 	if nodeResourceOpts != nil {
 		if len(nodeResourceOpts.RMDisks) > 0 {
 			if delta {
-				return nil, nil, fmt.Errorf("rm disk is not supported when delta is true")
+				return nil, nil, types.ErrRMDiskNotSupport
 			}
 			rmDisksMap := map[string]struct{}{}
 			for _, rmDisk := range nodeResourceOpts.RMDisks {

resources/volume/types/errors.go

@@ -9,5 +9,6 @@ var (
 	ErrInvalidStorage       = errors.New("invalid storage")
 	ErrInvalidDisk          = errors.New("invalid disk")
 
-	ErrNodeExists = errors.New("node already exists")
+	ErrNodeExists       = errors.New("node already exists")
+	ErrRMDiskNotSupport = errors.New("rm disk is not supported when delta is true")
 )

types/errors.go

@@ -63,6 +63,7 @@ var (
 	ErrNoWorkloadIDs               = errors.New("No workload ids given")
 	ErrRunAndWaitCountOneWithStdin = errors.New("Count must be 1 if OpenStdin is true")
 	ErrUnknownControlType          = errors.New("Unknown control type")
+	ErrUnknownBuildType            = errors.New("Unknown build type")
 	ErrNoRemoteDigest              = errors.New("got no digest")
 
 	ErrNoETCD             = errors.New("ETCD must be set")
@@ -118,6 +119,11 @@ var (
 
 	ErrInvalidEngineArgs     = errors.New("invalid engine args")
 	ErrGetMostIdleNodeFailed = errors.New("get most idle node failed")
+
+	ErrICMPLost             = errors.New("icmp packets lost")
+	ErrAllConnectionsFailed = errors.New("all connections failed")
+
+	ErrUnexpectedRedirect = errors.New("unexpected redirect")
 )
 
 type detailedErr struct {

utils/http.go

@@ -15,6 +15,7 @@ import (
 	"github.com/docker/go-connections/tlsconfig"
 
 	"github.com/projecteru2/core/log"
+	"github.com/projecteru2/core/types"
 )
 
 var defaultHTTPClient = &http.Client{
@@ -136,5 +137,5 @@ func checkRedirect(req *http.Request, via []*http.Request) error {
 	if via[0].Method == http.MethodGet {
 		return http.ErrUseLastResponse
 	}
-	return fmt.Errorf("unexpected redirect")
+	return types.ErrUnexpectedRedirect
 }