Patrick Donnelly [Mon, 11 Jan 2021 18:12:17 +0000 (10:12 -0800)]
Merge PR #38640 into master
* refs/pull/38640/head:
qa: add test for reserved keyword feature
qa: use no client for required client feature tests
mds: do not allow setting a reserved feature by name
mds: return sv for efficiency
Reviewed-by: Jos Collin <jcollin@redhat.com> Reviewed-by: Rishabh Dave <ridave@redhat.com>
Patrick Donnelly [Mon, 11 Jan 2021 16:38:52 +0000 (08:38 -0800)]
Merge PR #38108 into master
* refs/pull/38108/head:
doc, man: man page for `cephfs-top` utility
doc: document `cephfs-top` utility
test: selftest for `cephfs-top` utility
spec, deb: package cephfs-top utility
cephfs-top: top(1) like utility for Ceph Filesystem
mgr/stats: include kernel version (for kclients) in `perf stats` command output
mgr/stats: include version with `perf stats` output
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sebastian Wagner [Mon, 11 Jan 2021 14:04:55 +0000 (15:04 +0100)]
Merge pull request #38141 from Daniel-Pivonka/nodeexporterpullauth
cephadm: fix podman failure to pull authenticated registry image from systemd unit
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com> Reviewed-by: Michael Fritch <mfritch@suse.com> Reviewed-by: Paul Cuzner <pcuzner@redhat.com> Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Mon, 11 Jan 2021 11:02:25 +0000 (12:02 +0100)]
Merge pull request #38615 from adk3798/haproxy-stuff
mgr/cephadm: HA for RGW endpoints
Reviewed-by: Daniel-Pivonka <dpivonka@redhat.com> Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com> Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
* refs/pull/38698/head:
client: fix the cache size check
client: add more detail info for the _put_inode debug log
client: skip putting inodes if map is empty
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Greg Farnum [Fri, 8 Jan 2021 22:17:07 +0000 (22:17 +0000)]
osd: osdmap: do not assert target_v when encoding in stretch mode
Again, this was an overly-strict safety check. It passed testing against
(even old) userspace clients, but the kernel clients don't have all the
same feature bits and so when encoding for them, we see lower target_v values
and assert out erroneously.
As before, monitors and OSDs that actually need to interpret this data
are gated on cluster entry, so we don't need this safety check here.
Daniel-Pivonka [Mon, 26 Oct 2020 18:34:39 +0000 (14:34 -0400)]
cephadm: HA for RGW endpoints
Cephadm deploying keepalived and HAproxy for providing High availability for RGW endpoints
Fixes: https://tracker.ceph.com/issues/45116 Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com> Signed-off-by: Adam King <adking@redhat.com> Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
* refs/pull/38664/head:
qa: bump scrub timeout
qa: move cephfs_ec_profile under cephfs
qa: do not use ec pools for default data pool
qa: skip check-counters for light workloads
qa: remove empty multimds suite
qa: merge multimds:verify with fs:verify
qa: merge multimds:thrash to fs:thrash
qa: remove dead multimds:basic
qa: move functional multimds tests to fs:functional
qa: migrate multimds workloads to fs:workloads
qa: only run valgrind on cephfs daemons
qa: stop testing filestore on cephfs suites
qa: load data pools before deleting fs
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> Tested-by: Patrick Donnelly <pdonnell@redhat.com>
* refs/pull/38693/head:
qa: execute scrubs only on rank 0
client: print debug information about resolved MDS
qa: let Client::resolve_mds lookup the rank
Varsha Rao [Tue, 8 Dec 2020 18:16:27 +0000 (23:46 +0530)]
mgr/volumes/nfs: remove 'ganesha-' prefix from cluster id
Orchestrator defines service name as "<service_type>.<service_id>". The ganesha
common config object name in orchestrator is "conf-<service_name>". Volume's
nfs plugin deploys nfs-ganesha clusters with 'ganesha' prefixed to cluster id
and common config object. It can cause unecessary issues in rook and cephadm.
So let's remove the prefix.
Kefu Chai [Thu, 7 Jan 2021 15:43:26 +0000 (23:43 +0800)]
doc: build mon_command_api.rst using a homebrew extension
so we can build the command doc using ReadTheDoc infra, without adding
the generated rst file to the source repo.
before this change, all the commands are ordered alphabetically. after
this change, command docs are generated by two directives, and are
ordered separately. we could restructure the directives and merge them.
but let's leave it for a future change if this is important.
for more details on writing sphinx directives, see
https://www.sphinx-doc.org/en/master/extdev/markupapi.html and
https://docutils.sourceforge.io/docs/howto/rst-directives.html
cephadm: silence "Failed to evict container" log msg
Right now, we're printing some evil looking messages in the log:
```
systemd[1]: Starting Ceph mgr.node2.ankmgz for ...
podman[32354]: Error: no container with name or ID ceph-... found: no such container
bash[32363]: Error: Failed to evict container: "": Failed to find container "ceph-..." in state: no container with name or ID ceph-... found: no such container
bash[32363]: Error: no container with ID or name "ceph-..." found: no such container
````
Also, the unit.run command already removes the container. No need
for ExecStartPre to do the same.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Jeff Layton [Wed, 6 Jan 2021 14:30:13 +0000 (09:30 -0500)]
mount.ceph: collect v2 addresses for non-legacy ms_mode options
The kclient recently had support for msgr2 merged, and with that we have
a new ms_mode mount option. The mount helper's support for autodiscovery
of mons currently always ignores v2 addresses.
Change the helper to look for the ms_mode in the provided options and if
it's set to anything but "legacy", have it collect v2 addresses instead
of v1 addrs. The default is still "legacy" so if the option is not
provided, we will still collect v1 addrs.
Fixes: https://tracker.ceph.com/issues/48765 Signed-off-by: Jeff Layton <jlayton@redhat.com>
Daniel-Pivonka [Tue, 17 Nov 2020 19:05:05 +0000 (14:05 -0500)]
cephadm: fix podman failure to pull authenticated registry image from systemd unit
have podman keep auth file in /var/lic/ceph/<fsid> becasue podman commands run from systemd do not have access to the default location and the default location is not consistant depending on the user logged in as, where your using sudo or not.
We should not link the dev guide form the user documentation. The user docs are already convoluted and hard to follow. Adding the dev guide is not helpful.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>