From 8f69139e70203ceb0e1a8472f0cdf7a8d4278a11 Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Tue, 23 May 2023 16:07:09 -0700 Subject: [PATCH] Add back filesystem type dimensions to benchmarks. Fixes a933719841fb ("Add FUSE dimension to gvisor macrobenchmarks."). PiperOrigin-RevId: 534591592 --- test/benchmarks/fs/fsbench/fsbench.go | 2 +- test/benchmarks/harness/util.go | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/benchmarks/fs/fsbench/fsbench.go b/test/benchmarks/fs/fsbench/fsbench.go index 3eac6977f..344188a26 100644 --- a/test/benchmarks/fs/fsbench/fsbench.go +++ b/test/benchmarks/fs/fsbench/fsbench.go @@ -64,7 +64,7 @@ type Variant struct { // TypicalVariants returns the typical full set of benchmark variants. func TypicalVariants() []Variant { variants := make([]Variant, 0, 8) - for _, filesys := range []harness.FileSystemType{harness.FuseFS} { + for _, filesys := range []harness.FileSystemType{harness.BindFS, harness.TmpFS, harness.RootFS, harness.FuseFS} { variants = append(variants, Variant{ clearCache: true, fsType: filesys, diff --git a/test/benchmarks/harness/util.go b/test/benchmarks/harness/util.go index a511ec06a..ee6ea2b81 100644 --- a/test/benchmarks/harness/util.go +++ b/test/benchmarks/harness/util.go @@ -110,16 +110,15 @@ func MakeMount(machine Machine, fsType FileSystemType, cu *cleanup.Cleanup) ([]m }) return mounts, target, nil case FuseFS: - mounts = append(mounts, []mount.Mount{ - { + mounts = append(mounts, + mount.Mount{ Target: target, Type: mount.TypeTmpfs, }, - { + mount.Mount{ Target: "/fuse", Type: mount.TypeTmpfs, - }, - }...) + }) return mounts, target, nil default: return mounts, "", fmt.Errorf("illegal mount type not supported: %v", fsType)