Commit Graph

124968 Commits

Author SHA1 Message Date
Ilya Dryomov
c508f380d8 doc/releases: add linkage for 15.2.13
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2021-07-15 17:51:31 +02:00
Sage Weil
a07c24423a 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>
2021-07-15 11:23:28 -04:00
Sage Weil
954abbe5e2 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>
2021-07-15 11:05:22 -04:00
Sebastian Wagner
6ffbe0b784
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>
2021-07-15 16:36:45 +02:00
Sebastian Wagner
17257018e3
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>
2021-07-15 16:23:38 +02:00
Sage Weil
62e4ea5ff1 doc/mgr/nfs: fix 'export apply', pool name
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-15 09:47:39 -04:00
Casey Bodley
07e32e17f6
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>
2021-07-15 09:25:47 -04:00
Ernesto Puerta
af80da7dc0
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>
2021-07-15 15:24:51 +02:00
Kefu Chai
ac001cbd2e
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>
2021-07-15 11:06:34 +08:00
Kefu Chai
de67d465d5
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>
2021-07-15 11:04:52 +08:00
Adam C. Emerson
d3d29ba747
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>
2021-07-14 16:49:52 -04:00
Sage Weil
10cdb238d2 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>
2021-07-14 15:24:07 -05:00
Sage Weil
c100812bff PendingReleaseNotes: document workaround for NFS storage change
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
a1ee80fcf1 qa/tasks/mgr/test_orchestrator_cli: fix test
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
52f6989fff qa/suites/orch/cephadm/mgr-nfs-upgrade: add test for nfs migration
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
93bc85fc23 mgr/cephadm: migrate nfs grace file
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
bd85c678a5 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>
2021-07-14 16:20:11 -04:00
Sage Weil
3cfd779e5b doc/cephfs/fs-nfs-exports: document new export apply capabilities
- import list
- import ganesha conf

Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
d41b60404d 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>
2021-07-14 16:20:11 -04:00
Sage Weil
8026eb5e8e mgr/nfs: use NFS_POOL_NAME in test_nfs.py
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
bfd5ab3124 mgr/nfs: test export apply on JSON list
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
7760cb2aed mgr/nfs: add test for ganesha conf apply/import
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
1e6fd912f6 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>
2021-07-14 16:20:11 -04:00
Sage Weil
c183bccdc6 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>
2021-07-14 16:20:11 -04:00
Sage Weil
379a1fc4d7 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>
2021-07-14 16:20:11 -04:00
Sage Weil
d0d95db00d python-common: don't accept pool/ns for NFSServiceSpec
All users are now gone.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
75970ff806 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>
2021-07-14 16:20:11 -04:00
Sage Weil
7cbd1fbce8 mgr/cephadm: move rados_config_location() out of NFSServiceSpec
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
82e939d89c 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>
2021-07-14 16:20:11 -04:00
Sage Weil
6b2ccb2049 mgr/nfs/export: accept a JSON or ganesha EXPORT config
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
1d5f63ecc5 mgr/nfs: allow 'nfs export apply' to take a list of exports
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
9d38ee24cf python-common: remove pool + namespace from NFSServiceSpec
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
3ee6775c3c mgr/nfs: used fixed pool + ns
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
d799f9b5bd mgr/rook: used fixed pool + ns
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
ea7c8910ea mgr/dashboard: use fixed pool + ns
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
568c630760 mgr/cephadm: always use fixed pool and namespace
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
362e121e46 mgr/nfs: adjust test to match pool name
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
48de07886a mgr/nfs: always create ganesha pool with well-defined name
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 16:20:11 -04:00
Sage Weil
01c006c2de 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>
2021-07-14 14:38:59 -04:00
Kefu Chai
0d177b4312
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>
2021-07-15 01:12:20 +08:00
Adam C. Emerson
76247990ff 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>
2021-07-14 12:44:35 -04:00
Adam C. Emerson
9e12d7e7d1 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>
2021-07-14 12:44:23 -04:00
Adam C. Emerson
7f952ad801 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>
2021-07-14 12:44:11 -04:00
Casey Bodley
7b3aaccdf0 Revert "src/vstart: create rgw user with system flag"
This reverts commit 0d0cd4c6b0.

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2021-07-14 12:37:48 -04:00
Radoslaw Zarzynski
5707108313 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>
2021-07-14 15:37:40 +00:00
zdover23
a0bbdb7725
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>
2021-07-15 01:35:14 +10:00
Sage Weil
44d0f0f6b5 qa/suites/orch/cephadm/smoke: centos 8.2 -> 8.3
Signed-off-by: Sage Weil <sage@newdream.net>
2021-07-14 10:25:28 -05:00
Adam C. Emerson
832c66d0ac
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>
2021-07-14 10:40:22 -04:00
Dimitri Savineau
1b83aea8b0 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>
2021-07-14 10:02:22 -04:00
Javier Cacheiro
c3c79fc44c 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>
2021-07-14 16:00:35 +02:00