Skip to content

Commit a534600

Browse files
AceralonAceralon
committed
modify create
1 parent 0352bab commit a534600

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

‎engine/virt/virt.go

+13-10
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
enginetypes "github.com/projecteru2/core/engine/types"
2020
"github.com/projecteru2/core/log"
2121
coresource "github.com/projecteru2/core/source"
22-
"github.com/projecteru2/core/types"
2322
coretypes "github.com/projecteru2/core/types"
2423
)
2524

@@ -76,6 +75,8 @@ func (v *Virt) Info(ctx context.Context) (*enginetypes.Info, error) {
7675

7776
// Execute executes a command in vm
7877
func (v *Virt) Execute(ctx context.Context, ID string, config *enginetypes.ExecConfig) (pid string, stdout, stderr io.ReadCloser, stdin io.WriteCloser, err error) {
78+
log.Debugf(ctx, "execute opts on %s: %v", ID, config)
79+
defer log.Debugf(ctx, "execute opts done")
7980
if config.Tty {
8081
flags := virttypes.AttachGuestFlags{Safe: true, Force: true}
8182
stream, err := v.client.AttachGuest(ctx, ID, config.Cmd, flags)
@@ -179,6 +180,8 @@ func (v *Virt) VirtualizationCreate(ctx context.Context, opts *enginetypes.Virtu
179180
Labels: opts.Labels,
180181
AncestorID: opts.AncestorWorkloadID,
181182
DmiUUID: opts.Labels[DmiUUIDKey],
183+
Cmd: opts.Cmd,
184+
Lambda: opts.Lambda,
182185
}
183186

184187
var resp virttypes.Guest
@@ -190,9 +193,12 @@ func (v *Virt) VirtualizationCreate(ctx context.Context, opts *enginetypes.Virtu
190193
}
191194

192195
// VirtualizationResourceRemap .
193-
func (v *Virt) VirtualizationResourceRemap(ctx context.Context, opts *enginetypes.VirtualizationRemapOptions) (ch <-chan enginetypes.VirtualizationRemapMessage, err error) {
194-
err = types.ErrEngineNotImplemented
195-
return
196+
func (v *Virt) VirtualizationResourceRemap(ctx context.Context, opts *enginetypes.VirtualizationRemapOptions) (<-chan enginetypes.VirtualizationRemapMessage, error) {
197+
// VM does not support binding cores.
198+
log.Debugf(ctx, "virtualizationResourceRemap is not supported by vm")
199+
ch := make(chan enginetypes.VirtualizationRemapMessage)
200+
defer close(ch)
201+
return ch, nil
196202
}
197203

198204
// VirtualizationCopyTo copies one.
@@ -266,8 +272,10 @@ func (v *Virt) VirtualizationResize(ctx context.Context, ID string, height, widt
266272

267273
// VirtualizationWait is waiting for a shut-off
268274
func (v *Virt) VirtualizationWait(ctx context.Context, ID, state string) (*enginetypes.VirtualizationWaitResult, error) {
269-
msg, err := v.client.WaitGuest(ctx, ID, true)
275+
log.Debugf(ctx, "wait start in core")
270276
r := &enginetypes.VirtualizationWaitResult{}
277+
defer log.Debugf(ctx, "wait ok in core: %v", r)
278+
msg, err := v.client.WaitGuest(ctx, ID, true)
271279
if err != nil {
272280
r.Message = err.Error()
273281
r.Code = -1
@@ -308,11 +316,6 @@ func (v *Virt) VirtualizationCopyFrom(ctx context.Context, ID, path string) (con
308316
return
309317
}
310318

311-
// VirtualizationExecute executes commands in running virtual unit
312-
func (v *Virt) VirtualizationExecute(ctx context.Context, ID string, commands, env []string, workdir string) (io.WriteCloser, io.ReadCloser, error) {
313-
return nil, nil, fmt.Errorf("VirtualizationExecute not implemented")
314-
}
315-
316319
// ResourceValidate validate resource usage
317320
func (v *Virt) ResourceValidate(ctx context.Context, cpu float64, cpumap map[string]int64, memory, storage int64) error {
318321
// TODO list all workloads, calculate resource

‎go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/opencontainers/runc v1.0.0-rc95 // indirect
3333
github.com/patrickmn/go-cache v2.1.0+incompatible
3434
github.com/pkg/errors v0.9.1
35-
github.com/projecteru2/libyavirt v0.0.0-20211019072514-d14bb80e15f6
35+
github.com/projecteru2/libyavirt v0.0.0-20211103081743-247586bcb89f
3636
github.com/prometheus/client_golang v1.11.0
3737
github.com/sanity-io/litter v1.5.1
3838
github.com/sirupsen/logrus v1.7.0
@@ -52,5 +52,3 @@ require (
5252
google.golang.org/grpc v1.40.0
5353
google.golang.org/protobuf v1.27.1
5454
)
55-
56-
replace github.com/projecteru2/libyavirt => github.com/aceralon/libyavirt v0.0.0-20211027024116-ba0bad4ecffd

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ github.com/Microsoft/hcsshim v0.8.11 h1:qs8+XI1mFA1H/zhXT9qVG/lcJO18p1yCsICIrCjV
3030
github.com/Microsoft/hcsshim v0.8.11/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
3131
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
3232
github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
33-
github.com/aceralon/libyavirt v0.0.0-20211027024116-ba0bad4ecffd h1:ChBxZbidSCmvKuttorIrTpA1HLHDU721U6EqWM2XS+M=
34-
github.com/aceralon/libyavirt v0.0.0-20211027024116-ba0bad4ecffd/go.mod h1:FOc+hWBMLsMrmx5p3/moizKeSomedZPNwB6LhS+kEnE=
3533
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
3634
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
3735
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
@@ -456,6 +454,8 @@ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77
456454
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
457455
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
458456
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
457+
github.com/projecteru2/libyavirt v0.0.0-20211103081743-247586bcb89f h1:iDdP0qR+qQyOM3obuiN1EcOqXjL8boIUW4ltbb/Xq/A=
458+
github.com/projecteru2/libyavirt v0.0.0-20211103081743-247586bcb89f/go.mod h1:FOc+hWBMLsMrmx5p3/moizKeSomedZPNwB6LhS+kEnE=
459459
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
460460
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
461461
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=

0 commit comments

Comments
 (0)