Merge pull request #537 from laijs/cli-refactor

runv cli refactor

Makefile.am

@@ -22,7 +22,7 @@ install-exec-local:
 	$(INSTALL_PROGRAM) runv $(bindir)
 
 build-runv:
-	go build -tags "static_build $(HYPER_BULD_TAGS)" -ldflags ${GOLDFLAGS} -o runv .
+	go build -tags "static_build $(HYPER_BULD_TAGS)" -ldflags ${GOLDFLAGS} -o runv ./cli/
 test-integration:
 	cd integration-test/test_data && make
 	cd integration-test && go test -check.v -test.timeout=120m ${TESTFLAGS} .

cli/container.go

@@ -0,0 +1,265 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"syscall"
+	"time"
+
+	"github.com/golang/glog"
+	"github.com/hyperhq/runv/api"
+	"github.com/hyperhq/runv/hypervisor"
+	"github.com/hyperhq/runv/lib/linuxsignal"
+	"github.com/opencontainers/runtime-spec/specs-go"
+)
+
+func startContainer(vm *hypervisor.Vm, container string, spec *specs.Spec, state *specs.State) error {
+	err := vm.StartContainer(container)
+	if err != nil {
+		glog.V(1).Infof("Start Container fail: fail to start container with err: %#v\n", err)
+		return err
+	}
+
+	err = syscall.Kill(state.Pid, syscall.SIGUSR1)
+	if err != nil {
+		glog.V(1).Infof("failed to notify the shim to work", err.Error())
+		return err
+	}
+
+	err = execPoststartHooks(spec, state)
+	if err != nil {
+		glog.V(1).Infof("execute Poststart hooks failed %s\n", err.Error())
+	}
+
+	return err
+}
+
+func createContainer(options runvOptions, vm *hypervisor.Vm, container, bundle, stateRoot string, spec *specs.Spec) (shim *os.Process, err error) {
+	if err = setupContainerFs(vm, bundle, container, spec); err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err != nil {
+			removeContainerFs(vm, container)
+		}
+	}()
+
+	glog.V(3).Infof("vm.AddContainer()")
+	config := api.ContainerDescriptionFromOCF(container, spec)
+	r := vm.AddContainer(config)
+	if !r.IsSuccess() {
+		return nil, fmt.Errorf("add container %s failed: %s", container, r.Message())
+	}
+	defer func() {
+		if err != nil {
+			vm.RemoveContainer(container)
+		}
+	}()
+
+	// Prepare container state directory
+	stateDir := filepath.Join(stateRoot, container)
+	_, err = os.Stat(stateDir)
+	if err == nil {
+		glog.Errorf("Container %s exists\n", container)
+		return nil, fmt.Errorf("Container %s exists", container)
+	}
+	err = os.MkdirAll(stateDir, 0644)
+	if err != nil {
+		glog.V(1).Infof("%s\n", err.Error())
+		return nil, err
+	}
+	defer func() {
+		if err != nil {
+			os.RemoveAll(stateDir)
+		}
+	}()
+
+	// Create sandbox dir symbol link in container root dir
+	vmRootLinkPath := filepath.Join(stateDir, "sandbox")
+	vmRootPath := sandboxPath(vm)
+	if err = os.Symlink(vmRootPath, vmRootLinkPath); err != nil {
+		return nil, fmt.Errorf("failed to create symbol link %q: %v", vmRootLinkPath, err)
+	}
+
+	// create shim and save the state
+	shim, err = createShim(options, container, "init")
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err != nil {
+			shim.Kill()
+		}
+	}()
+
+	state := &specs.State{
+		Version: spec.Version,
+		ID:      container,
+		Pid:     shim.Pid,
+		Bundle:  bundle,
+	}
+	glog.V(3).Infof("save state id %s, boundle %s", container, bundle)
+	if err = saveStateFile(filepath.Join(stateDir, "state.json"), state); err != nil {
+		return nil, err
+	}
+
+	err = execPrestartHooks(spec, state)
+	if err != nil {
+		// cli refator todo stop container
+		glog.V(1).Infof("execute Prestart hooks failed, %s\n", err.Error())
+		return nil, err
+	}
+
+	// If runv is launched via docker/containerd, we start netlistener to watch/collect network changes.
+	// TODO: if runv is launched by cni compatible tools, the cni script can use `runv cni` cmdline to update the network.
+	// Create the listener process which will enters into the netns of the shim
+	options.withContainer = state
+	if err = startNsListener(options, vm); err != nil {
+		// cli refator todo stop container
+		glog.Errorf("start ns listener fail: %v", err)
+		return nil, err
+	}
+
+	return shim, nil
+}
+
+func deleteContainer(vm *hypervisor.Vm, root, container string, force bool, spec *specs.Spec, state *specs.State) error {
+
+	// todo: check the container from vm.ContainerList()
+	// todo: check the process of state.Pid in case it is a new unrelated process
+
+	// non-force killing can only be performed when at least one of the realProcess and shimProcess exited
+	exitedVM := vm.SignalProcess(container, "init", syscall.Signal(0)) != nil // todo: is this check reliable?
+	exitedHost := syscall.Kill(state.Pid, syscall.Signal(0)) != nil
+	if !exitedVM && !exitedHost && !force {
+		// don't perform deleting
+		return fmt.Errorf("the container %s is still alive, use -f to force kill it?", container)
+	}
+
+	if !exitedVM { // force kill the real init process inside the vm
+		for i := 0; i < 100; i++ {
+			vm.SignalProcess(container, "init", linuxsignal.SIGKILL)
+			time.Sleep(100 * time.Millisecond)
+			if vm.SignalProcess(container, "init", syscall.Signal(0)) != nil {
+				break
+			}
+		}
+	}
+
+	if !exitedHost { // force kill the shim process in the host
+		time.Sleep(200 * time.Millisecond) // the shim might be going to exit, wait it
+		for i := 0; i < 100; i++ {
+			syscall.Kill(state.Pid, syscall.SIGKILL)
+			time.Sleep(100 * time.Millisecond)
+			if syscall.Kill(state.Pid, syscall.Signal(0)) != nil {
+				break
+			}
+		}
+	}
+
+	vm.RemoveContainer(container)
+	err := execPoststopHooks(spec, state)
+	if err != nil {
+		glog.V(1).Infof("execute Poststop hooks failed %s\n", err.Error())
+		removeContainerFs(vm, container)
+		os.RemoveAll(filepath.Join(root, container))
+		return err // return err of the hooks
+	}
+
+	removeContainerFs(vm, container)
+	return os.RemoveAll(filepath.Join(root, container))
+}
+
+func addProcess(options runvOptions, vm *hypervisor.Vm, container, process string, spec *specs.Process) (shim *os.Process, err error) {
+	err = vm.AddProcess(&api.Process{
+		Container: container,
+		Id:        process,
+		Terminal:  spec.Terminal,
+		Args:      spec.Args,
+		Envs:      spec.Env,
+		Workdir:   spec.Cwd}, nil)
+
+	if err != nil {
+		glog.V(1).Infof("add process to container failed: %v\n", err)
+		return nil, err
+	}
+	defer func() {
+		if err != nil {
+			vm.SignalProcess(container, process, linuxsignal.SIGKILL)
+		}
+	}()
+
+	shim, err = createShim(options, container, process)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err != nil {
+			shim.Kill()
+		}
+	}()
+
+	// cli refactor todo (for the purpose of 'runv ps` command) save <container, process, shim-pid, spec> to persist file.
+
+	return shim, nil
+}
+
+func execHook(hook specs.Hook, state *specs.State) error {
+	b, err := json.Marshal(state)
+	if err != nil {
+		return err
+	}
+	cmd := exec.Cmd{
+		Path:  hook.Path,
+		Args:  hook.Args,
+		Env:   hook.Env,
+		Stdin: bytes.NewReader(b),
+	}
+	return cmd.Run()
+}
+
+func execPrestartHooks(rt *specs.Spec, state *specs.State) error {
+	if rt.Hooks == nil {
+		return nil
+	}
+	for _, hook := range rt.Hooks.Prestart {
+		err := execHook(hook, state)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func execPoststartHooks(rt *specs.Spec, state *specs.State) error {
+	if rt.Hooks == nil {
+		return nil
+	}
+	for _, hook := range rt.Hooks.Poststart {
+		err := execHook(hook, state)
+		if err != nil {
+			glog.V(1).Infof("exec Poststart hook %s failed %s", hook.Path, err.Error())
+		}
+	}
+
+	return nil
+}
+
+func execPoststopHooks(rt *specs.Spec, state *specs.State) error {
+	if rt.Hooks == nil {
+		return nil
+	}
+	for _, hook := range rt.Hooks.Poststop {
+		err := execHook(hook, state)
+		if err != nil {
+			glog.V(1).Infof("exec Poststop hook %s failed %s", hook.Path, err.Error())
+		}
+	}
+
+	return nil
+}