-
Notifications
You must be signed in to change notification settings - Fork 1.1k
improve the irqbalance restore flow #6388
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.
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
Changes from all commits
e21dd08
3774df8
b267ed7
e158549
b74d76c
1a488f5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,6 +124,8 @@ const ( | |
| const ( | ||
| // DefaultIrqBalanceConfigFile default irqbalance service configuration file path | ||
| DefaultIrqBalanceConfigFile = "/etc/sysconfig/irqbalance" | ||
| // DefaultIrqBalanceConfigRestoreFile contains the banned cpu mask configuration to restore. Name due to backward compatibility. | ||
| DefaultIrqBalanceConfigRestoreFile = "/etc/sysconfig/orig_irq_banned_cpus" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would expect this config option would mean we remove the hard-coded one in
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. also, given the name of the file, I wouldn't expect it to be a restore file. Is this file's name/format documented anywhere?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this PR provides an alternative param for the user to have more control over the restore process while keeping the already working way to do it, so it will keep the exact same behaviour if the user do not give the new option.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's true. We keep the filename originally added back in time for full backward compatibility. |
||
| ) | ||
|
|
||
| // This structure is necessary to fake the TOML tables when parsing, | ||
|
|
@@ -410,6 +412,10 @@ type RuntimeConfig struct { | |
| // EnablePodEvents specifies if the container pod-level events should be generated to optimize the PLEG at Kubelet. | ||
| EnablePodEvents bool `toml:"enable_pod_events"` | ||
|
|
||
| // IrqBalanceConfigRestoreFile is the irqbalance service banned CPU list to restore. | ||
| // If empty, no restoration attempt will be done. | ||
| IrqBalanceConfigRestoreFile string `toml:"irqbalance_config_restore_file"` | ||
|
|
||
| // seccompConfig is the internal seccomp configuration | ||
| seccompConfig *seccomp.Config | ||
|
|
||
|
|
@@ -792,34 +798,35 @@ func DefaultConfig() (*Config, error) { | |
| Runtimes: Runtimes{ | ||
| defaultRuntime: defaultRuntimeHandler(), | ||
| }, | ||
| SELinux: selinuxEnabled(), | ||
| ApparmorProfile: apparmor.DefaultProfile, | ||
| BlockIOConfigFile: DefaultBlockIOConfigFile, | ||
| IrqBalanceConfigFile: DefaultIrqBalanceConfigFile, | ||
| RdtConfigFile: rdt.DefaultRdtConfigFile, | ||
| CgroupManagerName: cgroupManager.Name(), | ||
| PidsLimit: DefaultPidsLimit, | ||
| ContainerExitsDir: containerExitsDir, | ||
| ContainerAttachSocketDir: conmonconfig.ContainerAttachSocketDir, | ||
| MinimumMappableUID: -1, | ||
| MinimumMappableGID: -1, | ||
| LogSizeMax: DefaultLogSizeMax, | ||
| CtrStopTimeout: defaultCtrStopTimeout, | ||
| DefaultCapabilities: capabilities.Default(), | ||
| LogLevel: "info", | ||
| HooksDir: []string{hooks.DefaultDir}, | ||
| CDISpecDirs: cdi.DefaultSpecDirs, | ||
| NamespacesDir: defaultNamespacesDir, | ||
| DropInfraCtr: true, | ||
| SeccompUseDefaultWhenEmpty: seccompConfig.UseDefaultWhenEmpty(), | ||
| seccompConfig: seccomp.New(), | ||
| apparmorConfig: apparmor.New(), | ||
| blockioConfig: blockio.New(), | ||
| cgroupManager: cgroupManager, | ||
| deviceConfig: device.New(), | ||
| namespaceManager: nsmgr.New(defaultNamespacesDir, ""), | ||
| rdtConfig: rdt.New(), | ||
| ulimitsConfig: ulimits.New(), | ||
| SELinux: selinuxEnabled(), | ||
| ApparmorProfile: apparmor.DefaultProfile, | ||
| BlockIOConfigFile: DefaultBlockIOConfigFile, | ||
| IrqBalanceConfigFile: DefaultIrqBalanceConfigFile, | ||
| RdtConfigFile: rdt.DefaultRdtConfigFile, | ||
| CgroupManagerName: cgroupManager.Name(), | ||
| PidsLimit: DefaultPidsLimit, | ||
| ContainerExitsDir: containerExitsDir, | ||
| ContainerAttachSocketDir: conmonconfig.ContainerAttachSocketDir, | ||
| MinimumMappableUID: -1, | ||
| MinimumMappableGID: -1, | ||
| LogSizeMax: DefaultLogSizeMax, | ||
| CtrStopTimeout: defaultCtrStopTimeout, | ||
| DefaultCapabilities: capabilities.Default(), | ||
| LogLevel: "info", | ||
| HooksDir: []string{hooks.DefaultDir}, | ||
| CDISpecDirs: cdi.DefaultSpecDirs, | ||
| NamespacesDir: defaultNamespacesDir, | ||
| DropInfraCtr: true, | ||
| SeccompUseDefaultWhenEmpty: seccompConfig.UseDefaultWhenEmpty(), | ||
| IrqBalanceConfigRestoreFile: DefaultIrqBalanceConfigRestoreFile, | ||
| seccompConfig: seccomp.New(), | ||
| apparmorConfig: apparmor.New(), | ||
| blockioConfig: blockio.New(), | ||
| cgroupManager: cgroupManager, | ||
| deviceConfig: device.New(), | ||
| namespaceManager: nsmgr.New(defaultNamespacesDir, ""), | ||
| rdtConfig: rdt.New(), | ||
| ulimitsConfig: ulimits.New(), | ||
| }, | ||
| ImageConfig: ImageConfig{ | ||
| DefaultTransport: "docker://", | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.