Skip to content

Commit e12aea8

Browse files
CMGSCMGS
committed
rewrite almost all errors
1 parent 51ac74c commit e12aea8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+229
-252
lines changed

‎client/utils/servicepusher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (p *EndpointPusher) addCheck(ctx context.Context, endpoints []string) {
8282
func (p *EndpointPusher) pollReachability(ctx context.Context, endpoint string) {
8383
parts := strings.Split(endpoint, ":")
8484
if len(parts) != 2 {
85-
log.Errorf(ctx, types.ErrInvalidType, "[EruResolver] wrong format of endpoint: %s", endpoint)
85+
log.Errorf(ctx, types.ErrInvaildCoreEndpointType, "[EruResolver] wrong format of endpoint: %s", endpoint)
8686
return
8787
}
8888

‎cluster/calcium/capacity_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestCalculateCapacity(t *testing.T) {
5050

5151
// failed by call plugin
5252
rmgr := c.rmgr.(*resourcemocks.Manager)
53-
rmgr.On("GetNodesDeployCapacity", mock.Anything, mock.Anything, mock.Anything).Return(nil, 0, types.ErrNoETCD).Once()
53+
rmgr.On("GetNodesDeployCapacity", mock.Anything, mock.Anything, mock.Anything).Return(nil, 0, types.ErrMockError).Once()
5454
_, err := c.CalculateCapacity(ctx, opts)
5555
assert.Error(t, err)
5656

@@ -66,7 +66,7 @@ func TestCalculateCapacity(t *testing.T) {
6666
}
6767
rmgr.On("GetNodesDeployCapacity", mock.Anything, mock.Anything, mock.Anything).Return(
6868
nrim, 100, nil).Times(3)
69-
store.On("GetDeployStatus", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
69+
store.On("GetDeployStatus", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
7070
_, err = c.CalculateCapacity(ctx, opts)
7171
assert.Error(t, err)
7272

@@ -85,7 +85,7 @@ func TestCalculateCapacity(t *testing.T) {
8585
opts.DeployStrategy = strategy.Dummy
8686

8787
// failed by GetNodesDeployCapacity
88-
rmgr.On("GetNodesDeployCapacity", mock.Anything, mock.Anything, mock.Anything).Return(nil, 0, types.ErrNoETCD).Once()
88+
rmgr.On("GetNodesDeployCapacity", mock.Anything, mock.Anything, mock.Anything).Return(nil, 0, types.ErrMockError).Once()
8989
_, err = c.CalculateCapacity(ctx, opts)
9090
assert.Error(t, err)
9191

‎cluster/calcium/control_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestControlStart(t *testing.T) {
2525
lock.On("Unlock", mock.Anything).Return(nil)
2626
store.On("CreateLock", mock.Anything, mock.Anything).Return(lock, nil)
2727
// failed by GetWorkloads
28-
store.On("GetWorkloads", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
28+
store.On("GetWorkloads", mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
2929
ch, err := c.ControlWorkload(ctx, []string{"id1"}, "", true)
3030
assert.NoError(t, err)
3131
for r := range ch {

‎cluster/calcium/copy_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestCopy(t *testing.T) {
3737
lock.On("Unlock", mock.Anything).Return(nil)
3838
store.On("CreateLock", mock.Anything, mock.Anything).Return(lock, nil)
3939
// failed by GetWorkload
40-
store.On("GetWorkload", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
40+
store.On("GetWorkload", mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
4141
ch, err := c.Copy(ctx, opts)
4242
assert.NoError(t, err)
4343
for r := range ch {
@@ -48,7 +48,7 @@ func TestCopy(t *testing.T) {
4848
workload.Engine = engine
4949
store.On("GetWorkload", mock.Anything, mock.Anything).Return(workload, nil)
5050
// failed by VirtualizationCopyFrom
51-
engine.On("VirtualizationCopyFrom", mock.Anything, mock.Anything, mock.Anything).Return(nil, 0, 0, int64(0), types.ErrNoETCD).Twice()
51+
engine.On("VirtualizationCopyFrom", mock.Anything, mock.Anything, mock.Anything).Return(nil, 0, 0, int64(0), types.ErrMockError).Twice()
5252
ch, err = c.Copy(ctx, opts)
5353
assert.NoError(t, err)
5454
for r := range ch {

‎cluster/calcium/create.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"sync"
77
"time"
88

9+
"github.com/cockroachdb/errors"
910
"github.com/cornelk/hashmap"
1011

1112
"github.com/projecteru2/core/cluster"
@@ -30,7 +31,7 @@ func (c *Calcium) CreateWorkload(ctx context.Context, opts *types.DeployOptions)
3031
logger.Infof(ctx, "[CreateWorkload %s] Creating workload with options:\n%s", opts.ProcessIdent, litter.Options{Compact: true}.Sdump(opts))
3132
// Count 要大于0
3233
if opts.Count <= 0 {
33-
err := types.NewDetailedErr(types.ErrInvaildCount, opts.Count)
34+
err := errors.Wrapf(types.ErrInvaildDeployCount, "count: %d", opts.Count)
3435
logger.Error(ctx, err)
3536
return nil, err
3637
}
@@ -80,11 +81,10 @@ func (c *Calcium) doCreateWorkloads(ctx context.Context, opts *types.DeployOptio
8081
var processingCommits map[string]wal.Commit
8182
defer func() {
8283
for nodename := range processingCommits {
83-
if processingCommits[nodename] == nil {
84-
continue
85-
}
86-
if err := processingCommits[nodename](); err != nil {
87-
logger.Errorf(ctx, err, "commit wal failed: %s, %s", eventProcessingCreated, nodename)
84+
if commit, ok := processingCommits[nodename]; ok {
85+
if err := commit(); err != nil {
86+
logger.Errorf(ctx, err, "commit wal failed: %s, %s", eventProcessingCreated, nodename)
87+
}
8888
}
8989
}
9090
}()

‎cluster/calcium/create_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestCreateWorkloadTxn(t *testing.T) {
8989
node1, node2 := nodes[0], nodes[1]
9090

9191
// doAllocResource fails: GetNodesDeployCapacity
92-
rmgr.On("GetNodesDeployCapacity", mock.Anything, mock.Anything, mock.Anything).Return(nil, 0, types.ErrNoETCD).Once()
92+
rmgr.On("GetNodesDeployCapacity", mock.Anything, mock.Anything, mock.Anything).Return(nil, 0, types.ErrMockError).Once()
9393
ch, err := c.CreateWorkload(ctx, opts)
9494
assert.Nil(t, err)
9595
cnt := 0
@@ -136,7 +136,7 @@ func TestCreateWorkloadTxn(t *testing.T) {
136136

137137
// doAllocResource fails: Alloc
138138
rmgr.On("Alloc", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
139-
nil, nil, types.ErrInvalidType,
139+
nil, nil, types.ErrMockError,
140140
).Once()
141141
ch, err = c.CreateWorkload(ctx, opts)
142142
assert.Nil(t, err)
@@ -187,7 +187,7 @@ func TestCreateWorkloadTxn(t *testing.T) {
187187
engine.On("ImageRemoteDigest", mock.Anything, mock.Anything).Return("", nil)
188188
engine.On("VirtualizationCreate", mock.Anything, mock.Anything).Return(nil, errors.Wrap(context.DeadlineExceeded, "VirtualizationCreate")).Twice()
189189
engine.On("VirtualizationRemove", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
190-
store.On("ListNodeWorkloads", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD)
190+
store.On("ListNodeWorkloads", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrMockError)
191191
walCommitted = false
192192
ch, err = c.CreateWorkload(ctx, opts)
193193
assert.Nil(t, err)

‎cluster/calcium/dissociate_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestDissociateWorkload(t *testing.T) {
4242
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
4343
// failed by lock
4444
store.On("GetNode", mock.Anything, "node1").Return(node1, nil)
45-
store.On("CreateLock", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
45+
store.On("CreateLock", mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
4646
ch, err := c.DissociateWorkload(ctx, []string{"c1"})
4747
assert.NoError(t, err)
4848
for r := range ch {
@@ -57,8 +57,8 @@ func TestDissociateWorkload(t *testing.T) {
5757
map[string]types.NodeResourceArgs{},
5858
nil,
5959
)
60-
store.On("RemoveWorkload", mock.Anything, mock.Anything).Return(types.ErrNoETCD).Once()
61-
store.On("ListNodeWorkloads", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD)
60+
store.On("RemoveWorkload", mock.Anything, mock.Anything).Return(types.ErrMockError).Once()
61+
store.On("ListNodeWorkloads", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrMockError)
6262
ch, err = c.DissociateWorkload(ctx, []string{"c1"})
6363
assert.NoError(t, err)
6464
for r := range ch {

‎cluster/calcium/execute_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestExecuteWorkload(t *testing.T) {
4545

4646
// failed by Execute
4747
result := "def"
48-
engine.On("Execute", mock.Anything, mock.Anything, mock.Anything).Return(result, nil, nil, nil, types.ErrCannotGetEngine).Once()
48+
engine.On("Execute", mock.Anything, mock.Anything, mock.Anything).Return(result, nil, nil, nil, types.ErrMockError).Once()
4949
ch = c.ExecuteWorkload(ctx, &types.ExecuteWorkloadOptions{WorkloadID: ID}, nil)
5050
for ac := range ch {
5151
assert.Equal(t, ac.WorkloadID, ID)
@@ -54,7 +54,7 @@ func TestExecuteWorkload(t *testing.T) {
5454
engine.On("Execute", mock.Anything, mock.Anything, mock.Anything).Return(result, buf, nil, nil, nil).Twice()
5555

5656
// failed by ExecExitCode
57-
engine.On("ExecExitCode", mock.Anything, mock.Anything, mock.Anything).Return(-1, types.ErrCannotGetEngine).Once()
57+
engine.On("ExecExitCode", mock.Anything, mock.Anything, mock.Anything).Return(-1, types.ErrMockError).Once()
5858
ch = c.ExecuteWorkload(ctx, &types.ExecuteWorkloadOptions{WorkloadID: ID}, nil)
5959
data := []byte{}
6060
for ac := range ch {

‎cluster/calcium/image_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestCacheImage(t *testing.T) {
2323
_, err := c.CacheImage(ctx, &types.ImageOptions{Podname: ""})
2424
assert.Error(t, err)
2525
// fail by get nodes
26-
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
26+
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
2727
_, err = c.CacheImage(ctx, &types.ImageOptions{Podname: "podname"})
2828
assert.Error(t, err)
2929
// fail 0 nodes
@@ -41,9 +41,9 @@ func TestCacheImage(t *testing.T) {
4141
}
4242
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return(nodes, nil)
4343
// fail by ImageRemoteDigest
44-
engine.On("ImageLocalDigests", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
45-
engine.On("ImageRemoteDigest", mock.Anything, mock.Anything).Return("", types.ErrNoETCD).Once()
46-
engine.On("ImagePull", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
44+
engine.On("ImageLocalDigests", mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
45+
engine.On("ImageRemoteDigest", mock.Anything, mock.Anything).Return("", types.ErrMockError).Once()
46+
engine.On("ImagePull", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
4747
ch, err := c.CacheImage(ctx, &types.ImageOptions{Podname: "podname", Images: []string{"xx"}})
4848
for c := range ch {
4949
assert.False(t, c.Success)
@@ -68,7 +68,7 @@ func TestRemoveImage(t *testing.T) {
6868
_, err := c.RemoveImage(ctx, &types.ImageOptions{Podname: ""})
6969
assert.Error(t, err)
7070
// fail by get nodes
71-
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
71+
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
7272
_, err = c.RemoveImage(ctx, &types.ImageOptions{Podname: "podname"})
7373
assert.Error(t, err)
7474
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return([]*types.Node{}, nil).Once()
@@ -86,14 +86,14 @@ func TestRemoveImage(t *testing.T) {
8686
}
8787
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return(nodes, nil)
8888
// fail remove
89-
engine.On("ImageRemove", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
89+
engine.On("ImageRemove", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
9090
ch, err := c.RemoveImage(ctx, &types.ImageOptions{Podname: "podname", Images: []string{"xx"}})
9191
for c := range ch {
9292
assert.False(t, c.Success)
9393
}
9494
engine.On("ImageRemove", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]string{"xx"}, nil)
9595
// success remove but prune fail
96-
engine.On("ImagesPrune", mock.Anything).Return(types.ErrNoETCD).Once()
96+
engine.On("ImagesPrune", mock.Anything).Return(types.ErrMockError).Once()
9797
ch, err = c.RemoveImage(ctx, &types.ImageOptions{Podname: "podname", Images: []string{"xx"}, Prune: true})
9898
for c := range ch {
9999
assert.True(t, c.Success)
@@ -112,7 +112,7 @@ func TestListImage(t *testing.T) {
112112
ctx := context.Background()
113113
store := c.store.(*storemocks.Store)
114114
// fail by get nodes
115-
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
115+
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
116116
_, err := c.ListImage(ctx, &types.ImageOptions{Podname: "podname"})
117117
assert.Error(t, err)
118118
// fail 0 nodes
@@ -130,7 +130,7 @@ func TestListImage(t *testing.T) {
130130
}
131131
store.On("GetNodesByPod", mock.Anything, mock.Anything).Return(nodes, nil)
132132
// fail by ImageList
133-
engine.On("ImageList", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
133+
engine.On("ImageList", mock.Anything, mock.Anything).Return(nil, types.ErrMockError).Once()
134134
ch, err := c.ListImage(ctx, &types.ImageOptions{Podname: "podname"})
135135
msg := <-ch
136136
assert.Error(t, msg.Error)

‎cluster/calcium/lambda_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestRunAndWaitFailedThenWALCommitted(t *testing.T) {
2828
rmgr := &resourcemocks.Manager{}
2929
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
3030
rmgr.On("GetNodesDeployCapacity", mock.Anything, mock.Anything, mock.Anything).Return(
31-
nil, 0, types.ErrNoETCD,
31+
nil, 0, types.ErrMockError,
3232
)
3333
c.rmgr = rmgr
3434

@@ -283,7 +283,7 @@ func newLambdaCluster(t *testing.T) (*Calcium, []*types.Node) {
283283
engine.On("VirtualizationCreate", mock.Anything, mock.Anything).Return(&enginetypes.VirtualizationCreated{ID: "workloadfortonictest"}, nil)
284284
engine.On("VirtualizationStart", mock.Anything, mock.Anything).Return(nil)
285285
engine.On("VirtualizationRemove", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
286-
store.On("ListNodeWorkloads", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD)
286+
store.On("ListNodeWorkloads", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrMockError)
287287
engine.On("VirtualizationInspect", mock.Anything, mock.Anything).Return(&enginetypes.VirtualizationInfo{}, nil)
288288
store.On("AddWorkload", mock.Anything, mock.Anything, mock.Anything).Return(nil)
289289

0 commit comments

Comments
 (0)