Skip to content

Commit 4fe8207

Browse files
CMGSCMGS
committed
[skip ci] refactor stage 1
1 parent 555c243 commit 4fe8207

Some content is hidden

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

64 files changed

+3135
-4129
lines changed

‎cluster/calcium/build_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestBuild(t *testing.T) {
8383
store.On("GetNodesByPod", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*types.Node{node}, nil)
8484
// failed by plugin error
8585
rmgr := c.rmgr.(*resourcemocks.Manager)
86-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
86+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
8787
rmgr.On("GetMostIdleNode", mock.Anything, mock.Anything).Return("", types.ErrBadCount).Once()
8888
ch, err = c.BuildImage(ctx, opts)
8989
assert.Error(t, err)

‎cluster/calcium/capacity_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestCalculateCapacity(t *testing.T) {
2222
ctx := context.Background()
2323
store := c.store.(*storemocks.Store)
2424
rmgr := c.rmgr.(*resourcemocks.Manager)
25-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
25+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
2626
engine := &enginemocks.API{}
2727

2828
// pod1 := &types.Pod{Name: "p1"}

‎cluster/calcium/create.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ func (c *Calcium) doCreateWorkloads(ctx context.Context, opts *types.DeployOptio
101101
return c.withNodesPodLocked(ctx, opts.NodeFilter, func(ctx context.Context, nodeMap map[string]*types.Node) (err error) {
102102
nodeNames := []string{}
103103
nodes := []*types.Node{}
104-
for nodeName, node := range nodeMap {
105-
nodeNames = append(nodeNames, nodeName)
104+
for nodename, node := range nodeMap {
105+
nodeNames = append(nodeNames, nodename)
106106
nodes = append(nodes, node)
107107
}
108108

@@ -117,14 +117,14 @@ func (c *Calcium) doCreateWorkloads(ctx context.Context, opts *types.DeployOptio
117117

118118
// commit changes
119119
processingCommits = make(map[string]wal.Commit)
120-
for nodeName, deploy := range deployMap {
121-
nodes = append(nodes, nodeMap[nodeName])
122-
if engineArgsMap[nodeName], resourceArgsMap[nodeName], err = c.rmgr.Alloc(ctx, nodeName, deploy, opts.ResourceOpts); err != nil {
120+
for nodename, deploy := range deployMap {
121+
nodes = append(nodes, nodeMap[nodename])
122+
if engineArgsMap[nodename], resourceArgsMap[nodename], err = c.rmgr.Alloc(ctx, nodename, deploy, opts.ResourceOpts); err != nil {
123123
return errors.WithStack(err)
124124
}
125125

126-
processing := opts.GetProcessing(nodeName)
127-
if processingCommits[nodeName], err = c.wal.Log(eventProcessingCreated, processing); err != nil {
126+
processing := opts.GetProcessing(nodename)
127+
if processingCommits[nodename], err = c.wal.Log(eventProcessingCreated, processing); err != nil {
128128
return errors.WithStack(err)
129129
}
130130
if err = c.store.CreateProcessing(ctx, processing, deploy); err != nil {
@@ -275,7 +275,7 @@ func (c *Calcium) doDeployWorkloadsOnNode(ctx context.Context,
275275
}
276276

277277
func (c *Calcium) doGetAndPrepareNode(ctx context.Context, nodename, image string) (*types.Node, error) {
278-
node, err := c.GetNode(ctx, nodename, nil)
278+
node, err := c.GetNode(ctx, nodename)
279279
if err != nil {
280280
return nil, err
281281
}

‎cluster/calcium/create_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func TestCreateWorkloadTxn(t *testing.T) {
8181

8282
store := c.store.(*storemocks.Store)
8383
rmgr := c.rmgr.(*resourcemocks.Manager)
84-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
84+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
8585
mwal := &walmocks.WAL{}
8686
c.wal = mwal
8787
var walCommitted bool

‎cluster/calcium/dissociate_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestDissociateWorkload(t *testing.T) {
3939
}
4040

4141
store.On("GetWorkloads", mock.Anything, mock.Anything).Return([]*types.Workload{c1}, nil)
42-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
42+
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)
4545
store.On("CreateLock", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()

‎cluster/calcium/image_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestRemoveImage(t *testing.T) {
2020
ctx := context.Background()
2121
store := c.store.(*storemocks.Store)
2222
rmgr := c.rmgr.(*resourcemocks.Manager)
23-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
23+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
2424
// fail by validating
2525
_, err := c.RemoveImage(ctx, &types.ImageOptions{Podname: ""})
2626
assert.Error(t, err)
@@ -67,7 +67,7 @@ func TestCacheImage(t *testing.T) {
6767
ctx := context.Background()
6868
rmgr := c.rmgr.(*resourcemocks.Manager)
6969
store := c.store.(*storemocks.Store)
70-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
70+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
7171
// fail by validating
7272
_, err := c.CacheImage(ctx, &types.ImageOptions{Podname: ""})
7373
assert.Error(t, err)

‎cluster/calcium/lambda_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestRunAndWaitFailedThenWALCommitted(t *testing.T) {
2727
c, _ := newCreateWorkloadCluster(t)
2828

2929
rmgr := &resourcemocks.Manager{}
30-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
30+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
3131
rmgr.On("GetNodesDeployCapacity", mock.Anything, mock.Anything, mock.Anything).Return(
3232
nil, 0, types.ErrNoETCD,
3333
)
@@ -192,7 +192,7 @@ func newLambdaCluster(t *testing.T) (*Calcium, []*types.Node) {
192192

193193
store := c.store.(*storemocks.Store)
194194
rmgr := c.rmgr.(*resourcemocks.Manager)
195-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
195+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
196196
map[string]types.NodeResourceArgs{},
197197
map[string]types.NodeResourceArgs{},
198198
[]string{},

‎cluster/calcium/lock.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (c *Calcium) withWorkloadsLocked(ctx context.Context, ids []string, f func(
7777
utils.Reverse(ids)
7878
c.doUnlockAll(utils.InheritTracingInfo(ctx, context.TODO()), locks, ids...)
7979
}()
80-
cs, err := c.GetWorkloads(ctx, ids)
80+
cs, err := c.store.GetWorkloads(ctx, ids)
8181
if err != nil {
8282
return err
8383
}
@@ -161,13 +161,7 @@ func (c *Calcium) withNodesLocked(ctx context.Context, nf types.NodeFilter, genK
161161
locks[key] = lock
162162
lockKeys = append(lockKeys, key)
163163
}
164-
165-
// refresh node
166-
node, err := c.GetNode(ctx, n.Name, nil)
167-
if err != nil {
168-
return err
169-
}
170-
nodes[n.Name] = node
164+
nodes[n.Name] = n
171165
}
172166
return f(ctx, nodes)
173167
}

‎cluster/calcium/lock_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func TestWithNodesPodLocked(t *testing.T) {
119119
ctx := context.Background()
120120
store := c.store.(*storemocks.Store)
121121
rmgr := c.rmgr.(*resourcemocks.Manager)
122-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
122+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
123123

124124
node1 := &types.Node{
125125
NodeMeta: types.NodeMeta{
@@ -177,7 +177,7 @@ func TestWithNodePodLocked(t *testing.T) {
177177
ctx := context.Background()
178178
store := c.store.(*storemocks.Store)
179179
rmgr := c.rmgr.(*resourcemocks.Manager)
180-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
180+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
181181

182182
node1 := &types.Node{
183183
NodeMeta: types.NodeMeta{
@@ -212,7 +212,7 @@ func TestWithNodesOperationLocked(t *testing.T) {
212212
ctx := context.Background()
213213
store := c.store.(*storemocks.Store)
214214
rmgr := c.rmgr.(*resourcemocks.Manager)
215-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
215+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
216216

217217
node1 := &types.Node{
218218
NodeMeta: types.NodeMeta{
@@ -269,7 +269,7 @@ func TestWithNodeOperationLocked(t *testing.T) {
269269
ctx := context.Background()
270270
store := c.store.(*storemocks.Store)
271271
rmgr := c.rmgr.(*resourcemocks.Manager)
272-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
272+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
273273

274274
node1 := &types.Node{
275275
NodeMeta: types.NodeMeta{

‎cluster/calcium/metrics.go

+9-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package calcium
22

33
import (
44
"context"
5-
"fmt"
65

76
"github.com/sanity-io/litter"
87

98
"github.com/projecteru2/core/log"
109
"github.com/projecteru2/core/metrics"
10+
"github.com/projecteru2/core/types"
1111
"github.com/projecteru2/core/utils"
1212
)
1313

@@ -29,19 +29,22 @@ func (c *Calcium) InitMetrics() {
2929
}
3030

3131
// SendNodeMetrics .
32-
func (c *Calcium) SendNodeMetrics(ctx context.Context, nodeName string) {
32+
func (c *Calcium) SendNodeMetrics(ctx context.Context, nodename string) {
3333
ctx, cancel := context.WithTimeout(utils.InheritTracingInfo(ctx, context.TODO()), c.config.GlobalTimeout)
3434
defer cancel()
35-
node, err := c.GetNode(ctx, nodeName, nil)
36-
fmt.Println(err)
35+
node, err := c.GetNode(ctx, nodename)
3736
if err != nil {
38-
log.Errorf(ctx, "[SendNodeMetrics] get node %s failed, %v", nodeName, err)
37+
log.Errorf(ctx, "[SendNodeMetrics] get node %s failed, %v", nodename, err)
3938
return
4039
}
4140

41+
c.doSendNodeMetrics(ctx, node)
42+
}
43+
44+
func (c *Calcium) doSendNodeMetrics(ctx context.Context, node *types.Node) {
4245
nodeMetrics, err := c.rmgr.ConvertNodeResourceInfoToMetrics(ctx, node.Podname, node.Name, node.ResourceCapacity, node.ResourceUsage)
4346
if err != nil {
44-
log.Errorf(ctx, "[SendNodeMetrics] resolve node %s resource info to metrics failed, %v", nodeName, err)
47+
log.Errorf(ctx, "[SendNodeMetrics] convert node %s resource info to metrics failed, %v", node.Name, err)
4548
return
4649
}
4750
metrics.Client.SendMetrics(nodeMetrics...)

‎cluster/calcium/network_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestNetwork(t *testing.T) {
1919
ctx := context.Background()
2020
store := c.store.(*storemocks.Store)
2121
rmgr := c.rmgr.(*resourcemocks.Manager)
22-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
22+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
2323

2424
store.On("GetNodesByPod", mock.AnythingOfType("*context.emptyCtx"), mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
2525
_, err := c.ListNetworks(ctx, "", "")
@@ -51,7 +51,7 @@ func TestConnectNetwork(t *testing.T) {
5151
ctx := context.Background()
5252
store := c.store.(*storemocks.Store)
5353
rmgr := c.rmgr.(*resourcemocks.Manager)
54-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
54+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
5555
engine := &enginemocks.API{}
5656
workload := &types.Workload{Engine: engine}
5757

@@ -69,7 +69,7 @@ func TestDisConnectNetwork(t *testing.T) {
6969
ctx := context.Background()
7070
store := c.store.(*storemocks.Store)
7171
rmgr := c.rmgr.(*resourcemocks.Manager)
72-
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
72+
rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
7373
engine := &enginemocks.API{}
7474
workload := &types.Workload{Engine: engine}
7575

0 commit comments

Comments
 (0)