Skip to content

test(flag_optimizations): Add e2e tests for zonal bucket optimizations #4308

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

Open
vipnydav wants to merge 8 commits into
base: master
Choose a base branch
from
+451 −17
Open

test(flag_optimizations): Add e2e tests for zonal bucket optimizations #4308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
428ff5a
Disable unfinalized_objects in CI/CD pipeline
vipnydav Jan 21, 2026
27e8513
Fix formatting
vipnydav Jan 21, 2026
382c7a2
Retrigger CodeQL
vipnydav Jan 21, 2026
7289e77
Add kernel reader tests in optimization test
vipnydav Jan 21, 2026
138d377
Update Mount flags
vipnydav Jan 23, 2026
b011de3
Minor fixes
vipnydav Jan 23, 2026
4cdfa13
Address comments
vipnydav Jan 26, 2026
5cb5f56
Minor refactoring
vipnydav Jan 27, 2026
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
6 changes: 3 additions & 3 deletions internal/kernelparams/kernelparams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ func atomicFileWrite(kernelParamsFile string, data []byte) error {
return os.Rename(tempFile.Name(), kernelParamsFile)
}

// pathForParam returns the sysfs path for a given parameter.
func pathForParam(name ParamName, major, minor uint32) (string, error) {
// PathForParam returns the sysfs path for a given parameter.
func PathForParam(name ParamName, major, minor uint32) (string, error) {
switch name {
case MaxReadAheadKb:
return fmt.Sprintf("/sys/class/bdi/%d:%d/read_ahead_kb", major, minor), nil
Expand Down Expand Up @@ -159,7 +159,7 @@ func (c *KernelParamsConfig) applyDirectly(mountPoint string) {
return
}
for _, p := range c.Parameters {
path, err := pathForParam(p.Name, major, minor)
path, err := PathForParam(p.Name, major, minor)
if err != nil {
logger.Warnf("Unable to update setting %q to value %q for the mount point %q due to err: %v", p.Name, p.Value, mountPoint, err)
continue
Expand Down
2 changes: 1 addition & 1 deletion internal/kernelparams/kernelparams_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func TestPathForParam(t *testing.T) {
for _, tt := range tests {
t.Run(string(tt.name), func(t *testing.T) {

path, err := pathForParam(tt.name, tt.major, tt.minor)
path, err := PathForParam(tt.name, tt.major, tt.minor)

if tt.expectErr {
assert.Error(t, err)
Expand Down
56 changes: 43 additions & 13 deletions tools/integration_tests/flag_optimizations/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"log"
"os"
"path"
"strings"
"testing"

"cloud.google.com/go/storage"
Expand Down Expand Up @@ -81,15 +80,6 @@ func mustMountGCSFuseAndSetupTestDir(flags []string, ctx context.Context, storag
}
}

func overrideFilePathsInFlagSet(t *test_suite.TestConfig, GCSFuseTempDirPath string) {
for _, flags := range t.Configs {
for i := range flags.Flags {
// Iterate over the indices of the flags slice
flags.Flags[i] = strings.ReplaceAll(flags.Flags[i], "/gcsfuse-tmp", path.Join(GCSFuseTempDirPath, "gcsfuse-tmp"))
}
}
}

////////////////////////////////////////////////////////////////////////
// TestMain
////////////////////////////////////////////////////////////////////////
Expand All @@ -106,8 +96,8 @@ func TestMain(m *testing.M) {
cfg.FlagOptimizations[0].TestBucket = setup.TestBucket()
cfg.FlagOptimizations[0].GKEMountedDirectory = setup.MountedDirectory()
cfg.FlagOptimizations[0].LogFile = setup.LogFile()
// Initialize the slice to hold 6 specific test configurations
cfg.FlagOptimizations[0].Configs = make([]test_suite.ConfigItem, 5)
// Initialize the slice to hold 11 specific test configurations
cfg.FlagOptimizations[0].Configs = make([]test_suite.ConfigItem, 12)
cfg.FlagOptimizations[0].Configs[0].Run = "TestMountFails"
cfg.FlagOptimizations[0].Configs[0].Flags = []string{"--profile=unknown-profile"}
cfg.FlagOptimizations[0].Configs[0].Compatible = map[string]bool{"flat": true, "hns": true, "zonal": true}
Expand Down Expand Up @@ -140,6 +130,46 @@ func TestMain(m *testing.M) {
}
cfg.FlagOptimizations[0].Configs[4].Compatible = map[string]bool{"flat": true, "hns": false, "zonal": false}
cfg.FlagOptimizations[0].Configs[4].RunOnGKE = true

cfg.FlagOptimizations[0].Configs[5].Run = "TestZonalBucketOptimizations"
cfg.FlagOptimizations[0].Configs[5].Flags = []string{"--log-severity=trace"}
cfg.FlagOptimizations[0].Configs[5].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
cfg.FlagOptimizations[0].Configs[5].RunOnGKE = false

cfg.FlagOptimizations[0].Configs[6].Run = "TestZonalBucketOptimizations_ExplicitOverrides"
cfg.FlagOptimizations[0].Configs[6].Flags = []string{"--implicit-dirs --max-read-ahead-kb=2048 --max-background=50 --congestion-threshold=30 --log-severity=trace"}
cfg.FlagOptimizations[0].Configs[6].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
cfg.FlagOptimizations[0].Configs[6].RunOnGKE = false

cfg.FlagOptimizations[0].Configs[7].Run = "TestZonalBucketOptimizations_Dynamic"
cfg.FlagOptimizations[0].Configs[7].Flags = []string{"--log-severity=trace"}
cfg.FlagOptimizations[0].Configs[7].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
cfg.FlagOptimizations[0].Configs[7].RunOnGKE = false

cfg.FlagOptimizations[0].Configs[8].Run = "TestKernelReader_DefaultAndPrecedence"
cfg.FlagOptimizations[0].Configs[8].Flags = []string{
"--implicit-dirs --log-severity=trace",
"--implicit-dirs --log-severity=trace --cache-dir=/gcsfuse-tmp/TestKernelReader_DefaultAndPrecedence_FileCache",
"--implicit-dirs --log-severity=trace --enable-buffered-read=true",
"--implicit-dirs --log-severity=trace --enable-buffered-read=true --cache-dir=/gcsfuse-tmp/TestKernelReader_DefaultAndPrecedence_Both",
}
cfg.FlagOptimizations[0].Configs[8].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
cfg.FlagOptimizations[0].Configs[8].RunOnGKE = false

cfg.FlagOptimizations[0].Configs[9].Run = "TestFileCache_KernelReaderDisabled"
cfg.FlagOptimizations[0].Configs[9].Flags = []string{"--implicit-dirs --log-severity=trace --enable-kernel-reader=false --cache-dir=/gcsfuse-tmp/TestFileCache_KernelReaderDisabled"}
cfg.FlagOptimizations[0].Configs[9].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
cfg.FlagOptimizations[0].Configs[9].RunOnGKE = false

cfg.FlagOptimizations[0].Configs[10].Run = "TestBufferedReader_KernelReaderDisabled"
cfg.FlagOptimizations[0].Configs[10].Flags = []string{"--implicit-dirs --log-severity=trace --enable-kernel-reader=false --enable-buffered-read"}
cfg.FlagOptimizations[0].Configs[10].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
cfg.FlagOptimizations[0].Configs[10].RunOnGKE = false

cfg.FlagOptimizations[0].Configs[11].Run = "TestKernelReader_Dynamic"
cfg.FlagOptimizations[0].Configs[11].Flags = []string{"--implicit-dirs --log-severity=trace"}
cfg.FlagOptimizations[0].Configs[11].Compatible = map[string]bool{"flat": false, "hns": false, "zonal": true}
cfg.FlagOptimizations[0].Configs[11].RunOnGKE = false
}

testEnv.ctx = context.Background()
Expand All @@ -164,7 +194,7 @@ func TestMain(m *testing.M) {
// Set up test directory.
setup.SetUpTestDirForTestBucket(&testEnv.cfg)
// Override GKE specific paths with GCSFuse paths if running in GCE environment.
overrideFilePathsInFlagSet(&testEnv.cfg, setup.TestDir())
setup.OverrideFilePathsInFlagSet(&testEnv.cfg, setup.TestDir())

// Save mount and root directory variables.
testEnv.mountDir, testEnv.rootDir = setup.MntDir(), setup.MntDir()
Expand Down
Loading
Loading