Skip to content

[gcs.test] update scratch space cleanup order #1794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
helsaawy merged 1 commit into from
May 30, 2023
Merged

[gcs.test] update scratch space cleanup order #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions scripts/Test-LCOW-UVM.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ param (

# gcs test/container options

# we can no longer specify the guest/destination path for SCSI mounts, so hope the rootfs is the first
# path to be SCSI-mounted
[string]
$ContainerRootFSMount = '/run/rootfs',
$ContainerRootFSMount = '/run/mounts/scsi/m0',

[string]
$ContainerRootFSPath = (Join-Path $BootFilesPath 'rootfs.vhd'),
Expand All @@ -79,10 +81,10 @@ $UVMBootPath = Resolve-Path $UVMBootPath

$shell = ( $Action -eq 'Shell' )

$date = Get-Date
if ( $shell ) {
$cmd = 'ash'
} else {
$date = Get-Date
$waitfiles = "$ContainerRootFSMount"
$gcspath = 'gcs.test'
if ( -not $SkipGCSTestMount ) {
Expand Down Expand Up @@ -124,7 +126,7 @@ $boot = "$UVMBootPath -gcs lcow " + `
"-boot-files-path $BootFilesPath " + `
"-root-fs-type $BootFSType " + `
'-kernel-file vmlinux ' + `
"-mount-scsi `"$ContainerRootFSPath,$ContainerRootFSMount`" "
"-mount-scsi `"$ContainerRootFSPath`" "

if ( -not $SkipGCSTestMount ) {
$boot += "-share `"$GCSTestPath,$GCSTestMount`" "
Expand Down
4 changes: 1 addition & 3 deletions test/gcs/container_bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ func BenchmarkContainerCreate(b *testing.B) {
// create launches background go-routines
// so kill container to end those and avoid future perf hits
killContainer(ctx, b, c)
deleteContainer(ctx, b, c)
removeContainer(ctx, b, host, id)
unmountRootfs(ctx, b, scratch)
cleanupContainer(ctx, b, host, c)
}
}

Expand Down
12 changes: 7 additions & 5 deletions test/gcs/helper_container_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package gcs

import (
"context"
"os"
"path/filepath"
"syscall"
"testing"
Expand Down Expand Up @@ -34,7 +33,8 @@ const tailNull = "tail -f /dev/null"

// Creates an overlay mount, and then a container using that mount that runs until stopped.
// The container is created on its own, and not associated with a sandbox pod, and is therefore not CRI compliant.
// [unmountRootfs] is added to the test cleanup.
//
// [unmountRootfs] must be called on the scratch directory before deleting the container.
func createStandaloneContainer(ctx context.Context, tb testing.TB, host *hcsv2.Host, id string, extra ...ctrdoci.SpecOpts) *hcsv2.Container {
tb.Helper()
ctx = namespaces.WithNamespace(ctx, testoci.DefaultNamespace)
Expand All @@ -51,6 +51,8 @@ func createStandaloneContainer(ctx context.Context, tb testing.TB, host *hcsv2.H
OCISpecification: s,
}

// should be called before the container is deleted, but call it again incase the test errors before
// the container is created/cleanup is scheduled
tb.Cleanup(func() {
unmountRootfs(ctx, tb, scratch)
})
Expand Down Expand Up @@ -171,6 +173,9 @@ func deleteContainer(ctx context.Context, tb testing.TB, c *hcsv2.Container) {

func cleanupContainer(ctx context.Context, tb testing.TB, host *hcsv2.Host, c *hcsv2.Container) {
tb.Helper()
// assume scratch space was created by [mountRootfs]
scratch := filepath.Join(guestpath.LCOWRootPrefixInUVM, c.ID())
unmountRootfs(ctx, tb, scratch)
deleteContainer(ctx, tb, c)
removeContainer(ctx, tb, host, c.ID())
}
Expand Down Expand Up @@ -257,9 +262,6 @@ func unmountRootfs(ctx context.Context, tb testing.TB, path string) {
if err := storage.UnmountAllInPath(ctx, path, true); err != nil {
tb.Fatalf("could not unmount container rootfs: %v", err)
}
if err := os.RemoveAll(path); err != nil {
tb.Fatalf("could not remove container directory: %v", err)
}
}

//
Expand Down