]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agocrimson/osd: s/FuturizedStore*/FuturizedStore&/ in OSDMeta and PGMeta's ctors 42388/head
Kefu Chai [Mon, 19 Jul 2021 01:17:29 +0000 (09:17 +0800)]
crimson/osd: s/FuturizedStore*/FuturizedStore&/ in OSDMeta and PGMeta's ctors

since we always pass a valid store reference to these ctors, there is no
reason to use a pointer. let's use a reference instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: create store in main()
Kefu Chai [Sun, 18 Jul 2021 14:44:59 +0000 (22:44 +0800)]
crimson/osd: create store in main()

to initialize an alienstore with a reference of
seastar::alien::instance is but the internal of AlienStore, would be
better if we could avoid exposing it as a part of the interface of
crimson::osd::OSD().

so, in this change, instead of creating FuturizedStore in OSD(), we
create it in main() where the app is available, so we can just create
FuturizedStore without passing the alien instance all the way down to
OSD().

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: use app.alien() to initialize AlienStore::alien
Kefu Chai [Sun, 18 Jul 2021 14:01:13 +0000 (22:01 +0800)]
crimson/osd: use app.alien() to initialize AlienStore::alien

in e53ea0886fba9073904f59ea85fb73d854565921, the new alien::submit_to() API
is used in the place of the old one. but seastar::alien::instance::_qs
should be initialized before we are able to use the alien instance, just
creating an instance of alien::instance is not enough.

in this change, instead of creating an instance of alien::instance using
make_unique<>, the return value of app.alien() is used to initialize the
alien member variable of AlienStore. app.alien() is always properly
initialized by reactor.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42360 from noviicee/noviicee
Kefu Chai [Sun, 18 Jul 2021 03:16:39 +0000 (11:16 +0800)]
Merge pull request #42360 from noviicee/noviicee

mgr/devicehealth: replace CLICommand with CLIReadCommand

Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #42379 from liewegas/cephadm-keyring-help
Kefu Chai [Sun, 18 Jul 2021 03:15:00 +0000 (11:15 +0800)]
Merge pull request #42379 from liewegas/cephadm-keyring-help

mgr/cephadm: add help strings for 'orch client-keyring ...' commands

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #42036 from kamoltat/wip-pg-autoscaler-overlap
Kefu Chai [Sun, 18 Jul 2021 03:07:42 +0000 (11:07 +0800)]
Merge pull request #42036 from kamoltat/wip-pg-autoscaler-overlap

pybind/mgr/autoscaler: don't scale pools with overlapping roots

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #42357 from cbodley/wip-cmake-legacy-option-headers-dep
Kefu Chai [Sun, 18 Jul 2021 03:01:54 +0000 (11:01 +0800)]
Merge pull request #42357 from cbodley/wip-cmake-legacy-option-headers-dep

cmake: add transitive dependency on legacy-option-headers

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42283 from orozery/op_target_t_constructor
Kefu Chai [Sun, 18 Jul 2021 03:01:25 +0000 (11:01 +0800)]
Merge pull request #42283 from orozery/op_target_t_constructor

common: optimize op_target_t and hobject_t constructors

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42366 from liewegas/mon-down-grace
Kefu Chai [Sun, 18 Jul 2021 02:59:54 +0000 (10:59 +0800)]
Merge pull request #42366 from liewegas/mon-down-grace

mon: allow a MON_DOWN grace period after cluster mkfs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #42315 from TheJJ/fix-op-duration-calculation
Kefu Chai [Sun, 18 Jul 2021 02:59:18 +0000 (10:59 +0800)]
Merge pull request #42315 from TheJJ/fix-op-duration-calculation

osd: fix op event duration calculation

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42385 from tchaikov/wip-crimson-test-alien
Kefu Chai [Sat, 17 Jul 2021 05:35:33 +0000 (13:35 +0800)]
Merge pull request #42385 from tchaikov/wip-crimson-test-alien

test/crimson/test_alien_echo: fixes

Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
4 years agoMerge pull request #42351 from SoftIron/softiron-distro
Kefu Chai [Sat, 17 Jul 2021 02:34:12 +0000 (10:34 +0800)]
Merge pull request #42351 from SoftIron/softiron-distro

build/qa: Add SoftIron Linux as valid distro in build and test scripts

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agotest/crimson/test_alien_echo: msgr->stop() before shutdown 42385/head
Kefu Chai [Sat, 17 Jul 2021 02:23:20 +0000 (10:23 +0800)]
test/crimson/test_alien_echo: msgr->stop() before shutdown

it is required to remove all registered dispatchers before shutting down a
messenger. otherwise assert(dispatchers.empty()) in SocketMessenger::shutdown() fails.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/crimson/test_alien_echo: drop msgr v1 support
Kefu Chai [Sat, 17 Jul 2021 02:05:08 +0000 (10:05 +0800)]
test/crimson/test_alien_echo: drop msgr v1 support

crimson msgr dropped the v1 support back in
7a7e869c0a7d96e1e242929755c3af73085d00ac. so there is no point to offer
an option to use v1 protocol.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/cephadm: add help strings for 'orch client-keyring ...' commands 42379/head
Sage Weil [Fri, 16 Jul 2021 04:46:27 +0000 (00:46 -0400)]
mgr/cephadm: add help strings for 'orch client-keyring ...' commands

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #42338 into master
Sage Weil [Fri, 16 Jul 2021 04:47:41 +0000 (00:47 -0400)]
Merge PR #42338 into master

* refs/pull/42338/head:
mon/LogMonitor: tolerate external_log_to in the future

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/devicehealth:replace CLICommand with CLIReadCommand 42360/head
Anamika [Thu, 15 Jul 2021 15:38:32 +0000 (21:08 +0530)]
mgr/devicehealth:replace CLICommand with CLIReadCommand

Fixes: https://tracker.ceph.com/issues/51631
Signed-off-by: Anamika <cseanamika3@gmail.com>
4 years agomon: allow a MON_DOWN grace period after cluster mkfs 42366/head
Sage Weil [Thu, 15 Jul 2021 20:17:23 +0000 (15:17 -0500)]
mon: allow a MON_DOWN grace period after cluster mkfs

During teuthology tests, the initial cluster bootstrap often starts up
the mon sbut doesn't include all mons in the initial quorum, due to
mon startup misalignment and random delays.  Provide a short grace period
where we will not raise a MON_DOWN alert even though the quorum is not
complete.

Fixes: https://tracker.ceph.com/issues/43584
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #42341 into master
Patrick Donnelly [Thu, 15 Jul 2021 19:41:56 +0000 (12:41 -0700)]
Merge PR #42341 into master

* refs/pull/42341/head:
doc/cephadm: operations.rst typo

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #42200 from cbodley/wip-47781
Casey Bodley [Thu, 15 Jul 2021 19:27:11 +0000 (15:27 -0400)]
Merge pull request #42200 from cbodley/wip-47781

rgw: RadosBucket::get_bucket_info() updates RGWBucketEnt

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #36213 from joke-lee/BulkUpload_md5
Casey Bodley [Thu, 15 Jul 2021 18:19:51 +0000 (14:19 -0400)]
Merge pull request #36213 from joke-lee/BulkUpload_md5

rgw: fix md5 not match for RGWBulkUploadOp upload when enable rgw com…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42126 from paulreece42/wip-copyobject-urldecode
Casey Bodley [Thu, 15 Jul 2021 18:18:42 +0000 (14:18 -0400)]
Merge pull request #42126 from paulreece42/wip-copyobject-urldecode

rgw: url_decode before parsing copysource in copyobject

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41579 from trociny/wip-50932
Casey Bodley [Thu, 15 Jul 2021 18:17:41 +0000 (14:17 -0400)]
Merge pull request #41579 from trociny/wip-50932

rgw: allow to set ssl options and ciphers for beast frontend

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42195 from xrmeng8756/master
Casey Bodley [Thu, 15 Jul 2021 18:17:04 +0000 (14:17 -0400)]
Merge pull request #42195 from xrmeng8756/master

rgw: fail as expected when set/delete-bucket-website attempted on a non-exis…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42359 from idryomov/wip-15.2.13-linkage
Ilya Dryomov [Thu, 15 Jul 2021 16:05:43 +0000 (18:05 +0200)]
Merge pull request #42359 from idryomov/wip-15.2.13-linkage

doc/releases: add linkage for 15.2.13

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
4 years agodoc/releases: add linkage for 15.2.13 42359/head
Ilya Dryomov [Thu, 15 Jul 2021 15:47:44 +0000 (17:47 +0200)]
doc/releases: add linkage for 15.2.13

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge PR #42343 into master
Sage Weil [Thu, 15 Jul 2021 15:23:28 +0000 (11:23 -0400)]
Merge PR #42343 into master

* refs/pull/42343/head:
qa/suites/upgrade/pacific-x: do distro before tasks
qa/suites/orch/cephadm/smoke: centos 8.2 -> 8.3

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #42073 into master 42364/head
Sage Weil [Thu, 15 Jul 2021 15:05:22 +0000 (11:05 -0400)]
Merge PR #42073 into master

* refs/pull/42073/head:
doc/mgr/nfs: fix 'export apply', pool name
PendingReleaseNotes: document workaround for NFS storage change
qa/tasks/mgr/test_orchestrator_cli: fix test
qa/suites/orch/cephadm/mgr-nfs-upgrade: add test for nfs migration
mgr/cephadm: migrate nfs grace file
mgr/nfs: migrate pre-pacific nfs.ganesha-foo clusters to nfs.foo
doc/cephfs/fs-nfs-exports: document new export apply capabilities
qa/tasks/cephfs/test_nfs: define NFS_POOL_NAME
mgr/nfs: use NFS_POOL_NAME in test_nfs.py
mgr/nfs: test export apply on JSON list
mgr/nfs: add test for ganesha conf apply/import
qa/tasks/cephfs/test_nfs: retry mount a few times
mgr/cephadm: migrate all legacy nfs exports to new .nfs pool
mgr/nfs: adjust cephfs export caps if necessary
python-common: don't accept pool/ns for NFSServiceSpec
mgr/orchestrator: drop rados_config_location ServiceDescription property
mgr/cephadm: move rados_config_location() out of NFSServiceSpec
mgr/nfs: change nfs pool to .nfs
mgr/nfs/export: accept a JSON or ganesha EXPORT config
mgr/nfs: allow 'nfs export apply' to take a list of exports
python-common: remove pool + namespace from NFSServiceSpec
mgr/nfs: used fixed pool + ns
mgr/rook: used fixed pool + ns
mgr/dashboard: use fixed pool + ns
mgr/cephadm: always use fixed pool and namespace
mgr/nfs: adjust test to match pool name
mgr/nfs: always create ganesha pool with well-defined name

Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agocmake: add transitive dependency on legacy-option-headers 42357/head
Casey Bodley [Thu, 15 Jul 2021 14:58:51 +0000 (10:58 -0400)]
cmake: add transitive dependency on legacy-option-headers

the legacy-option-headers target is only marked as a dependency of the
common-objs and common-common-objs. because those targets are OBJECT
libraries, their dependencies aren't inherited by the targets that link
common-objs or common-common-objs

this adds the dependencies manually, so that changes to the config
yaml files will cause legacy-option-headers to regenerate the headers

Signed-off-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42290 from javicacheiro/fix_cephadm_selinux 42470/head
Sebastian Wagner [Thu, 15 Jul 2021 14:36:45 +0000 (16:36 +0200)]
Merge pull request #42290 from javicacheiro/fix_cephadm_selinux

cephadm: fetch the real selinux status

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
4 years agoMerge pull request #42220 from dsavineau/issue_51546
Sebastian Wagner [Thu, 15 Jul 2021 14:23:38 +0000 (16:23 +0200)]
Merge pull request #42220 from dsavineau/issue_51546

mgr/cephadm/iscsi: check if dashboard is enabled

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agodoc/mgr/nfs: fix 'export apply', pool name 42073/head
Sage Weil [Thu, 15 Jul 2021 13:43:16 +0000 (09:43 -0400)]
doc/mgr/nfs: fix 'export apply', pool name

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #42339 from cbodley/wip-revert-vstart-system
Casey Bodley [Thu, 15 Jul 2021 13:25:47 +0000 (09:25 -0400)]
Merge pull request #42339 from cbodley/wip-revert-vstart-system

Revert "src/vstart: create rgw user with system flag"

Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #41300 from rhcs-dashboard/force-maintenance-test-error
Ernesto Puerta [Thu, 15 Jul 2021 13:24:51 +0000 (15:24 +0200)]
Merge pull request #41300 from rhcs-dashboard/force-maintenance-test-error

mgr/dashboard: Fix test_error force maintenance dashboard check

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoqa: Add SoftIron Linux as valid debian-based distro in test scripts 42351/head
Danny Abukalam [Thu, 15 Jul 2021 11:16:59 +0000 (07:16 -0400)]
qa: Add SoftIron Linux as valid debian-based distro in test scripts

Signed-off-by: Danny Abukalam <danny@softiron.com>
4 years agobuild: Add SoftIron Linux as valid debian-based distro in install-deps
Danny Abukalam [Thu, 15 Jul 2021 11:15:56 +0000 (07:15 -0400)]
build: Add SoftIron Linux as valid debian-based distro in install-deps

Signed-off-by: Danny Abukalam <danny@softiron.com>
4 years agocommon: optimize op_target_t and hobject_t constructors 42283/head
Or Ozeri [Wed, 30 Jun 2021 06:08:52 +0000 (09:08 +0300)]
common: optimize op_target_t and hobject_t constructors

Switch to passing on arguments by reference instead of copying them.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
4 years agoMerge pull request #42334 from tchaikov/wip-crimson-logging
Kefu Chai [Thu, 15 Jul 2021 03:06:34 +0000 (11:06 +0800)]
Merge pull request #42334 from tchaikov/wip-crimson-logging

crimson/common/log: print out logger.debug() when log level >=6

Reviewed-by: Mark Nelson <mnelson@readhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
4 years agoMerge pull request #42337 from rzarzynski/wip-crimson-alienstore-dedicated-subsys
Kefu Chai [Thu, 15 Jul 2021 03:04:52 +0000 (11:04 +0800)]
Merge pull request #42337 from rzarzynski/wip-crimson-alienstore-dedicated-subsys

crimson/os: give AlienStore its own debug subsystem.

Reviewed-by: Mark Nelson <mnelson@readhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42251 from adamemerson/wip-robustly-invalidate
Adam C. Emerson [Wed, 14 Jul 2021 20:49:52 +0000 (16:49 -0400)]
Merge pull request #42251 from adamemerson/wip-robustly-invalidate

rgw: Robustly Invalidate

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
4 years agoqa/suites/upgrade/pacific-x: do distro before tasks 42343/head
Sage Weil [Wed, 14 Jul 2021 20:13:12 +0000 (15:13 -0500)]
qa/suites/upgrade/pacific-x: do distro before tasks

Otherwise, we isntall new podman at the end, and the
container-selinux-policy package install triggers a bunch of selinux
errors.

Fixes: https://tracker.ceph.com/issues/50151
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoPendingReleaseNotes: document workaround for NFS storage change
Sage Weil [Mon, 28 Jun 2021 19:54:51 +0000 (15:54 -0400)]
PendingReleaseNotes: document workaround for NFS storage change

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/mgr/test_orchestrator_cli: fix test
Sage Weil [Wed, 14 Jul 2021 12:50:17 +0000 (08:50 -0400)]
qa/tasks/mgr/test_orchestrator_cli: fix test

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites/orch/cephadm/mgr-nfs-upgrade: add test for nfs migration
Sage Weil [Thu, 8 Jul 2021 13:10:01 +0000 (09:10 -0400)]
qa/suites/orch/cephadm/mgr-nfs-upgrade: add test for nfs migration

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: migrate nfs grace file
Sage Weil [Tue, 13 Jul 2021 18:27:43 +0000 (14:27 -0400)]
mgr/cephadm: migrate nfs grace file

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: migrate pre-pacific nfs.ganesha-foo clusters to nfs.foo
Sage Weil [Mon, 12 Jul 2021 18:57:10 +0000 (14:57 -0400)]
mgr/nfs: migrate pre-pacific nfs.ganesha-foo clusters to nfs.foo

In octopus, the service is nfs.ganesha-$id instead of nfs.$id

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agodoc/cephfs/fs-nfs-exports: document new export apply capabilities
Sage Weil [Fri, 9 Jul 2021 15:32:45 +0000 (11:32 -0400)]
doc/cephfs/fs-nfs-exports: document new export apply capabilities

- import list
- import ganesha conf

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephfs/test_nfs: define NFS_POOL_NAME
Sage Weil [Fri, 9 Jul 2021 15:25:59 +0000 (11:25 -0400)]
qa/tasks/cephfs/test_nfs: define NFS_POOL_NAME

We can't import from mgr_module.py from here, sadly.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: use NFS_POOL_NAME in test_nfs.py
Sage Weil [Fri, 9 Jul 2021 15:24:28 +0000 (11:24 -0400)]
mgr/nfs: use NFS_POOL_NAME in test_nfs.py

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: test export apply on JSON list
Sage Weil [Fri, 9 Jul 2021 15:19:55 +0000 (11:19 -0400)]
mgr/nfs: test export apply on JSON list

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: add test for ganesha conf apply/import
Sage Weil [Fri, 9 Jul 2021 13:54:59 +0000 (09:54 -0400)]
mgr/nfs: add test for ganesha conf apply/import

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephfs/test_nfs: retry mount a few times
Sage Weil [Wed, 7 Jul 2021 17:50:39 +0000 (13:50 -0400)]
qa/tasks/cephfs/test_nfs: retry mount a few times

It may take a moment for a ganesha to (re)configure itself with a new
export.  If a mount fails, retry a couple times.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: migrate all legacy nfs exports to new .nfs pool
Sage Weil [Fri, 2 Jul 2021 19:53:15 +0000 (15:53 -0400)]
mgr/cephadm: migrate all legacy nfs exports to new .nfs pool

Migrate all past NFS pools, whether they were created by mgr/nfs or by
the dashboard, to the new mgr/nfs .nfs pool.

Since this migrations relies on RADOS being available, we have to be a bit
careful here: we only attempt the migration from serve(), not during
module init.

After the exports are re-imported, we destroy existing ganesha daemons so
that new ones will get recreated.  This ensures the (new) daemons have
cephx keys to access the new pool.

Note that no attempt is made to clean up the old NFS pools.  This is out
of paranoia: if something goes wrong, the old NFS configuration data will
still be there.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: adjust cephfs export caps if necessary
Sage Weil [Fri, 2 Jul 2021 19:53:02 +0000 (15:53 -0400)]
mgr/nfs: adjust cephfs export caps if necessary

If we are importing an old export, we may find that the cephx user
existed but with the wrong caps.  Adjust caps in that case!

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agopython-common: don't accept pool/ns for NFSServiceSpec
Sage Weil [Fri, 2 Jul 2021 18:43:56 +0000 (14:43 -0400)]
python-common: don't accept pool/ns for NFSServiceSpec

All users are now gone.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/orchestrator: drop rados_config_location ServiceDescription property
Sage Weil [Fri, 2 Jul 2021 18:43:12 +0000 (14:43 -0400)]
mgr/orchestrator: drop rados_config_location ServiceDescription property

I'm not sure what this was intended to be used for...

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: move rados_config_location() out of NFSServiceSpec
Sage Weil [Fri, 2 Jul 2021 18:42:34 +0000 (14:42 -0400)]
mgr/cephadm: move rados_config_location() out of NFSServiceSpec

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: change nfs pool to .nfs
Sage Weil [Fri, 2 Jul 2021 16:39:29 +0000 (12:39 -0400)]
mgr/nfs: change nfs pool to .nfs

This is a new pool that we can migrate all past NFS configuration to,
simplifying the migration process (and also allowing us to pick a
.-prefixed name).

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs/export: accept a JSON or ganesha EXPORT config
Sage Weil [Wed, 30 Jun 2021 22:25:02 +0000 (18:25 -0400)]
mgr/nfs/export: accept a JSON or ganesha EXPORT config

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: allow 'nfs export apply' to take a list of exports
Sage Weil [Mon, 28 Jun 2021 19:51:05 +0000 (15:51 -0400)]
mgr/nfs: allow 'nfs export apply' to take a list of exports

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agopython-common: remove pool + namespace from NFSServiceSpec
Sage Weil [Mon, 28 Jun 2021 18:45:13 +0000 (14:45 -0400)]
python-common: remove pool + namespace from NFSServiceSpec

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: used fixed pool + ns
Sage Weil [Mon, 28 Jun 2021 18:44:50 +0000 (14:44 -0400)]
mgr/nfs: used fixed pool + ns

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/rook: used fixed pool + ns
Sage Weil [Mon, 28 Jun 2021 18:44:27 +0000 (14:44 -0400)]
mgr/rook: used fixed pool + ns

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/dashboard: use fixed pool + ns
Sage Weil [Mon, 28 Jun 2021 18:43:21 +0000 (14:43 -0400)]
mgr/dashboard: use fixed pool + ns

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: always use fixed pool and namespace
Sage Weil [Mon, 28 Jun 2021 17:55:15 +0000 (13:55 -0400)]
mgr/cephadm: always use fixed pool and namespace

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: adjust test to match pool name
Sage Weil [Mon, 28 Jun 2021 17:54:00 +0000 (13:54 -0400)]
mgr/nfs: adjust test to match pool name

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: always create ganesha pool with well-defined name
Sage Weil [Mon, 28 Jun 2021 17:53:45 +0000 (13:53 -0400)]
mgr/nfs: always create ganesha pool with well-defined name

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #42041 into master
Sage Weil [Wed, 14 Jul 2021 18:38:59 +0000 (14:38 -0400)]
Merge PR #42041 into master

* refs/pull/42041/head:
mgr/restful: ignore min/max_size
test/crush: drop min/max_size refs
qa/workunits/mon/pool_ops: remove test for min/max_size check
qa: scrub a few remaining mentions of ruleset
qa/standalone/mon/osd-*: fix tests
PendingReleaseNotes: note min/max_size removal
mgr/dashboard: remove max/min_size and ruleset
mon/OSDMonitor: fix calls to CrushTester
crush: eliminate min_size and max_size
test/cli/crushtool: reunumber rulesets in test maps
crushtool: require min/max or num-rep for --test
crush: remove last traces of 'ruleset'
test/cli/crushtool: use 'id' instead of 'ruleset' in crush inputs
crushtool: take --min-rep and --max-rep explicitly
crush/CrushTester: drop --ruleset
doc: scrub 'ruleset' from docs
src/erasure-code: rule, not ruleset
mon/OSDMonitor: remove check_crush_rule() callers
mon/OSDMonitor: rule, not ruleset
crushtool: remove check for overlapped ruels
crush/CrushWrapper: get_osd_pool_default_crush_replicated_ruleset -> rule
crush: remove find_rule()
mon/OSDMonitor: use pool's crush rule directly
osd/OSDMap: drop checks for ruleset == ruleid
osd/OSDMap: use pool's crush rule_id directly
mon/PGMap: use pool's crush_rule directly
mon/OSDMonitor: remove crush ruleset->rule rewrite

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agodoc/cephadm: operations.rst typo 42341/head
Zac Dover [Wed, 14 Jul 2021 15:39:43 +0000 (01:39 +1000)]
doc/cephadm: operations.rst typo

s/any hosts that is/any host/

Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge pull request #42332 from rzarzynski/wip-crimson-remotepeeringevent-sends-when...
Kefu Chai [Wed, 14 Jul 2021 17:12:20 +0000 (01:12 +0800)]
Merge pull request #42332 from rzarzynski/wip-crimson-remotepeeringevent-sends-when-active

crimson/osd: send peering messages only when OSD is active.

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agorgw: Robust notify invalidates on cache timeout 42251/head
Adam C. Emerson [Wed, 14 Jul 2021 15:02:21 +0000 (11:02 -0400)]
rgw: Robust notify invalidates on cache timeout

This avoids a potential race condition in which updates are delayed.

Fixes: https://tracker.ceph.com/issues/51674
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Rename REMOVE_OBJ to INVALIDATE_OBJ
Adam C. Emerson [Wed, 14 Jul 2021 14:57:02 +0000 (10:57 -0400)]
rgw: Rename REMOVE_OBJ to INVALIDATE_OBJ

Also rename ObjectCache::remove to ObjectCache::invalidate_remove

Since we're depending on these message types/functions having
invalidate semantics but NOT caching a negative result, rename and
leave a comment for clarity.

Fixes: https://tracker.ceph.com/issues/51674
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: distribute() takes RGWCacheNotifyInfo
Adam C. Emerson [Wed, 7 Jul 2021 22:47:00 +0000 (18:47 -0400)]
rgw: distribute() takes RGWCacheNotifyInfo

So we don't have to parse the bufferlist back out to find what object
to throw out of the cache.

Fixes: https://tracker.ceph.com/issues/51674
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agoRevert "src/vstart: create rgw user with system flag" 42339/head
Casey Bodley [Wed, 14 Jul 2021 16:37:48 +0000 (12:37 -0400)]
Revert "src/vstart: create rgw user with system flag"

This reverts commit 0d0cd4c6b0e8bbeaa71f54c831d67ef880e58016.

Signed-off-by: Casey Bodley <cbodley@redhat.com>
4 years agomon/LogMonitor: tolerate external_log_to in the future 42338/head
Sage Weil [Wed, 14 Jul 2021 16:15:15 +0000 (12:15 -0400)]
mon/LogMonitor: tolerate external_log_to in the future

This can be fast-forwarded by a sync_force or other mon thrashing events.

In any case, if we see it in the future, it is easy to rewind.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocrimson/os: give AlienStore its own debug subsystem. 42337/head
Radoslaw Zarzynski [Wed, 14 Jul 2021 15:37:37 +0000 (15:37 +0000)]
crimson/os: give AlienStore its own debug subsystem.

For the sake of decoupling it from the BlueStore's logging.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #42327 from zdover23/wip-doc-cephadm-troubleshooting-1-of-x-2021...
zdover23 [Wed, 14 Jul 2021 15:35:14 +0000 (01:35 +1000)]
Merge pull request #42327 from zdover23/wip-doc-cephadm-troubleshooting-1-of-x-2021-07-15

doc/cephadm: rewrite troubleshooting 1 of x

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoqa/suites/orch/cephadm/smoke: centos 8.2 -> 8.3
Sage Weil [Wed, 14 Jul 2021 15:25:28 +0000 (10:25 -0500)]
qa/suites/orch/cephadm/smoke: centos 8.2 -> 8.3

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #42324 from adamemerson/wip-51661
Adam C. Emerson [Wed, 14 Jul 2021 14:40:22 +0000 (10:40 -0400)]
Merge pull request #42324 from adamemerson/wip-51661

rgw: Don't segfault on datalog trim

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
4 years agomgr/cephadm/iscsi: check if dashboard is enabled 42220/head
Dimitri Savineau [Wed, 7 Jul 2021 14:11:41 +0000 (10:11 -0400)]
mgr/cephadm/iscsi: check if dashboard is enabled

When the mgr dashboard module isn't enabled then the iSCSI service deletion
is stuck and the cluster state goes ERR.
The `ceph dashboard` commands aren't available when the mgr dashboard module
isnt' enabled.

Closes: https://tracker.ceph.com/issues/51546
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
4 years agoFetch the actually running selinux status. 42290/head
Javier Cacheiro [Mon, 12 Jul 2021 14:03:27 +0000 (16:03 +0200)]
Fetch the actually running selinux status.

The HostFacts should return the **actual** selinux mode in which the
kernel is running.

The actual mode can be different from the one in the configuration
if the server has not been rebooted or if the mode was changed
after boot using setenforce.

Instead of reading _selinux_path_list we should look at the output of
sestatus or getenforce.

The _selinux_path_list attribute is no longer needed.

Fixes: https://tracker.ceph.com/issues/51632
Signed-off-by: Javier Cacheiro <javier.cacheiro.lopez@cesga.es>
4 years agocrimson/common/log: print out logger.debug() when log level >=6 42334/head
Kefu Chai [Wed, 14 Jul 2021 13:24:46 +0000 (21:24 +0800)]
crimson/common/log: print out logger.debug() when log level >=6

less chatty when debug level is 5. this matches the behavior of classic
osd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agorgw: Don't segfault on datalog trim 42324/head
Adam C. Emerson [Tue, 13 Jul 2021 20:05:47 +0000 (16:05 -0400)]
rgw: Don't segfault on datalog trim

Synchronous (or yielded, basically other-than AioCompletion trim)
would try to dereference the past-the-end iterator if we were trimming
to a point in the most recent generation.

https://tracker.ceph.com/issues/51661
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agocrimson/osd: send peering messages only when OSD is active. 42332/head
Radoslaw Zarzynski [Tue, 13 Jul 2021 12:54:55 +0000 (12:54 +0000)]
crimson/osd: send peering messages only when OSD is active.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: assert OSD in active when dispatching peering msgs.
Radoslaw Zarzynski [Fri, 9 Jul 2021 14:43:08 +0000 (14:43 +0000)]
crimson/osd: assert OSD in active when dispatching peering msgs.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agomgr/dashboard: Fix test_error force maintenance dashboard check 41300/head
Nizamudeen A [Wed, 12 May 2021 10:07:40 +0000 (15:37 +0530)]
mgr/dashboard: Fix test_error force maintenance dashboard check

Fixes: https://tracker.ceph.com/issues/50771
Signed-off-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #41490 from idryomov/wip-rbd-pwl-ssd-tailp
Ilya Dryomov [Wed, 14 Jul 2021 09:54:44 +0000 (11:54 +0200)]
Merge pull request #41490 from idryomov/wip-rbd-pwl-ssd-tailp

librbd/cache/pwl/ssd: fix first_free_entry and m_first_free_entry corruption

Reviewed-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #42145 from hualongfeng/fix_get_context_error
Ilya Dryomov [Wed, 14 Jul 2021 09:44:41 +0000 (11:44 +0200)]
Merge pull request #42145 from hualongfeng/fix_get_context_error

librbd/cache/pwl/ssd: fix use-after-free on C_BlockIORequest

Reviewed-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge pull request #42244 from zdover23/wip-doc-cephadm-operations-data-location...
Sebastian Wagner [Wed, 14 Jul 2021 09:16:45 +0000 (11:16 +0200)]
Merge pull request #42244 from zdover23/wip-doc-cephadm-operations-data-location-and-health-checks-2021-07-08

doc/cephadm: operations: Data location & ...

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #42288 from mgfritch/cephadm-test-fixup-mock
Sebastian Wagner [Wed, 14 Jul 2021 09:15:39 +0000 (11:15 +0200)]
Merge pull request #42288 from mgfritch/cephadm-test-fixup-mock

cephadm: use CephadmContext rather than MagicMock

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #42310 from rzarzynski/wip-crimson-remotepeeringevent-waits-on...
Kefu Chai [Wed, 14 Jul 2021 08:23:33 +0000 (16:23 +0800)]
Merge pull request #42310 from rzarzynski/wip-crimson-remotepeeringevent-waits-on-active

crimson/osd: remote peering requests wait for OSD activation.

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agorgw: set default ssl options for beast frontend 41579/head
Mykola Golub [Wed, 16 Jun 2021 15:41:44 +0000 (16:41 +0100)]
rgw: set default ssl options for beast frontend

to 'no_sslv2:no_sslv3:no_tlsv1:no_tlsv1_1'

Signed-off-by: Mykola Golub <mgolub@suse.com>
4 years agorgw: allow to set ssl options and ciphers for beast frontend
Mykola Golub [Thu, 27 May 2021 16:09:48 +0000 (17:09 +0100)]
rgw: allow to set ssl options and ciphers for beast frontend

Two new conf keys are added for "beast" framework:

- ssl_options: a colon separated list of ssl context options,
  documented in boost's ssl::context_base;

- ssl_ciphers: a colon separated list of ciphers, documented
  in openssl's ciphers(1) manual.

Example:

  rgw frontends = beast ...  ssl_options=default_workarounds:no_tlsv1:no_tlsv1_1 ssl_ciphers=HIGH:!aNULL:!MD5

Fixes: https://tracker.ceph.com/issues/50932
Signed-off-by: Mykola Golub <mgolub@suse.com>
4 years agolibrbd/cache/pwl/ssd: fix use-after-free on C_BlockIORequest 42145/head
Hualong Feng [Fri, 2 Jul 2021 01:49:39 +0000 (09:49 +0800)]
librbd/cache/pwl/ssd: fix use-after-free on C_BlockIORequest

In setup_schedule_append() function, its first expression
will cause the req to be deleted, and subsequent use of
the variable req becomes an illegal operation. And due to
delete, rep->m_image_ctx will be empty, so it lead to
segfault in AbstractWriteLog::get_context().
So pass the `req` into `schedule_append()` function.

Fixes: https://tracker.ceph.com/issues/50951
Signed-off-by: Hualong Feng <hualong.feng@intel.com>
4 years agocrimson/osd: move the wait-for-active logic into OSDState. 42310/head
Radoslaw Zarzynski [Tue, 13 Jul 2021 12:39:02 +0000 (12:39 +0000)]
crimson/osd: move the wait-for-active logic into OSDState.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #42314 from rzarzynski/wip-crimson-single-do_peering_event
Kefu Chai [Wed, 14 Jul 2021 06:41:35 +0000 (14:41 +0800)]
Merge pull request #42314 from rzarzynski/wip-crimson-single-do_peering_event

crimson/osd: consider epoch_sent when ignoring old peering event.

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42271 from xxhdx1985126/wip-seastore-writev
Kefu Chai [Wed, 14 Jul 2021 06:33:57 +0000 (14:33 +0800)]
Merge pull request #42271 from xxhdx1985126/wip-seastore-writev

crimson/os/seastore: use writev to avoid extra memory copy

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42311 from rzarzynski/wip-crimson-fix-premature-activation
Kefu Chai [Wed, 14 Jul 2021 06:27:13 +0000 (14:27 +0800)]
Merge pull request #42311 from rzarzynski/wip-crimson-fix-premature-activation

crimson/osd: prevent premature OSD activation.

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42202 from cyx1231st/wip-seastore-metrics
Kefu Chai [Wed, 14 Jul 2021 06:24:35 +0000 (14:24 +0800)]
Merge pull request #42202 from cyx1231st/wip-seastore-metrics

crimson/os/seastore: implement label-based profiling with metrics

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/cephadm: rewrite troubleshooting 1 of x 42327/head
Zac Dover [Wed, 14 Jul 2021 06:17:19 +0000 (16:17 +1000)]
doc/cephadm: rewrite troubleshooting 1 of x

This PR improves the readability and format
of the troubleshooting.rst file. This also
makes a change to the markdown of one of the
sub-subsections so that it is made of tildes
(~) instead of carets (^), because that's
the RST standard.

Signed-off-by: Zac Dover <zac.dover@gmail.com>