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

core: fix some nits #9654

Merged
merged 2 commits into from
Jan 26, 2022
Merged

core: fix some nits #9654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e31e4b4
core: print the stdout on errors
leseb Jan 26, 2022
58c175d
core: add a break line before printing the ceph config
leseb Jan 26, 2022
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
2 changes: 1 addition & 1 deletion pkg/daemon/ceph/client/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ func WriteCephConfig(context *clusterd.Context, clusterInfo *ClusterInfo) error
}
dst, err := ioutil.ReadFile(DefaultConfigFilePath())
if err == nil {
logger.Debugf("config file @ %s: %s", DefaultConfigFilePath(), dst)
logger.Debugf("config file @ %s:\n%s", DefaultConfigFilePath(), dst)
} else {
logger.Warningf("wrote and copied config file but failed to read it back from %s for logging. %v", DefaultConfigFilePath(), err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/ceph/client/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func getCephMonVersionString(context *clusterd.Context, clusterInfo *ClusterInfo
args := []string{"version"}
buf, err := NewCephCommand(context, clusterInfo, args).Run()
if err != nil {
return "", errors.Wrap(err, "failed to run 'ceph version'")
return "", errors.Wrapf(err, "failed to run 'ceph version'. %s", string(buf))
}
output := string(buf)
logger.Debug(output)
Expand Down