Skip to content

Commit 7768ab1

Browse files
jterry75jterry75
committed
Update runhcs-shim to use go-bindings
Signed-off-by: Justin Terry (VM) <[email protected]>
1 parent 16b42fc commit 7768ab1

21 files changed

+383
-185
lines changed

‎runtime/v2/runhcs/cmdutil.go

-98
This file was deleted.

‎runtime/v2/runhcs/process.go

+7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ import (
3131
"github.com/containerd/containerd/runtime"
3232
)
3333

34+
type processExit struct {
35+
pid uint32
36+
exitStatus uint32
37+
exitedAt time.Time
38+
exitErr error
39+
}
40+
3441
func newProcess(ctx context.Context, s *service, id string, pid uint32, pr *pipeRelay, bundle, stdin, stdout, stderr string, terminal bool) (*process, error) {
3542
p, err := os.FindProcess(int(pid))
3643
if err != nil {

‎runtime/v2/runhcs/service.go

+22-59
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ import (
5050

5151
const (
5252
runhcsBinary = "runhcs"
53-
runhcsVersion = "0.0.1"
54-
runhcsDebugLegacy = "--debug" // TODO: JTERRY75 remove when all cmd's are complete in go-runhcs
53+
runhcsShimVersion = "0.0.1"
5554
)
5655

5756
var (
@@ -201,41 +200,9 @@ func (s *service) State(ctx context.Context, r *taskAPI.StateRequest) (*taskAPI.
201200
return nil, err
202201
}
203202

204-
cmd := exec.Command(runhcsBinary, runhcsDebugLegacy, "state", p.id)
205-
sout := getBuffer()
206-
defer putBuffer(sout)
207-
208-
cmd.Stdout = sout
209-
_, stateErr := runCmd(ctx, cmd)
210-
if stateErr != nil {
211-
return nil, stateErr
212-
}
213-
214-
// TODO: JTERRY75 merge this with runhcs declaration
215-
type containerState struct {
216-
// Version is the OCI version for the container
217-
Version string `json:"ociVersion"`
218-
// ID is the container ID
219-
ID string `json:"id"`
220-
// InitProcessPid is the init process id in the parent namespace
221-
InitProcessPid int `json:"pid"`
222-
// Status is the current status of the container, running, paused, ...
223-
Status string `json:"status"`
224-
// Bundle is the path on the filesystem to the bundle
225-
Bundle string `json:"bundle"`
226-
// Rootfs is a path to a directory containing the container's root filesystem.
227-
Rootfs string `json:"rootfs"`
228-
// Created is the unix timestamp for the creation time of the container in UTC
229-
Created time.Time `json:"created"`
230-
// Annotations is the user defined annotations added to the config.
231-
Annotations map[string]string `json:"annotations,omitempty"`
232-
// The owner of the state directory (the owner of the container).
233-
Owner string `json:"owner"`
234-
}
235-
236-
var cs containerState
237-
if err := json.NewDecoder(sout).Decode(&cs); err != nil {
238-
log.G(ctx).WithError(err).Debugf("failed to decode runhcs state output: %s", sout.Bytes())
203+
rhcs := newRunhcs(p.bundle)
204+
cs, err := rhcs.State(ctx, p.id)
205+
if err != nil {
239206
return nil, err
240207
}
241208

@@ -551,13 +518,14 @@ func (s *service) Pids(ctx context.Context, r *taskAPI.PidsRequest) (*taskAPI.Pi
551518
// Pause the container
552519
func (s *service) Pause(ctx context.Context, r *taskAPI.PauseRequest) (*ptypes.Empty, error) {
553520
// TODO: Validate that 'id' is actually a valid parent container ID
554-
if _, err := s.getProcess(r.ID, ""); err != nil {
521+
var p *process
522+
var err error
523+
if p, err = s.getProcess(r.ID, ""); err != nil {
555524
return nil, err
556525
}
557526

558-
cmd := exec.Command(runhcsBinary, runhcsDebugLegacy, "pause", r.ID)
559-
_, err := runCmd(ctx, cmd)
560-
if err != nil {
527+
rhcs := newRunhcs(p.bundle)
528+
if err = rhcs.Pause(ctx, p.id); err != nil {
561529
return nil, err
562530
}
563531

@@ -567,13 +535,14 @@ func (s *service) Pause(ctx context.Context, r *taskAPI.PauseRequest) (*ptypes.E
567535
// Resume the container
568536
func (s *service) Resume(ctx context.Context, r *taskAPI.ResumeRequest) (*ptypes.Empty, error) {
569537
// TODO: Validate that 'id' is actually a valid parent container ID
570-
if _, err := s.getProcess(r.ID, ""); err != nil {
538+
var p *process
539+
var err error
540+
if p, err = s.getProcess(r.ID, ""); err != nil {
571541
return nil, err
572542
}
573543

574-
cmd := exec.Command(runhcsBinary, runhcsDebugLegacy, "resume", r.ID)
575-
_, err := runCmd(ctx, cmd)
576-
if err != nil {
544+
rhcs := newRunhcs(p.bundle)
545+
if err = rhcs.Resume(ctx, p.id); err != nil {
577546
return nil, err
578547
}
579548

@@ -599,7 +568,7 @@ func (s *service) Kill(ctx context.Context, r *taskAPI.KillRequest) (*ptypes.Emp
599568
// TODO: JTERRY75 runhcs support for r.All?
600569
rhcs := newRunhcs(p.bundle)
601570
if err = rhcs.Kill(ctx, p.id, strconv.FormatUint(uint64(r.Signal), 10)); err != nil {
602-
if !strings.Contains(err.Error(), "container is not running") {
571+
if !strings.Contains(err.Error(), "container is stopped") {
603572
return nil, err
604573
}
605574
}
@@ -698,18 +667,12 @@ func (s *service) ResizePty(ctx context.Context, r *taskAPI.ResizePtyRequest) (*
698667
return nil, err
699668
}
700669

701-
cmd := exec.Command(
702-
runhcsBinary,
703-
runhcsDebugLegacy,
704-
"resize-tty",
705-
p.cid,
706-
"-p",
707-
strconv.FormatUint(uint64(p.pid), 10),
708-
strconv.FormatUint(uint64(r.Width), 10),
709-
strconv.FormatUint(uint64(r.Height), 10))
710-
711-
_, err = runCmd(ctx, cmd)
712-
if err != nil {
670+
pid := int(p.pid)
671+
opts := runhcs.ResizeTTYOpts{
672+
Pid: &pid,
673+
}
674+
rhcs := newRunhcs(p.bundle)
675+
if err = rhcs.ResizeTTY(ctx, p.cid, uint16(r.Width), uint16(r.Height), &opts); err != nil {
713676
return nil, err
714677
}
715678

@@ -756,7 +719,7 @@ func (s *service) Connect(ctx context.Context, r *taskAPI.ConnectRequest) (*task
756719
return &taskAPI.ConnectResponse{
757720
ShimPid: uint32(os.Getpid()),
758721
TaskPid: s.processes[s.id].pid,
759-
Version: runhcsVersion,
722+
Version: runhcsShimVersion,
760723
}, nil
761724
}
762725

‎snapshots/lcow/lcow.go

+11-8
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import (
2323
"encoding/json"
2424
"io"
2525
"os"
26-
"os/exec"
2726
"path/filepath"
2827
"strings"
2928
"syscall"
3029
"time"
3130
"unsafe"
3231

32+
"github.com/Microsoft/hcsshim/cmd/go-runhcs"
3333
"github.com/containerd/containerd/errdefs"
3434
"github.com/containerd/containerd/log"
3535
"github.com/containerd/containerd/mount"
@@ -337,16 +337,19 @@ func (s *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
337337
continue
338338
}
339339
defer slock.Close()
340-
// Create the scratch
341-
cmd := exec.Command(
342-
"runhcs.exe",
343-
"create-scratch",
344-
"--destpath", scratchPath)
345340

346-
if bytes, err := cmd.CombinedOutput(); err != nil {
341+
// Create the scratch
342+
rhcs := runhcs.Runhcs{
343+
Debug: true,
344+
Log: filepath.Join(s.root, "runhcs-scratch.log"),
345+
LogFormat: runhcs.JSON,
346+
Owner: "containerd",
347+
}
348+
if err := rhcs.CreateScratch(ctx, scratchPath); err != nil {
347349
_ = os.Remove(scratchPath)
348-
return nil, errors.Wrapf(err, "failed to create scratch.vhdx. additional info: '%s'", string(bytes))
350+
return nil, errors.Wrap(err, "failed to create scratch.vhdx")
349351
}
352+
350353
// Successfully created scratch in the cache. Open and copy
351354
continue
352355
} else {

‎vendor.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
3333
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
3434
github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
3535
github.com/Microsoft/go-winio v0.4.10
36-
github.com/Microsoft/hcsshim 44c060121b68e8bdc40b411beba551f3b4ee9e55
36+
github.com/Microsoft/hcsshim v0.7.4
3737
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
3838
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
3939
github.com/containerd/ttrpc 94dde388801693c54f88a6596f713b51a8b30b2d

‎vendor/github.com/Microsoft/hcsshim/cmd/go-runhcs/runhcs_create-scratch.go

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Microsoft/hcsshim/cmd/go-runhcs/runhcs_list.go

+28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Microsoft/hcsshim/cmd/go-runhcs/runhcs_pause.go

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Microsoft/hcsshim/cmd/go-runhcs/runhcs_ps.go

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)