* refs/pull/20575/head:
mds: set journaler iohint correctly when mds daemon going to active
Reviewed-by: dongdong tao <tdd21151186@gmail.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
* refs/pull/20615/head:
mds: modify help info of dump_historic_ops and dump_historic_ops_by_duration
mds:fix typo in MDSRank
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
It's possible that we successfully set active_con *and* time out the
cond WaitUntil. Only set the error if we don't have a connection; if we
set it *and* time out then let's call it success.
Signed-off-by: Sage Weil <sage@redhat.com>
The keyfile arg might be - (stdin), which we can only read once. Ensure
that we consume it once by intercepting the CLI value early and inserting
the value into the 'key' option.
This robs future code of the knowledge that the key came from --keyfile
and not --key, but avoids the issue of multiple users (notably, KeyRing.cc
and the OSD mkfs code).
Remove the - special case from OSD at the same time, since it can no
longer be reached (unless something other than the CLI specified '-', but
neither ceph.conf nor the mon config make sense here).
Signed-off-by: Sage Weil <sage@redhat.com>
Common_init_finish does start_service_thread and does
set_safe_to_start_threads() on the cct, which switches us to 'runtime'
mode where we can't accept many config options. Do that *after* we fetch
our config from the mon so that we can accept+set runtime options (and
not complain to stderr about it).
Signed-off-by: Sage Weil <sage@redhat.com>
If we are looking at a new value from the mon and comparing it to what we
already have active, compare the non-meta-substituted form. This way a
value from the mon that can't update at runtime but we have already set to
the same value will not be falsely flagged as ignored.
Signed-off-by: Sage Weil <sage@redhat.com>
The normal timeouts automatically apply during the authenticate() stage,
but not to the explicit wait for a config. If we don't get that quickly
we shoudl retry another monitor because it is possible we will connect to
an out-of-quorum (or otherwise unresponsive) mon.
Signed-off-by: Sage Weil <sage@redhat.com>
Some of these cases make sense to fetch mon configs, but we are deprecating
ceph-disk anyway, and the tests currently make use of ceph-disk in places
that do not have a mon_host defined via a ceph.conf or other environment.
This avoids breaking those test cases without any real impact on users
(which will either use ceph-volume or presumably remain in a legacy config
environment).
Signed-off-by: Sage Weil <sage@redhat.com>
In order to get mon configs we need to authenticate as somebody.
Infer it from the data directory.
Note that this won't work for --op mkfs. Those users need to pass
--no-mon-config or -n.
Signed-off-by: Sage Weil <sage@redhat.com>
Install the key before trying to use it for mkfs. Among other things
this means the osd can fetch it's config from the mon before doing the
mkfs step.
Signed-off-by: Sage Weil <sage@redhat.com>
More importantly, the set of non-authentication operations that are allowed
is more restricted: auth messages, getting monmap, ping.
Signed-off-by: Sage Weil <sage@redhat.com>
Authentication is orthogonal to the caps; the client might have no
capabilities but still be authenticated such that we know *who* it is.
Signed-off-by: Sage Weil <sage@redhat.com>
