diff options
| author | Dan Mick <dan.mick@inktank.com> | 2013-07-16 18:45:25 -0700 |
|---|---|---|
| committer | Dan Mick <dan.mick@inktank.com> | 2013-07-16 23:00:06 -0700 |
| commit | c9297e35b1aad7e650532b420e460392bfb1aa15 (patch) | |
| tree | 07c70f6fe5bcab9df77c60f2425f61c74cb8f3f6 /src/mon/Monitor.cc | |
| parent | d45429b81ab9817284d6dca98077cb77b5e8280f (diff) | |
| download | ceph-wip-5634.tar.gz | |
ceph, config, auth: better messages on failure to open keyring/ceph.confwip-5634
If something as simple as file ownership is wrong, Ceph commands
and daemons can fail to run, and the diagnostics are not great.
Improve that for at least the specific cases of unopenable keyring and
ceph.conf files.
Fixes: #5634
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Diffstat (limited to 'src/mon/Monitor.cc')
| -rw-r--r-- | src/mon/Monitor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 9c23a825bd9..edf0af7fd81 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -3594,7 +3594,7 @@ int Monitor::mkfs(bufferlist& osdmapbl) KeyRing keyring; string keyring_filename; - if (!ceph_resolve_file_search(g_conf->keyring, keyring_filename)) { + if (ceph_resolve_file_search(g_conf->keyring, keyring_filename) != 0) { derr << "unable to find a keyring file on " << g_conf->keyring << dendl; return -ENOENT; } |