WIP

Signed-off-by: Georgiy Lebedev <lebedev.gk@phystech.edu>
vhive-serverless · Sep 12, 2023 · 2001bcd · 2001bcd
1 parent 5819c5d
commit 2001bcd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/ctriface/Makefile b/ctriface/Makefile
@@ -41,22 +41,22 @@ test:
 	./../scripts/clean_fcctr.sh
 
 test-man:
+#	./../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_noupf_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_noupf_man_travis.err &
+#	sudo env "PATH=$(PATH)" go test $(EXTRAGOARGS) -run TestSnapLoad
+#	./../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_upf_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_upf_man_travis.err &
+#	sudo env "PATH=$(PATH)" go test $(EXTRAGOARGS) -run TestSnapLoad -args $(WITHUPF)
+#	./../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_lazy_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_lazy_man_travis.err &
+#	sudo env "PATH=$(PATH)" go test $(EXTRAGOARGS) -run TestSnapLoad -args $(WITHUPF) $(WITHLAZY)
 	./../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_noupf_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_noupf_man_travis.err &
-	sudo env "PATH=$(PATH)" go test $(EXTRAGOARGS) -run TestSnapLoad
-	./../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_upf_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_upf_man_travis.err &
-	sudo env "PATH=$(PATH)" go test $(EXTRAGOARGS) -run TestSnapLoad -args $(WITHUPF)
-	./../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_lazy_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_lazy_man_travis.err &
-	sudo env "PATH=$(PATH)" go test $(EXTRAGOARGS) -run TestSnapLoad -args $(WITHUPF) $(WITHLAZY)
-	./../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_noupf_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_noupf_man_travis.err &
+	sudo mkdir -m777 -p $(CTRDLOGDIR) && sudo env "PATH=$(PATH)" /usr/local/bin/firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>$(CTRDLOGDIR)/ctriface_log_remote_snap_create_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_remote_snap_create_man_travis.err &
 	# Creates a remote snapshot.
 	sudo env "PATH=$(PATH)" go test $(EXTRAGOARGS) -run TestRemoteSnapCreate
 	# Cleans up the node.
 	./../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_noupf_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_noupf_man_travis.err &
+	sudo mkdir -m777 -p $(CTRDLOGDIR) && sudo env "PATH=$(PATH)" /usr/local/bin/firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>$(CTRDLOGDIR)/ctriface_log_remote_snap_load_man_travis.out 2>$(CTRDLOGDIR)/ctriface_log_remote_snap_load_man_travis.err &
 	# Loads the remote snapshot.
 	sudo env "PATH=$(PATH)" go test $(EXTRAGOARGS) -run TestRemoteSnapLoad
 	./../scripts/clean_fcctr.sh

diff --git a/ctriface/manual_cleanup_test.go b/ctriface/manual_cleanup_test.go
@@ -416,6 +416,9 @@ func TestRemoteSnapCreate(t *testing.T) {
 	vmID := "37"
 	revision := "myrev-37"
 
+	err := os.MkdirAll(remoteSnapshotsDir, 0755)
+	require.NoError(t, err, "Failed to create remote snapshots directory")
+
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
@@ -424,13 +427,14 @@ func TestRemoteSnapCreate(t *testing.T) {
 		WithLazyMode(*isLazyMode),
 	)
 
-	_, _, err := orch.StartVM(ctx, vmID, testImageName)
+	_, _, err = orch.StartVM(ctx, vmID, testImageName)
 	require.NoError(t, err, "Failed to start VM")
 
 	err = orch.PauseVM(ctx, vmID)
 	require.NoError(t, err, "Failed to pause VM")
 
 	snap := snapshotting.NewSnapshot(revision, remoteSnapshotsDir, testImageName)
+	_ = snap.Cleanup()
 	err = snap.CreateSnapDir()
 	require.NoError(t, err, "Failed to create remote snapshots directory")
 
@@ -462,8 +466,11 @@ func TestRemoteSnapLoad(t *testing.T) {
 	ctx, cancel := context.WithTimeout(namespaces.WithNamespace(context.Background(), namespaceName), testTimeout)
 	defer cancel()
 
-	vmID := "38"
-	revision := "myrev-38"
+	vmID := "37"
+	revision := "myrev-37"
+
+	_, err := os.Stat(remoteSnapshotsDir)
+	require.NoError(t, err, "Failed to stat remote snapshots directory")
 
 	orch := NewOrchestrator(
 		"devmapper",
@@ -473,15 +480,7 @@ func TestRemoteSnapLoad(t *testing.T) {
 		WithLazyMode(*isLazyMode),
 	)
 
-	_, _, err := orch.StartVM(ctx, vmID, testImageName)
-	require.NoError(t, err, "Failed to start VM")
-
-	err = orch.PauseVM(ctx, vmID)
-	require.NoError(t, err, "Failed to pause VM")
-
 	snap := snapshotting.NewSnapshot(revision, remoteSnapshotsDir, testImageName)
-	_, err = os.Stat(remoteSnapshotsDir)
-	require.NoError(t, err, "Failed to stat remote snapshots directory")
 
 	_, _, err = orch.LoadSnapshot(ctx, vmID, snap)
 	require.NoError(t, err, "Failed to load remote snapshot of VM")