Skip to content

Move log statement to UpdateTuningArgs #3021

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
openshift-merge-robot merged 1 commit into from
Mar 22, 2022
Merged

Move log statement to UpdateTuningArgs #3021

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
14 changes: 9 additions & 5 deletions pkg/daemon/kernelargs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,14 @@ func parseTuningFile(tuningFilePath, cmdLinePath string) ([]types.TuneArgument,
}

// UpdateTuningArgs executes additions and removals of kernel tuning arguments
func UpdateTuningArgs(tuningFilePath, cmdLinePath string) (bool, error) {
func UpdateTuningArgs(tuningFilePath, cmdLinePath string) error {
if cmdLinePath == "" {
cmdLinePath = CmdLineFile
}
changed := false
additions, deletions, err := parseTuningFile(tuningFilePath, cmdLinePath)
if err != nil {
return changed, err
return err
}

// Execute additions
Expand All @@ -160,7 +160,7 @@ func UpdateTuningArgs(tuningFilePath, cmdLinePath string) (bool, error) {
changed = true
err := exec.Command("rpm-ostree", "kargs", fmt.Sprintf("--append=%s", toAdd.Key)).Run()
if err != nil {
return false, errors.Wrapf(err, "adding karg")
return fmt.Errorf("failed adding karg: %w", err)
}
} else {
panic("Not supported")
Expand All @@ -172,11 +172,15 @@ func UpdateTuningArgs(tuningFilePath, cmdLinePath string) (bool, error) {
changed = true
err := exec.Command("rpm-ostree", "kargs", fmt.Sprintf("--delete=%s", toDelete.Key)).Run()
if err != nil {
return false, errors.Wrapf(err, "deleting karg")
return fmt.Errorf("failed deleting karg: %w", err)
}
} else {
panic("Not supported")
}
}
return changed, nil

if changed {
glog.Info("Updated kernel tuning arguments")
}
return nil
}
6 changes: 1 addition & 5 deletions pkg/daemon/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,13 +592,9 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig) (retErr err

// Ideally we would want to update kernelArguments only via MachineConfigs.
// We are keeping this to maintain compatibility and OKD requirement.
tuningChanged, err := UpdateTuningArgs(KernelTuningFile, CmdLineFile)
if err != nil {
if err := UpdateTuningArgs(KernelTuningFile, CmdLineFile); err != nil {
return err
}
if tuningChanged {
glog.Info("Updated kernel tuning arguments")
}

if err := dn.storeCurrentConfigOnDisk(newConfig); err != nil {
return err
Expand Down