Merge pull request #438 from kzys/fc-master

Upgrade Firecracker Go SDK from 0.21.0 to master

Author: kzys

_submodules/firecracker

@@ -12,15 +12,15 @@ require (
 	github.com/containerd/ttrpc v0.0.0-20190613183316-1fb3814edf44
 	github.com/containerd/typeurl v0.0.0-20181015155603-461401dc8f19
 	github.com/containernetworking/cni v0.7.2-0.20190807151350-8c6c47d1c7fc
-	github.com/containernetworking/plugins v0.8.5
+	github.com/containernetworking/plugins v0.8.6
 	github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/go-events v0.0.0-20170721190031-9461782956ad // indirect
 	github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect
-	github.com/firecracker-microvm/firecracker-go-sdk v0.21.0
+	github.com/firecracker-microvm/firecracker-go-sdk v0.21.1-0.20200811001213-ee1e7c41b7bd
 	github.com/go-ole/go-ole v1.2.4 // indirect
 	github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384 // indirect
-	github.com/gofrs/uuid v3.2.0+incompatible
+	github.com/gofrs/uuid v3.3.0+incompatible
 	github.com/gogo/googleapis v1.1.0 // indirect
 	github.com/gogo/protobuf v1.3.0
 	github.com/golang/protobuf v1.3.1
@@ -37,14 +37,14 @@ require (
 	github.com/prometheus/client_golang v0.9.2 // indirect
 	github.com/shirou/gopsutil v2.18.12+incompatible
 	github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
-	github.com/sirupsen/logrus v1.4.2
-	github.com/stretchr/testify v1.5.1
+	github.com/sirupsen/logrus v1.6.0
+	github.com/stretchr/testify v1.6.1
 	github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
 	github.com/urfave/cli v1.20.0 // indirect
 	github.com/vishvananda/netlink v1.1.0
 	go.etcd.io/bbolt v1.3.1-etcd.8 // indirect
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/sys v0.0.0-20191210023423-ac6580df4449
+	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
 	google.golang.org/genproto v0.0.0-20181109154231-b5d43981345b // indirect
 	google.golang.org/grpc v1.21.0
 	gotest.tools v2.2.0+incompatible // indirect

go.mod

@@ -53,7 +53,7 @@ type jailer interface {
 	StubDrivesOptions() []FileOpt
 
 	// Stop the jailer as a way that is visible from the user-level process (e.g. SIGTERM).
-	Stop() error
+	Stop(force bool) error
 
 	// Close will do any necessary cleanup that the jailer has accrued.
 	Close() error

go.sum

@@ -101,18 +101,22 @@ func (j *noopJailer) StubDrivesOptions() []FileOpt {
 	return []FileOpt{}
 }
 
-func (j *noopJailer) Stop() error {
+func (j *noopJailer) Stop(force bool) error {
 	if j.pid == 0 {
 		return errors.New("the machine hasn't been started")
 	}
 
-	j.logger.Debugf("sending SIGTERM to %d", j.pid)
+	signal := syscall.SIGTERM
+	if force {
+		signal = syscall.SIGKILL
+	}
+	j.logger.Debugf("sending signal %d to %d", signal, j.pid)
 	p, err := os.FindProcess(j.pid)
 	if err != nil {
 		return err
 	}
 
-	err = p.Signal(syscall.SIGTERM)
+	err = p.Signal(signal)
 	if err == nil || err.Error() == "os: process already finished" {
 		return nil
 	}

runtime/jailer.go

@@ -124,8 +124,13 @@ func (j *runcJailer) JailPath() vm.Dir {
 func (j *runcJailer) BuildJailedMachine(cfg *config.Config, machineConfig *firecracker.Config, vmID string) ([]firecracker.Opt, error) {
 	handler := j.BuildJailedRootHandler(cfg, machineConfig, vmID)
 	fifoHandler := j.BuildLinkFifoHandler()
+
+	var debugSDK bool
+	if level, set := cfg.DebugHelper.GetFirecrackerSDKLogLevel(); set {
+		debugSDK = level == logrus.DebugLevel
+	}
 	// Build a new client since BuildJailedRootHandler modifies the socket path value.
-	client := firecracker.NewClient(machineConfig.SocketPath, j.logger, machineConfig.Debug)
+	client := firecracker.NewClient(machineConfig.SocketPath, j.logger, debugSDK)
 
 	if machineConfig.NetNS == "" {
 		if netns := getNetNS(j.configSpec); netns != "" {
@@ -539,6 +544,10 @@ func getNetNS(spec specs.Spec) string {
 	return ""
 }
 
-func (j runcJailer) Stop() error {
-	return j.runcClient.Kill(j.ctx, j.vmID, int(syscall.SIGTERM), &runc.KillOpts{All: true})
+func (j runcJailer) Stop(force bool) error {
+	signal := syscall.SIGTERM
+	if force {
+		signal = syscall.SIGKILL
+	}
+	return j.runcClient.Kill(j.ctx, j.vmID, int(signal), &runc.KillOpts{All: true})
 }

runtime/noop_jailer.go

@@ -1234,9 +1234,16 @@ func (s *service) shutdownLoop(
 			timeout: timeout,
 		},
 		{
-			name: "stop the jailer",
+			name: "stop the jailer by SIGTERM",
 			shutdown: func() error {
-				return s.jailer.Stop()
+				return s.jailer.Stop(false)
+			},
+			timeout: jailerStopTimeout,
+		},
+		{
+			name: "stop the jailer by SIGKILL",
+			shutdown: func() error {
+				return s.jailer.Stop(true)
 			},
 			timeout: jailerStopTimeout,
 		},

runtime/runc_jailer.go

@@ -11,7 +11,10 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
-FROM rust:1.39-stretch
+# Firecracker tends to use latest Rust versions.
+# The Rust version below should be matched with
+# https://github.com/firecracker-microvm/firecracker/blob/master/tools/devctr/Dockerfile.x86_64.
+FROM rust:1.43.1-buster
 
 ENV DEBIAN_FRONTEND="noninteractive"
 RUN apt-get update && apt-get install --yes --no-install-recommends \