Merge pull request #9656 from rook/mergify/bp/release-1.8/pr-9654

core: fix some nits (backport #9654)
rook · Jan 26, 2022 · 46293b5 · 46293b5
2 parents 9568850 + 50d2402
commit 46293b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/daemon/ceph/client/config.go b/pkg/daemon/ceph/client/config.go
@@ -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)
 	}

diff --git a/pkg/daemon/ceph/client/upgrade.go b/pkg/daemon/ceph/client/upgrade.go
@@ -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)