Firecracker snapshot upf ctriface

Makefile

@@ -24,11 +24,8 @@ SUBDIRS:=ctriface taps misc profile
 EXTRAGOARGS:=-v -race -cover
 EXTRAGOARGS_NORACE:=-v
 EXTRATESTFILES:=vhive_test.go stats.go vhive.go functions.go
-# User-level page faults are temporarily disabled (gh-807)
-# WITHUPF:=-upfTest
-# WITHLAZY:=-lazyTest
-WITHUPF:=
-WITHLAZY:=
+WITHUPF:=-upfTest
+WITHLAZY:=-lazyTest
 WITHSNAPSHOTS:=-snapshotsTest
 CTRDLOGDIR:=/tmp/ctrd-logs
 
@@ -45,6 +42,11 @@ test-all: test-subdirs test-orch
 
 test-orch: test test-man
 
+debug:
+	./scripts/clean_fcctr.sh
+	sudo mkdir -m777 -p $(CTRDLOGDIR) && sudo env "PATH=$(PATH)" /usr/local/bin/firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>$(CTRDLOGDIR)/fccd_orch_upf_log.out 2>$(CTRDLOGDIR)/fccd_orch_upf_log.err &
+	sudo env "PATH=$(PATH)" go test $(EXTRATESTFILES) -short $(EXTRAGOARGS) -args $(WITHSNAPSHOTS) $(WITHUPF)
+
 test:
 	./scripts/clean_fcctr.sh
 	sudo mkdir -m777 -p $(CTRDLOGDIR) && sudo env "PATH=$(PATH)" /usr/local/bin/firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>$(CTRDLOGDIR)/fccd_orch_noupf_log.out 2>$(CTRDLOGDIR)/fccd_orch_noupf_log.err &

configs/firecracker-containerd/firecracker-runtime.json

@@ -4,5 +4,6 @@
   "kernel_args": "console=ttyS0 noapic reboot=k panic=1 pci=off nomodules ro systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
   "root_drive": "/var/lib/firecracker-containerd/runtime/default-rootfs.img",
   "cpu_template": "T2",
-  "log_levels": ["info"]
+  "log_levels": ["debug"],
+  "debug": true
 }

cri/firecracker/coordinator.go

@@ -26,13 +26,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/google/uuid"
-	"github.com/vhive-serverless/vhive/snapshotting"
 	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
 
+	"github.com/google/uuid"
+	"github.com/vhive-serverless/vhive/snapshotting"
+
 	log "github.com/sirupsen/logrus"
 	"github.com/vhive-serverless/vhive/ctriface"
 )
@@ -169,6 +170,7 @@ func (c *coordinator) orchStartVM(ctx context.Context, image, revision string, e
 
 func (c *coordinator) orchLoadInstance(ctx context.Context, snap *snapshotting.Snapshot) (*funcInstance, error) {
 	vmID := c.getVMID()
+	originVmID := vmID
 	logger := log.WithFields(
 		log.Fields{
 			"vmID":  vmID,
@@ -181,7 +183,7 @@ func (c *coordinator) orchLoadInstance(ctx context.Context, snap *snapshotting.S
 	ctxTimeout, cancel := context.WithTimeout(ctx, time.Second*30)
 	defer cancel()
 
-	resp, _, err := c.orch.LoadSnapshot(ctxTimeout, vmID, snap)
+	resp, _, err := c.orch.LoadSnapshot(ctxTimeout, originVmID, vmID, snap)
 	if err != nil {
 		logger.WithError(err).Error("failed to load VM")
 		return nil, err

ctriface/Makefile

@@ -23,14 +23,17 @@
 EXTRAGOARGS:=-v -race -cover
 EXTRATESTFILES:=iface_test.go iface.go orch_options.go orch.go
 BENCHFILES:=bench_test.go iface.go orch_options.go orch.go
-# User-level page faults are temporarily disabled (gh-807)
-# WITHUPF:=-upf
-# WITHLAZY:=-lazy
-WITHUPF:=
-WITHLAZY:=
+WITHUPF:=-upf
+WITHLAZY:=-lazy
 GOBENCH:=-v -timeout 1500s
 CTRDLOGDIR:=/tmp/ctrd-logs
 
+debug:
+	./../scripts/clean_fcctr.sh
+	sudo mkdir -m777 -p $(CTRDLOGDIR) && sudo env "PATH=$(PATH)" /usr/local/bin/firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>$(CTRDLOGDIR)/ctriface_log.out 2>$(CTRDLOGDIR)/ctriface_log.err &
+	sudo env "PATH=$(PATH)" go test $(EXTRATESTFILES) $(EXTRAGOARGS) -args $(WITHUPF)
+	./../scripts/clean_fcctr.sh
+
 test:
 	./../scripts/clean_fcctr.sh
 	sudo mkdir -m777 -p $(CTRDLOGDIR) && sudo env "PATH=$(PATH)" /usr/local/bin/firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>$(CTRDLOGDIR)/ctriface_log.out 2>$(CTRDLOGDIR)/ctriface_log.err &

ctriface/failing_test.go

@@ -22,62 +22,49 @@
 
 package ctriface
 
-import (
-	"context"
-	"os"
-	"testing"
-	"time"
+// func TestStartSnapStop(t *testing.T) {
+// 	// BROKEN BECAUSE StopVM does not work yet.
+// 	// t.Skip("skipping failing test")
+// 	log.SetFormatter(&log.TextFormatter{
+// 		TimestampFormat: ctrdlog.RFC3339NanoFixed,
+// 		FullTimestamp:   true,
+// 	})
+// 	//log.SetReportCaller(true) // FIXME: make sure it's false unless debugging
 
-	ctrdlog "github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/namespaces"
-	log "github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/require"
-	"github.com/vhive-serverless/vhive/snapshotting"
-)
+// 	log.SetOutput(os.Stdout)
 
-func TestStartSnapStop(t *testing.T) {
-	// BROKEN BECAUSE StopVM does not work yet.
-	t.Skip("skipping failing test")
-	log.SetFormatter(&log.TextFormatter{
-		TimestampFormat: ctrdlog.RFC3339NanoFixed,
-		FullTimestamp:   true,
-	})
-	//log.SetReportCaller(true) // FIXME: make sure it's false unless debugging
+// 	log.SetLevel(log.DebugLevel)
 
-	log.SetOutput(os.Stdout)
+// 	testTimeout := 120 * time.Second
+// 	ctx, cancel := context.WithTimeout(namespaces.WithNamespace(context.Background(), namespaceName), testTimeout)
+// 	defer cancel()
 
-	log.SetLevel(log.DebugLevel)
+// 	orch := NewOrchestrator("devmapper", "", WithTestModeOn(true))
 
-	testTimeout := 120 * time.Second
-	ctx, cancel := context.WithTimeout(namespaces.WithNamespace(context.Background(), namespaceName), testTimeout)
-	defer cancel()
+// 	vmID := "2"
 
-	orch := NewOrchestrator("devmapper", "", WithTestModeOn(true))
+// 	_, _, err := orch.StartVM(ctx, vmID, testImageName)
+// 	require.NoError(t, err, "Failed to start VM")
 
-	vmID := "2"
+// 	err = orch.PauseVM(ctx, vmID)
+// 	require.NoError(t, err, "Failed to pause VM")
 
-	_, _, err := orch.StartVM(ctx, vmID, testImageName)
-	require.NoError(t, err, "Failed to start VM")
+// 	snap := snapshotting.NewSnapshot(vmID, "/fccd/snapshots", testImageName)
+// 	err = orch.CreateSnapshot(ctx, vmID, snap)
+// 	require.NoError(t, err, "Failed to create snapshot of VM")
 
-	err = orch.PauseVM(ctx, vmID)
-	require.NoError(t, err, "Failed to pause VM")
+// 	err = orch.StopSingleVM(ctx, vmID)
+// 	require.NoError(t, err, "Failed to stop VM")
 
-	snap := snapshotting.NewSnapshot(vmID, "/fccd/snapshots", testImageName)
-	err = orch.CreateSnapshot(ctx, vmID, snap)
-	require.NoError(t, err, "Failed to create snapshot of VM")
+// 	_, _, err = orch.LoadSnapshot(ctx, "1", vmID, snap)
+// 	require.NoError(t, err, "Failed to load snapshot of VM")
 
-	err = orch.StopSingleVM(ctx, vmID)
-	require.NoError(t, err, "Failed to stop VM")
+// 	_, err = orch.ResumeVM(ctx, vmID)
+// 	require.NoError(t, err, "Failed to resume VM")
 
-	_, _, err = orch.LoadSnapshot(ctx, vmID, snap)
-	require.NoError(t, err, "Failed to load snapshot of VM")
+// 	err = orch.StopSingleVM(ctx, vmID)
+// 	require.NoError(t, err, "Failed to stop VM")
 
-	_, err = orch.ResumeVM(ctx, vmID)
-	require.NoError(t, err, "Failed to resume VM")
-
-	err = orch.StopSingleVM(ctx, vmID)
-	require.NoError(t, err, "Failed to stop VM")
-
-	_ = snap.Cleanup()
-	orch.Cleanup()
-}
+// 	_ = snap.Cleanup()
+// 	orch.Cleanup()
+// }