Skip to content
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

Jump to bottom

DebugBPFMapRepinEnabled -> false #2827

Merged
merged 1 commit into from May 24, 2021
Merged

DebugBPFMapRepinEnabled -> false #2827

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/config_params.go
View file
Open in desktop
Expand Up @@ -132,7 +132,7 @@ type Config struct {
DebugBPFCgroupV2 string `config:"string;;local"`
// DebugBPFMapRepinEnabled can be used to prevent Felix from repinning its BPF maps at startup. This is useful for
// testing with multiple Felix instances running on one host.
DebugBPFMapRepinEnabled bool `config:"bool;true;local"`
DebugBPFMapRepinEnabled bool `config:"bool;false;local"`

DatastoreType string `config:"oneof(kubernetes,etcdv3);etcdv3;non-zero,die-on-fail,local"`

Expand Down
4 changes: 0 additions & 4 deletions fv/infrastructure/felix.go
View file
Open in desktop
Expand Up @@ -117,10 +117,6 @@ func RunFelix(infra DatastoreInfra, id int, options TopologyOptions) *Felix {
log.Info("FELIX_FV_ENABLE_BPF=true but test manages BPF state itself, not using env var")
}

// Disable map repinning by default since BPF map names are global and we don't want our simulated instances to
// share maps.
envVars["FELIX_DebugBPFMapRepinEnabled"] = "false"

if CreateCgroupV2 {
envVars["FELIX_DEBUGBPFCGROUPV2"] = containerName
}
Expand Down