Skip to content

Bug 1708602: pkg/daemon: log cmd output on error #733

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
May 10, 2019
Merged

Bug 1708602: pkg/daemon: log cmd output on error #733

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
4 changes: 2 additions & 2 deletions pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,8 +853,8 @@ func (dn *Daemon) CheckStateOnBoot() error {
if err := dn.nodeWriter.SetDone(dn.kubeClient.CoreV1().Nodes(), dn.nodeLister, dn.name, state.pendingConfig.GetName()); err != nil {
return errors.Wrap(err, "error setting node's state to Done")
}
if err := dn.storePendingState(state.pendingConfig, 0); err != nil {
return err
if out, err := dn.storePendingState(state.pendingConfig, 0); err != nil {
return errors.Wrapf(err, "failed to reset pending config: %s", string(out))
}

state.currentConfig = state.pendingConfig
Expand Down
12 changes: 6 additions & 6 deletions pkg/daemon/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ func (dn *Daemon) updateOSAndReboot(newConfig *mcfgv1.MachineConfig) (retErr err
return err
}

if err := dn.storePendingState(newConfig, 1); err != nil {
return errors.Wrap(err, "failed to log pending config")
if out, err := dn.storePendingState(newConfig, 1); err != nil {
return errors.Wrapf(err, "failed to log pending config: %s", string(out))
}
defer func() {
if retErr != nil {
if err := dn.storePendingState(newConfig, 0); err != nil {
retErr = errors.Wrapf(retErr, "error rolling back pending config %v", err)
if out, err := dn.storePendingState(newConfig, 0); err != nil {
retErr = errors.Wrapf(retErr, "error rolling back pending config %v: %s", err, string(out))
return
}
}
Expand Down Expand Up @@ -724,7 +724,7 @@ func (dn *Daemon) getPendingState() (string, error) {
return entry.Message, nil
}

func (dn *Daemon) storePendingState(pending *mcfgv1.MachineConfig, isPending int) error {
func (dn *Daemon) storePendingState(pending *mcfgv1.MachineConfig, isPending int) ([]byte, error) {
logger := exec.Command("logger", "--journald")

var pendingState bytes.Buffer
Expand All @@ -734,7 +734,7 @@ BOOT_ID=%s
PENDING=%d`, pendingStateMessageID, pending.GetName(), dn.bootID, isPending)))

logger.Stdin = &pendingState
return logger.Run()
return logger.CombinedOutput()
}

// Log a message to the systemd journal as well as our stdout
Expand Down