Skip to content

Commit 2708d0e

Browse files
committed
fix seq of workload res and engine params
1 parent cf3f463 commit 2708d0e

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

cluster/calcium/create.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,9 @@ func (c *Calcium) doCreateWorkloads(ctx context.Context, opts *types.DeployOptio
123123
processingCommits = make(map[string]wal.Commit)
124124
for nodename, deploy := range deployMap {
125125
nodes = append(nodes, nodeMap[nodename])
126-
if engineParamsMap[nodename], workloadResourcesMap[nodename], err = c.rmgr.Alloc(ctx, nodename, deploy, opts.Resources); err != nil {
126+
if workloadResourcesMap[nodename], engineParamsMap[nodename], err = c.rmgr.Alloc(ctx, nodename, deploy, opts.Resources); err != nil {
127127
return err
128128
}
129-
130129
processing := opts.GetProcessing(nodename)
131130
if processingCommits[nodename], err = c.wal.Log(eventProcessingCreated, processing); err != nil {
132131
return err

engine/mocks/fakeengine/mock.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bufio"
55
"bytes"
66
"context"
7-
"fmt"
87
"io"
98

109
"github.com/docker/go-units"
@@ -106,14 +105,11 @@ func MakeClient(ctx context.Context, config coretypes.Config, nodename, endpoint
106105
// parse engine args to resource options
107106
resourceOpts := &virtualizationResource{}
108107
_ = engine.MakeVirtualizationResource(opts.EngineParams, resourceOpts, func(p resourcetypes.Resources, d *virtualizationResource) error {
109-
for n, v := range p {
110-
fmt.Println("**********", n)
111-
litter.Dump(v)
108+
for _, v := range p {
112109
if err := mapstructure.Decode(v, d); err != nil {
113110
return err
114111
}
115112
}
116-
litter.Dump(d)
117113
return nil
118114
})
119115
litter.Dump(resourceOpts)

0 commit comments

Comments
 (0)