]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoPendingReleaseNotes: clarify deprecated
Sage Weil [Fri, 7 May 2021 15:01:57 +0000 (11:01 -0400)]
PendingReleaseNotes: clarify deprecated

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoPendingReleaseNotes: note breaking CLI changes
Sage Weil [Fri, 7 May 2021 14:58:45 +0000 (10:58 -0400)]
PendingReleaseNotes: note breaking CLI changes

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agodoc/cephadm/nfs: document nfs+ingress
Sage Weil [Thu, 6 May 2021 22:47:38 +0000 (18:47 -0400)]
doc/cephadm/nfs: document nfs+ingress

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites/rados/cephadm/smoke-roleless: test nfs, nfs + ingress
Sage Weil [Fri, 30 Apr 2021 15:37:51 +0000 (11:37 -0400)]
qa/suites/rados/cephadm/smoke-roleless: test nfs, nfs + ingress

Still missing a full client mount test, though!

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: take --ingress argument to 'nfs cluster create'
Sage Weil [Thu, 6 May 2021 22:47:27 +0000 (18:47 -0400)]
mgr/nfs: take --ingress argument to 'nfs cluster create'

It is likely that the rook/k8s variation of ingress will not take a
virtual_ip argument.  We want to make sure that ingress yes/no can be
specified independent of the virtual_ip.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: adjust debug output for device refresh
Sage Weil [Thu, 6 May 2021 18:37:14 +0000 (14:37 -0400)]
mgr/cephadm: adjust debug output for device refresh

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: ingress: fix log msg
Sage Weil [Thu, 6 May 2021 18:16:43 +0000 (14:16 -0400)]
mgr/cephadm: ingress: fix log msg

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: fix logging of config/placement errors
Sage Weil [Thu, 6 May 2021 18:16:38 +0000 (14:16 -0400)]
mgr/cephadm: fix logging of config/placement errors

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocommon/options: enable nfs module for new clusters
Sage Weil [Thu, 6 May 2021 15:21:49 +0000 (11:21 -0400)]
common/options: enable nfs module for new clusters

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocephadm: --stop-signal=SIGTERM
Sage Weil [Thu, 6 May 2021 14:57:46 +0000 (10:57 -0400)]
cephadm: --stop-signal=SIGTERM

haproxy's container image tells docker|podman to send SIGUSR1 for a "clean"
shutdown.  For NFS, the connections never close, so we will always hit the
podman|docker 10s timeout and get a SIGKILL.  That, in turn, causes haproxy
to exit with 143, and puts the systemd unit in a failed state.

This highlights a general problem(?) with stopping containers: if they don't
do it quickly then we'll end up in this error state.  We don't directly
address that here.

Avoid this problem by always stopping containers with SIGTERM.  In the
haproxy case, that means an immediate shutdown (no graceful drain of
open connections).  In theory we could do this only for haproxy with
NFS, but we can easily imagine RGW connections that don't close in 10s
either, and we don't want containers exiting in error state--we just
want the proxy to stop quickly.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/orchestrator: default nfs pool, namespaces
Sage Weil [Mon, 3 May 2021 15:48:45 +0000 (11:48 -0400)]
mgr/orchestrator: default nfs pool, namespaces

Apply nfs default pool (currently 'nfs-ganesha'), and default the
namespace to the service_id.

There is no practical reason for users to ever need to change this, and
requiring them to provide this informaiton at config/apply time just
complicates life.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: nfs: create pool if it doesn't yet exist
Sage Weil [Mon, 3 May 2021 15:42:13 +0000 (11:42 -0400)]
mgr/cephadm: nfs: create pool if it doesn't yet exist

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agodoc/cephadm/nfs: update
Sage Weil [Wed, 5 May 2021 16:26:28 +0000 (12:26 -0400)]
doc/cephadm/nfs: update

- leave off pool/ns, since they should almost never be necessary.
- add port

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: change 'nfs cluster info'
Sage Weil [Tue, 4 May 2021 17:10:14 +0000 (13:10 -0400)]
mgr/nfs: change 'nfs cluster info'

- include the virtual_ip and port at top level
- move backend server list into a sub-item
- include (haproxy) monitoring port

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: take optional virtual_ip for deploying ingress
Sage Weil [Tue, 4 May 2021 17:09:38 +0000 (13:09 -0400)]
mgr/nfs: take optional virtual_ip for deploying ingress

For 'nfs cluster create', optionally take a virtual_ip to deploy ingress.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: remove 'nfs cluster update'
Sage Weil [Wed, 5 May 2021 16:59:44 +0000 (12:59 -0400)]
mgr/nfs: remove 'nfs cluster update'

This command is very awkward to implement unless all service spec fields
are always required.  That will soon mean both the placement *and*
virtual_ip (if any), making it much less useful for a human to make use
of.

Instead, let them update yaml, or adjust the nfs and/or ingress specs
directly.  I don't think this command is needed.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: factor out ganesha pool creation
Sage Weil [Wed, 5 May 2021 16:34:56 +0000 (12:34 -0400)]
mgr/nfs: factor out ganesha pool creation

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: delete -> rm for CLI
Sage Weil [Tue, 4 May 2021 17:02:23 +0000 (13:02 -0400)]
mgr/nfs: delete -> rm for CLI

The rest of the CLI uses 'rm' in place of 'remove' or 'delete', so let's
deprecate 'delete' and add 'rm'.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: add some type annotations
Sage Weil [Wed, 5 May 2021 16:57:17 +0000 (12:57 -0400)]
mgr/nfs: add some type annotations

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agopython-common: fix IngressSpec yaml dump
Sage Weil [Wed, 5 May 2021 19:44:44 +0000 (15:44 -0400)]
python-common: fix IngressSpec yaml dump

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: ingress: remove eth0 default
Sage Weil [Mon, 3 May 2021 15:02:24 +0000 (11:02 -0400)]
mgr/cephadm: ingress: remove eth0 default

Better to raise an error; eth0 will never be correct.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephadm: allow mounting volumes in shell
Sage Weil [Sun, 2 May 2021 22:08:52 +0000 (18:08 -0400)]
qa/tasks/cephadm: allow mounting volumes in shell

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocephadm: add -v arg to shell
Sage Weil [Sun, 2 May 2021 22:08:33 +0000 (18:08 -0400)]
cephadm: add -v arg to shell

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/vip: add 'vip.exec' task
Sage Weil [Fri, 30 Apr 2021 15:41:23 +0000 (11:41 -0400)]
qa/tasks/vip: add 'vip.exec' task

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/orchestrator: add --port arg to 'orch apply nfs'
Sage Weil [Fri, 30 Apr 2021 15:36:47 +0000 (11:36 -0400)]
mgr/orchestrator: add --port arg to 'orch apply nfs'

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: nfs: add purge
Sage Weil [Thu, 29 Apr 2021 14:43:57 +0000 (10:43 -0400)]
mgr/cephadm: nfs: add purge

Remove the grace object if we purge the service.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: ingress: support nfs
Sage Weil [Mon, 26 Apr 2021 19:29:45 +0000 (15:29 -0400)]
mgr/cephadm: ingress: support nfs

- use consistent hashing
- statically map across ranks
- disable backend checks so that clients don't move

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: do not reconfigure daemons on deleted services
Sage Weil [Mon, 26 Apr 2021 19:28:48 +0000 (15:28 -0400)]
mgr/cephadm: do not reconfigure daemons on deleted services

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: nfs: shell out to rados tool for conf creation
Sage Weil [Mon, 26 Apr 2021 18:54:38 +0000 (14:54 -0400)]
mgr/cephadm: nfs: shell out to rados tool for conf creation

This avoids any hangs due to rados.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: nfs: add rank to grace file from mgr module
Sage Weil [Mon, 26 Apr 2021 18:48:03 +0000 (14:48 -0400)]
mgr/cephadm: nfs: add rank to grace file from mgr module

Do the grace file manipulation from the mgr module.  For add, this isn't
especially important, but for remove it is very important.  Clean out
old ranks from the grace table before we record that the rank has been
purged from the rank_map.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: nfs: bind ganesha to appropriate ip:port
Sage Weil [Mon, 26 Apr 2021 13:17:31 +0000 (09:17 -0400)]
mgr/cephadm: nfs: bind ganesha to appropriate ip:port

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: enable ranked daemons for nfs
Sage Weil [Fri, 23 Apr 2021 19:33:23 +0000 (15:33 -0400)]
mgr/cephadm: enable ranked daemons for nfs

Use ranked daemons for NFS. Ganesha does not like it if multiple
instances start up with the same rank, but we need stable ranks so that
a rank can "fail over" to a new instance of a new daemon on another host
(with the same rank) for NFS client reclaim to work.

Specify a nodeid of '{service_name}.{rank}' for ganesha.

Include a unique id in the daemon_id just because this avoids some issues
with the create/destroy ordering, and because the daemon_id doesn't matter
much anymore since we are using a stable rank.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: support creation of daemons with ranks
Sage Weil [Fri, 23 Apr 2021 19:31:14 +0000 (15:31 -0400)]
mgr/cephadm: support creation of daemons with ranks

- we need to assign all names and update the rank_map before we start
creating daemons.
- if we are using ranks, we should delete old daemons first, and
fence them from the cluster (where possible).

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: make _plan show removed daemon names
Sage Weil [Fri, 23 Apr 2021 19:28:31 +0000 (15:28 -0400)]
mgr/cephadm: make _plan show removed daemon names

This is more informative than just the hostnames.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm/schedule: assign/map ranks
Sage Weil [Fri, 23 Apr 2021 19:28:13 +0000 (15:28 -0400)]
mgr/cephadm/schedule: assign/map ranks

If we are passed a rank_map, use it maintain one daemon per rank, where
the ranks are consecutive non-negative integers starting from 0.

A bit of refactoring in place() so that we only do the rank allocations
on slots we are going to use (no more than count).

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: add rank[_generation] properties
Sage Weil [Fri, 23 Apr 2021 19:25:58 +0000 (15:25 -0400)]
mgr/cephadm: add rank[_generation] properties

DaemonDescription
CephadmDaemonDeploySpec
DaemonPlacement
unit.meta
get_unique_name() (we include it in the daemon_id)

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm/inventory: store optional rank_map along with specs
Sage Weil [Fri, 23 Apr 2021 19:22:07 +0000 (15:22 -0400)]
mgr/cephadm/inventory: store optional rank_map along with specs

The rank_map is a bit of state to keep track of which ranks are
occupied by which generation and daemon_id.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: include service_name is generated DaemonDescription
Sage Weil [Fri, 23 Apr 2021 19:13:05 +0000 (15:13 -0400)]
mgr/cephadm: include service_name is generated DaemonDescription

This makes 'orch ls' match up daemosn to services (and probably cleans up
other bits and pieces) when the old daemon id -> service name calc code
can't do its thing.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/orchestrator: include service_name in DaemonDescription dump
Sage Weil [Fri, 23 Apr 2021 18:53:54 +0000 (14:53 -0400)]
mgr/orchestrator: include service_name in DaemonDescription dump

('orch ps')

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm/inventory: fix deleted check
Sage Weil [Fri, 23 Apr 2021 18:07:19 +0000 (14:07 -0400)]
mgr/cephadm/inventory: fix deleted check

Look in dict, not encoded JSON string

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: simplify
Sage Weil [Fri, 23 Apr 2021 15:17:14 +0000 (11:17 -0400)]
mgr/cephadm: simplify

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm/schedule: make placement shuffle deterministic
Sage Weil [Thu, 22 Apr 2021 22:42:00 +0000 (18:42 -0400)]
mgr/cephadm/schedule: make placement shuffle deterministic

hash(str) is non-deterministic, probably because it is using the internal
object ID or something and not the string content?

In any case, explicitly hash the string content and use that instead.

Also, sort the input pre-shuffle to ensure that variations in the original
host list ordering don't screw with the result.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: document CephadmService flags
Sage Weil [Thu, 22 Apr 2021 17:57:21 +0000 (13:57 -0400)]
mgr/cephadm: document CephadmService flags

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #41399 from idryomov/wip-mrun-if-posix
Kefu Chai [Wed, 19 May 2021 12:38:07 +0000 (20:38 +0800)]
Merge pull request #41399 from idryomov/wip-mrun-if-posix

mrun: avoid == in [ command

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41393 from rosinL/fix-50835
Kefu Chai [Wed, 19 May 2021 12:37:44 +0000 (20:37 +0800)]
Merge pull request #41393 from rosinL/fix-50835

common/crc32c_aarch64: fix crc32c unittest failed on aarch64

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #41388 into master
Sage Weil [Wed, 19 May 2021 11:57:20 +0000 (07:57 -0400)]
Merge PR #41388 into master

* refs/pull/41388/head:
cephadm: write config files as utf-8

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge PR #41286 into master
Sage Weil [Wed, 19 May 2021 11:55:30 +0000 (07:55 -0400)]
Merge PR #41286 into master

* refs/pull/41286/head:
qa/suites/orch/rook: disable centos for now
qa/suites/orch/rook/smoke: initial smoke suite
qa/tasks/rook: ROOK_HOSTPATH_REQUIRES_PRIVILEGED=true on centos
qa/tasks/rook: simplify shutdown
qa/tasks/rook: archive logs
qa/tasks/rook: more orderly cluster teardown
qa/tasks/rook: deploy ceph via rook on top of kubernetes
qa/tasks/kubeadm: install kubernetes with kubeadm
qa/suites: move rados/cephadm -> orch/cephadm; symlink
qa/tasks/cephadm: add whitespace between functions
qa/tasks/cephadm: clean up ctx.manager setup

Reviewed-by: Sébastien Han <seb@redhat.com>
4 years agoMerge PR #41370 into master
Sage Weil [Wed, 19 May 2021 11:52:17 +0000 (07:52 -0400)]
Merge PR #41370 into master

* refs/pull/41370/head:
mgr/cephadm: pin haproxy image to 2.3.z

Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #41345 from rhcs-dashboard/fix-CVE-2021-3509-master
Ernesto Puerta [Wed, 19 May 2021 11:43:42 +0000 (13:43 +0200)]
Merge pull request #41345 from rhcs-dashboard/fix-CVE-2021-3509-master

mgr/dashboard: fix cookie injection issue (CVE-2021-3509)

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agomrun: avoid == in [ command 41399/head
Ilya Dryomov [Wed, 19 May 2021 11:00:16 +0000 (13:00 +0200)]
mrun: avoid == in [ command

== operator is not supported in POSIX sh (e.g. dash):

  ./mrun: 24: [: unexpected operator

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge pull request #41104 from rhcs-dashboard/fix-ESOCKETTIMEDOUT-e2e-failure
Ernesto Puerta [Wed, 19 May 2021 10:41:33 +0000 (12:41 +0200)]
Merge pull request #41104 from rhcs-dashboard/fix-ESOCKETTIMEDOUT-e2e-failure

mgr/dashboard: fix ESOCKETTIMEDOUT E2E failure

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #41273 from rhcs-dashboard/update-frontend-deps
Ernesto Puerta [Wed, 19 May 2021 10:40:02 +0000 (12:40 +0200)]
Merge pull request #41273 from rhcs-dashboard/update-frontend-deps

mgr/dashboard: update frontend deps due to security vulnerabilities

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agocommon/crc32c_aarch64: fix crc32c unittest failed on aarch64 41393/head
luo rixin [Wed, 19 May 2021 02:27:18 +0000 (10:27 +0800)]
common/crc32c_aarch64: fix crc32c unittest failed on aarch64

On centos 8.2 for aarch64 with gcc 8.3, the complier will use
register v0 conflicting with the register v0 be usded in inline
asm code. Adding the related registers into clobber list to inform
complier avoiding the confict.

Fixes: https://tracker.ceph.com/issues/50835
Signed-off-by: luo rixin <luorixin@huawei.com>
4 years agocephadm: write config files as utf-8 41388/head
Sage Weil [Tue, 18 May 2021 12:23:36 +0000 (08:23 -0400)]
cephadm: write config files as utf-8

If we don't specify the encoding, python may use something like 'latin-1',
which cannot handle unicode characters.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #41390 from batrick/i50865
Kefu Chai [Wed, 19 May 2021 00:47:34 +0000 (08:47 +0800)]
Merge pull request #41390 from batrick/i50865

doc: use sphinx .dot include

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #41357 into master
Patrick Donnelly [Tue, 18 May 2021 20:43:28 +0000 (13:43 -0700)]
Merge PR #41357 into master

* refs/pull/41357/head:
mds: do not assert when receiving a unknow metric type

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge PR #41347 into master
Patrick Donnelly [Tue, 18 May 2021 20:42:47 +0000 (13:42 -0700)]
Merge PR #41347 into master

* refs/pull/41347/head:
mon,doc: deprecate CephFS min_compat_client
doc: add alternate_name cephfs feature to table

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
4 years agoMerge PR #41332 into master
Patrick Donnelly [Tue, 18 May 2021 20:42:09 +0000 (13:42 -0700)]
Merge PR #41332 into master

* refs/pull/41332/head:
mds: place the journaler pointer under the mds_lock

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #41171 into master
Patrick Donnelly [Tue, 18 May 2021 20:41:28 +0000 (13:41 -0700)]
Merge PR #41171 into master

* refs/pull/41171/head:
test: disable mirroring module for certain tests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #41097 into master
Patrick Donnelly [Tue, 18 May 2021 20:40:45 +0000 (13:40 -0700)]
Merge PR #41097 into master

* refs/pull/41097/head:
cephfs-mirror: allow connecting to local cluster using mon address

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
4 years agoMerge PR #40885 into master
Patrick Donnelly [Tue, 18 May 2021 20:36:05 +0000 (13:36 -0700)]
Merge PR #40885 into master

* refs/pull/40885/head:
doc: document cephfs-mirror configuration options
cephfs-mirror: use sensible mount timeout when mounting local/remote fs
test: add tests for settting mount timeout
pybind/cephfs: add interface to set mount timeout
libcephfs: add interface to set mount timeout

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #41371 into master
Patrick Donnelly [Tue, 18 May 2021 20:20:20 +0000 (13:20 -0700)]
Merge PR #41371 into master

* refs/pull/41371/head:
mds/Mutation: initialize MutationImpl object's initiated_at

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa/suites/orch/rook: disable centos for now 41286/head
Sage Weil [Tue, 18 May 2021 18:37:32 +0000 (13:37 -0500)]
qa/suites/orch/rook: disable centos for now

We are hitting an selinux denial:

type=AVC msg=audit(1621353663.595:6016): avc: denied { write } for pid=28812 comm="cephcsi" name="pids.max" dev="cgroup" ino=2933 scontext=system_u:system_r:container_t:s0:c43,c177 tcontext=system_u:object_r:cgroup_t:s0 tclass=file permissive=1

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites/orch/rook/smoke: initial smoke suite
Sage Weil [Fri, 14 May 2021 15:45:00 +0000 (10:45 -0500)]
qa/suites/orch/rook/smoke: initial smoke suite

- os: 18.04, 20.04, centos, centos+kubic
- nodes: 1 or 3
- rook: 1.6.2 or master
- k8s: 1.21 always (for now)
- net: calico always (flannel + centos is wonky)
- workload: none, rados bench

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/rook: ROOK_HOSTPATH_REQUIRES_PRIVILEGED=true on centos
Sage Weil [Tue, 18 May 2021 14:54:42 +0000 (09:54 -0500)]
qa/tasks/rook: ROOK_HOSTPATH_REQUIRES_PRIVILEGED=true on centos

This fixes OSD creation on centos.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/rook: simplify shutdown
Sage Weil [Tue, 18 May 2021 14:54:15 +0000 (09:54 -0500)]
qa/tasks/rook: simplify shutdown

For some reason deleting common.yaml sometimes fails.  Not really
sure why, but since we will tear down kubernetes anyway this
cleanup isn't really needed.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/rook: archive logs
Sage Weil [Tue, 18 May 2021 14:53:39 +0000 (09:53 -0500)]
qa/tasks/rook: archive logs

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/rook: more orderly cluster teardown
Sage Weil [Tue, 18 May 2021 13:57:12 +0000 (08:57 -0500)]
qa/tasks/rook: more orderly cluster teardown

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/rook: deploy ceph via rook on top of kubernetes
Sage Weil [Thu, 13 May 2021 14:26:35 +0000 (09:26 -0500)]
qa/tasks/rook: deploy ceph via rook on top of kubernetes

This assumes that k8s is installed and kubectl works.

The ceph container to use is selected the same way the cephadm
task does it.

All scratch devices are consumed as OSDs.

A ceph.conf and client.admin keyring are deployed on all test
nodes, so normal tasks should work (if/when packages are installed).

Fixes: https://tracker.ceph.com/issues/47507
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agodoc: use sphinx .dot include 41390/head
Patrick Donnelly [Tue, 18 May 2021 18:13:00 +0000 (11:13 -0700)]
doc: use sphinx .dot include

To compile svg automatically into docs.

Fixed: https://tracker.ceph.com/issues/50865
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40921 from kamoltat/wip-pool-start-out-with-1-pg
Josh Durgin [Tue, 18 May 2021 17:56:05 +0000 (10:56 -0700)]
Merge pull request #40921 from kamoltat/wip-pool-start-out-with-1-pg

mon/OSDMonitor: prepare_new_pool() starts out with 1 pg

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #41383 into master
Sage Weil [Tue, 18 May 2021 16:23:48 +0000 (12:23 -0400)]
Merge PR #41383 into master

* refs/pull/41383/head:
doc/security: Add single GPG key in lieu of existing three GPG keys

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoqa/tasks/kubeadm: install kubernetes with kubeadm
Sage Weil [Fri, 7 May 2021 18:24:31 +0000 (13:24 -0500)]
qa/tasks/kubeadm: install kubernetes with kubeadm

- install k8s with kubeadm
- initial support for flannel only
- remove taint from bootstrap/master node
- create PVs for all scratch_devs + a 'scratch' SC
- kubeadm.kubectl task

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites: move rados/cephadm -> orch/cephadm; symlink
Sage Weil [Fri, 14 May 2021 15:40:02 +0000 (10:40 -0500)]
qa/suites: move rados/cephadm -> orch/cephadm; symlink

Move cephadm under orch/ top-level suite.  Symlink so that we
still include it in a rados run.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #41352 from tchaikov/wip-crimson-metrics
Kefu Chai [Tue, 18 May 2021 15:37:22 +0000 (23:37 +0800)]
Merge pull request #41352 from tchaikov/wip-crimson-metrics

crimson/os/seastore: use seastar::metrics for metrics reporting

Reviewed-by: Amnon Hanuhov <ahanukov@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #41377 from rhcs-dashboard/change-password-preserve-url-fix
Ernesto Puerta [Tue, 18 May 2021 15:22:02 +0000 (17:22 +0200)]
Merge pull request #41377 from rhcs-dashboard/change-password-preserve-url-fix

mgr/dashboard: Fix for query params resetting on change-password

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoqa/tasks/cephadm: add whitespace between functions
Sage Weil [Mon, 17 May 2021 21:23:48 +0000 (16:23 -0500)]
qa/tasks/cephadm: add whitespace between functions

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agodoc/security: Add single GPG key in lieu of existing three GPG keys 41383/head
Hardik Vyas [Tue, 18 May 2021 12:13:53 +0000 (17:43 +0530)]
doc/security: Add single GPG key in lieu of existing three GPG keys

Replace existing three GPG keys with new Ceph Security Team GPG key

Signed-off-by: Hardik Vyas <hvyas@redhat.com>
4 years agoMerge PR #40640 into master
Sage Weil [Tue, 18 May 2021 13:32:52 +0000 (09:32 -0400)]
Merge PR #40640 into master

* refs/pull/40640/head:
common: send SYSLOG_IDENTIFIER to journald
cephadm: enable log to journald by default

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge pull request #39580 from ifed01/wip-ifed-migrate
Rishabh Dave [Tue, 18 May 2021 12:50:43 +0000 (18:20 +0530)]
Merge pull request #39580 from ifed01/wip-ifed-migrate

ceph-volume: implement bluefs volume migration.

4 years agomgr/cephadm: pin haproxy image to 2.3.z 41370/head
Sage Weil [Mon, 17 May 2021 19:40:10 +0000 (15:40 -0400)]
mgr/cephadm: pin haproxy image to 2.3.z

The 2.4 version fails for reasons that aren't immediate clear:

May 17 15:28:42 dael conmon[3007013]: [NOTICE]   (8) : haproxy version is 2.4.0-6cbbecf
May 17 15:28:42 dael conmon[3007013]: [NOTICE]   (8) : path to executable is /usr/local/sbin/haproxy
May 17 15:28:42 dael conmon[3007013]: [ALERT]    (8) : Cannot open configuration file/directory /var/lib/haproxy/haproxy.cfg : Permission denied

Even with mode 777 on those files, there is an error about the chroot to
/var/lib/haproxy.

For now, just stick with a working version.

Fixes: https://tracker.ceph.com/issues/50830
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #41282 from cbodley/wip-rgw-rm-civetweb
Matt Benjamin [Tue, 18 May 2021 12:19:09 +0000 (08:19 -0400)]
Merge pull request #41282 from cbodley/wip-rgw-rm-civetweb

rgw: remove the civetweb and fcgi frontends

4 years agocrimson/admin: reindent SeastarMetricsHook 41352/head
Kefu Chai [Sat, 15 May 2021 08:55:49 +0000 (16:55 +0800)]
crimson/admin: reindent SeastarMetricsHook

we don't use 1-space indent.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/admin: add optional prefix arg to "perf dump_seastar"
Kefu Chai [Sat, 15 May 2021 06:35:31 +0000 (14:35 +0800)]
crimson/admin: add optional prefix arg to "perf dump_seastar"

so we can filter the dumped metrics by their prefix

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/admin: do not construct AdminSocketHook with osd
Kefu Chai [Sat, 15 May 2021 06:00:33 +0000 (14:00 +0800)]
crimson/admin: do not construct AdminSocketHook with osd

osd is not used at all.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/admin: add desc for DumpPerfCountersHook
Kefu Chai [Sat, 15 May 2021 05:58:33 +0000 (13:58 +0800)]
crimson/admin: add desc for DumpPerfCountersHook

logger and counter are used when executing the hook

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os/seastore: use seastar::metrics for metrics reporting
Kefu Chai [Sat, 15 May 2021 05:44:49 +0000 (13:44 +0800)]
crimson/os/seastore: use seastar::metrics for metrics reporting

to be better prepeare for the m:n mapping and to attach more labels
to a metric for better off-line data analysis using ETL tools in future.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/admin: print different metric type in different way
Kefu Chai [Sat, 15 May 2021 05:43:33 +0000 (13:43 +0800)]
crimson/admin: print different metric type in different way

and use registered_metric::operator() for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/admin: use better variable names
Kefu Chai [Sat, 15 May 2021 05:21:48 +0000 (13:21 +0800)]
crimson/admin: use better variable names

for better readability.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os: define SeastoreCollection as a class
Kefu Chai [Sat, 15 May 2021 04:18:07 +0000 (12:18 +0800)]
crimson/os: define SeastoreCollection as a class

to be consistent with the forward declaration. C++ standard does not
differentiate class from struct in this perspective. but Clang warngs at
seeing it. so silence the warning.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41364 from rzarzynski/wip-crimson-monc-pending_messages-assert
Kefu Chai [Tue, 18 May 2021 09:45:28 +0000 (17:45 +0800)]
Merge pull request #41364 from rzarzynski/wip-crimson-monc-pending_messages-assert

crimson/monc: fix send_message() racing with reopen_session().

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41366 from tchaikov/wip-crimson-os-debug
Kefu Chai [Tue, 18 May 2021 09:05:15 +0000 (17:05 +0800)]
Merge pull request #41366 from tchaikov/wip-crimson-os-debug

crimson/os: use compile-time validation

Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agomgr/dashboard: Fix for query params resetting on change-password 41377/head
Nizamudeen A [Tue, 18 May 2021 08:48:38 +0000 (14:18 +0530)]
mgr/dashboard: Fix for query params resetting on change-password

Fixes: https://tracker.ceph.com/issues/50857
Signed-off-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #41354 from idryomov/wip-rbd-pwl-ssd-recovery
Ilya Dryomov [Tue, 18 May 2021 08:25:42 +0000 (10:25 +0200)]
Merge pull request #41354 from idryomov/wip-rbd-pwl-ssd-recovery

librbd/cache/pwl/ssd: fix some crash recovery issues

Reviewed-by: Yin Congmin <congmin.yin@intel.com>
Reviewed-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
4 years agoMerge pull request #39772 from xxhdx1985126/wip-crimson-client-req-pipeline-parallelism
Kefu Chai [Tue, 18 May 2021 05:44:53 +0000 (13:44 +0800)]
Merge pull request #39772 from xxhdx1985126/wip-crimson-client-req-pipeline-parallelism

crimson/osd: optimize crimson-osd's client requests process parallelism

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #41362 from Aran85/crimson-diagrams
Kefu Chai [Tue, 18 May 2021 05:29:13 +0000 (13:29 +0800)]
Merge pull request #41362 from Aran85/crimson-diagrams

crimson/seastore: add string_kv_node_layout diagrams

Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agoMerge PR #40234 into master
Patrick Donnelly [Tue, 18 May 2021 02:50:45 +0000 (19:50 -0700)]
Merge PR #40234 into master

* refs/pull/40234/head:
client: always register callbacks before mount()
client: move SnapRealm methods to ClientSnapRealm.cc

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40842 into master
Patrick Donnelly [Tue, 18 May 2021 02:49:40 +0000 (19:49 -0700)]
Merge PR #40842 into master

* refs/pull/40842/head:
qa: update the ffsb.sh to clone it from git://git.ceph.com/ffsb.git

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #41235 into master
Patrick Donnelly [Tue, 18 May 2021 02:47:57 +0000 (19:47 -0700)]
Merge PR #41235 into master

* refs/pull/41235/head:
mds: PurgeQueue.cc fix for 32bit compilation

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #41239 into master
Patrick Donnelly [Tue, 18 May 2021 02:46:56 +0000 (19:46 -0700)]
Merge PR #41239 into master

* refs/pull/41239/head:
librbd: use uint64_t instead of size_t for SparseExtent::length
mgr/PyModule: use Py_ssize_t for the PyList index
os/bluestore: print size_t using %xz
client: print int64_t using PRId64

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>