]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoMerge pull request #40002 from orozery/rbd-encryption-api
Jason Dillaman [Mon, 15 Mar 2021 12:28:33 +0000 (08:28 -0400)]
Merge pull request #40002 from orozery/rbd-encryption-api

librbd: crypto format api semantics change

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #40101 from dzafman/wip-49779
Kefu Chai [Mon, 15 Mar 2021 09:38:41 +0000 (17:38 +0800)]
Merge pull request #40101 from dzafman/wip-49779

standalone: osd-recovery-scrub.sh: Recovery never started

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
4 years agoMerge pull request #40056 from tchaikov/wip-no-more-MOSDPGNotify
Kefu Chai [Mon, 15 Mar 2021 09:21:39 +0000 (17:21 +0800)]
Merge pull request #40056 from tchaikov/wip-no-more-MOSDPGNotify

osd: do not send/handle MOSDPGNotify anymore

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #36298 from p-se/mgr-prom-collect-time-metric
Kefu Chai [Mon, 15 Mar 2021 09:11:55 +0000 (17:11 +0800)]
Merge pull request #36298 from p-se/mgr-prom-collect-time-metric

mgr/prometheus: introduce metric for collection time

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40100 from liewegas/bug-49788
Kefu Chai [Mon, 15 Mar 2021 09:09:18 +0000 (17:09 +0800)]
Merge pull request #40100 from liewegas/bug-49788

osd: propagate base pool application_metadata to tiers

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40041 from adk3798/helpcoms
Kefu Chai [Mon, 15 Mar 2021 09:07:07 +0000 (17:07 +0800)]
Merge pull request #40041 from adk3798/helpcoms

pybind/ceph_argparse: print flag name before CephChoices in help descs

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40062 from tchaikov/wip-no-lockdep-in-rel-builds
Kefu Chai [Mon, 15 Mar 2021 09:03:00 +0000 (17:03 +0800)]
Merge pull request #40062 from tchaikov/wip-no-lockdep-in-rel-builds

cmake: do not build debug_mutex or lockdep for Release build

Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
4 years agolibrbd: crypto format api semantics change 40002/head
Or Ozeri [Tue, 9 Mar 2021 20:14:49 +0000 (22:14 +0200)]
librbd: crypto format api semantics change

This commit alters the semantics of the encryption format api
to also load the encryption after format completes.
Additionally, several other small changes in librbd crypto are included,
in preparation of supporting clone formatting.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
4 years agotest: osd-recovery-scrub.sh: Test fails if no scrubs happened for a recovering pg 40101/head
David Zafman [Sat, 13 Mar 2021 05:56:28 +0000 (05:56 +0000)]
test: osd-recovery-scrub.sh: Test fails if no scrubs happened for a recovering pg

Change TEST_recovery_scrub_2 to create more objects and use
osd_recovery_sleep to prevent recovery from finihing before
we start to scrub.  Verify that at least 1 scrub was started
while the pg was reovering.

Fixes: https://tracker.ceph.com/issues/49779
Signed-off-by: David Zafman <dzafman@redhat.com>
4 years agocrimson/osd: do not include unused headers 40056/head
Kefu Chai [Fri, 12 Mar 2021 07:21:04 +0000 (15:21 +0800)]
crimson/osd: do not include unused headers

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoosd/PG: do not include unused headers
Kefu Chai [Fri, 12 Mar 2021 07:13:24 +0000 (15:13 +0800)]
osd/PG: do not include unused headers

neither MOSDPGNotify nor MOSDPGInfo is used in PG.cc, so drop the
corresponding headers.

the same appiles to some other types and headers declared and included
in PG.h

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoosd: do not handle pre-octopus messages
Kefu Chai [Fri, 12 Mar 2021 06:51:30 +0000 (14:51 +0800)]
osd: do not handle pre-octopus messages

MOSDPGQuery and MOSDPGInfo messages are sent by
pre-octopus OSD, so in quincy and up clusters, we do not need
to handle them anymore, as we can only upgrade from octopus and
up to quincy.

we can drop MOSDPGNotify after Q + 2, though, after we stop sending
MOSDPGNotify in Q release.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoosd: send MOSDPGNotify2 instead of MOSDPGNotify
Kefu Chai [Fri, 12 Mar 2021 07:09:12 +0000 (15:09 +0800)]
osd: send MOSDPGNotify2 instead of MOSDPGNotify

as we prefer sending MOSDPGNotify2 over MOSDPGNotify in PeeringState
in post octopus, to be more consistent and have one less thing to
worry, let's just use MOSDPGNotify2 in OSD.cc as well.

Fixes: https://tracker.ceph.com/issues/49758
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoosd: drop OSD::create_context()
Kefu Chai [Fri, 12 Mar 2021 06:40:47 +0000 (14:40 +0800)]
osd: drop OSD::create_context()

OSD::create_context() was used for creating PeeringCtx from OSD's
require_osd_release. but since the check against require_osd_release
is not required anymore, let's drop this helper.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoosd/PeeringState: do not check for require_osd_release
Kefu Chai [Fri, 12 Mar 2021 06:23:50 +0000 (14:23 +0800)]
osd/PeeringState: do not check for require_osd_release

before this change, we always check for require_osd_release when
creating MOSDPGNotify2 or MOSDPGNotify, if require_osd_release is
greater or equal to octopus, MOSDPGNotify2 is created.

since we are in a post-quincy era, and we only need to upgrade from
octopus and up to quincy, there is no need to be compatible with
osd whose version is lower than octopus.

in this change, the check in `BufferedRecoveryMessages::send_notify()`
is dropped.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoRevert "qa/standalone/scrub/osd-recovery-scrub: fix unnoticed recovery state"
David Zafman [Sat, 13 Mar 2021 05:32:41 +0000 (05:32 +0000)]
Revert "qa/standalone/scrub/osd-recovery-scrub: fix unnoticed recovery state"

This reverts commit 1323bdb839e77fb27cba36ef2725bb7f163b1db4.

The tests needs to scrub while recovery is in progress, so catching
recovery from the logs after the fact isn't the proper setup.
We can use osd_recovery_sleep config.

Signed-off-by: David Zafman <dzafman@redhat.com>
4 years agoosd: propagate base pool application_metadata to tiers 40100/head
Sage Weil [Sat, 13 Mar 2021 16:34:43 +0000 (11:34 -0500)]
osd: propagate base pool application_metadata to tiers

If there is application metadata on the base pool, it should be mirrored
to any other tiers in the set.  This aligns with the fact that the
'ceph osd pool application ...' commands refuse to operate on a non-base
pool.

This fixes problems with accessing tiers (e.g., cache tiers) when the
cephx cap is written in terms of application metadata.

Fixes: https://tracker.ceph.com/issues/49788
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #40042 into master
Sage Weil [Sat, 13 Mar 2021 15:40:55 +0000 (10:40 -0500)]
Merge PR #40042 into master

* refs/pull/40042/head:
qa/suites/rados/cephadm: add back centos+rhel with kubic podman

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agocmake: do not build lockdep for Release build 40062/head
Kefu Chai [Fri, 12 Mar 2021 11:39:28 +0000 (19:39 +0800)]
cmake: do not build lockdep for Release build

lockdep create large data structures on .bss and on heap for tracking
the locks and their dependencies. but we don't need to pay for this
if lockdep is not enabled.

lockdep helps us to track the lock dependencies related issue on Debug
build. and Release build, this feature hurts the performance and more
importantly, lockdeps is a feature only kicks in when using the
mutex_debug and friends. they are not used in Release build at all.

so, after this change, lockdep is not built in Release build. and
the static variables defined in lockdep.cc are not allocated anymore
in Release build.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocommon/lockdep: disable lockdep if !CEPH_DEBUG_MUTEX
Kefu Chai [Fri, 12 Mar 2021 13:12:08 +0000 (21:12 +0800)]
common/lockdep: disable lockdep if !CEPH_DEBUG_MUTEX

make lockdep a feature which can only be enabled at compile time.

we don't need to have lockdep when CEPH_DEBUG_MUTEX is OFF, so
just comment it out in Release builds.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40036 from tchaikov/wip-doc-mgr
Josh Durgin [Fri, 12 Mar 2021 23:48:10 +0000 (15:48 -0800)]
Merge pull request #40036 from tchaikov/wip-doc-mgr

doc/mgr: fix formatting

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40044 from ceph/wip-1427-notes
Josh Durgin [Fri, 12 Mar 2021 23:35:19 +0000 (15:35 -0800)]
Merge pull request #40044 from ceph/wip-1427-notes

doc: 14.2.17 Release Notes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
4 years agoMerge PR #40045 into master
Sage Weil [Fri, 12 Mar 2021 20:09:15 +0000 (15:09 -0500)]
Merge PR #40045 into master

* refs/pull/40045/head:
cephadm: use image id, not name, when inspecting for RepoDigests

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge pull request #40052 from tchaikov/wip-rpm-no-rbd-rwl-on-el8
Kefu Chai [Fri, 12 Mar 2021 17:56:19 +0000 (01:56 +0800)]
Merge pull request #40052 from tchaikov/wip-rpm-no-rbd-rwl-on-el8

ceph.spec: build with system libpmem on fedora and el8

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #40050 from dillaman/wip-49690
Mykola Golub [Fri, 12 Mar 2021 17:50:04 +0000 (19:50 +0200)]
Merge pull request #40050 from dillaman/wip-49690

librbd/io: send alloc_hint when compression hint is set

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #38853 from dzafman/wip-48843
David Zafman [Fri, 12 Mar 2021 17:20:51 +0000 (09:20 -0800)]
Merge pull request #38853 from dzafman/wip-48843

osd: Try other PGs when reservation failures occur

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agocommon/ceph_context: disable lockdep if !CEPH_DEBUG_MUTEX
Kefu Chai [Fri, 12 Mar 2021 11:50:45 +0000 (19:50 +0800)]
common/ceph_context: disable lockdep if !CEPH_DEBUG_MUTEX

make lockdep a feature which can only be enabled at compile time.

we don't need to have lockdep when CEPH_DEBUG_MUTEX is OFF, so
just comment it out in Release builds.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: do not build mutex_debug.cc if !WITH_CEPH_DEBUG_MUTEX
Kefu Chai [Fri, 12 Mar 2021 11:32:16 +0000 (19:32 +0800)]
cmake: do not build mutex_debug.cc if !WITH_CEPH_DEBUG_MUTEX

there is no need to build shared_mutex_debug.cc and
mutex_debug.cc, if they are not used at all. in Release build
we just use the mutex primitives offered by C++ standard library and
the POSIX API offered by libc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake/crimson: define crimson_alien_common_srcs
Kefu Chai [Fri, 12 Mar 2021 17:11:27 +0000 (01:11 +0800)]
cmake/crimson: define crimson_alien_common_srcs

so we can add to this list if some option is enabled

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/ceph_argparse: print flag name before CephChoices in help descs 40041/head
Adam King [Wed, 10 Mar 2021 22:01:04 +0000 (17:01 -0500)]
pybind/ceph_argparse: print flag name before CephChoices in help descs

Fixes: https://tracker.ceph.com/issues/49757
Signed-off-by: Adam King <adking@redhat.com>
4 years agoMerge PR #40046 into master
Sage Weil [Fri, 12 Mar 2021 16:18:48 +0000 (11:18 -0500)]
Merge PR #40046 into master

* refs/pull/40046/head:
qa/suites/rados/cephadm/upgrade: deploy a legacy r.z-style rgw

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge pull request #40010 from dillaman/wip-49716
Mykola Golub [Fri, 12 Mar 2021 15:17:32 +0000 (17:17 +0200)]
Merge pull request #40010 from dillaman/wip-49716

librbd: allow interrupted trash move request to be restarted

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoceph.spec: build with system libpmem on fedora and el8 40052/head
Kefu Chai [Fri, 12 Mar 2021 04:02:22 +0000 (12:02 +0800)]
ceph.spec: build with system libpmem on fedora and el8

* build with WITH_SYSTEM_PMDK=ON on fedora, as f32 and f33 ship
  libpmem1.8 and libpmem1.9 respectively. and we need libpmem v1.7
* build with WITH_SYSTEM_PMDK=ON on el8, as el8 and CentOS8 AppStream
  ships libpmem v1.6,

quote from nvml.spec:

> By design, PMDK does not support any 32-bit architecture.
> Due to dependency on some inline assembly, PMDK can be compiled only
> on these architectures:
> - x86_64
> - ppc64le (experimental)
> - aarch64 (unmaintained, supporting hardware doesn't exist?)

so far, only x86_64 and ppc64le packages are built.

see also,
https://src.fedoraproject.org/rpms/nvml/blob/rawhide/f/nvml.spec

this change addresses a regression introduced by
a49d1dbb32e2436ff2836a85b2fa84418f0a5fff

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40068 from tchaikov/wip-readme-ninja
Kefu Chai [Fri, 12 Mar 2021 14:22:37 +0000 (22:22 +0800)]
Merge pull request #40068 from tchaikov/wip-readme-ninja

README.md: correct notes on `-j` option

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoREADME.md: correct notes on `-j` option 40068/head
Kefu Chai [Fri, 12 Mar 2021 13:27:29 +0000 (21:27 +0800)]
README.md: correct notes on `-j` option

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40057 from tchaikov/wip-49726
Kefu Chai [Fri, 12 Mar 2021 13:36:59 +0000 (21:36 +0800)]
Merge pull request #40057 from tchaikov/wip-49726

Revert "osd: avoid two copy with same src cancel each other"

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agocmake: make "WITH_CEPH_DEBUG_MUTEX" depend on CMAKE_BUILD_TYPE
Kefu Chai [Fri, 12 Mar 2021 11:29:54 +0000 (19:29 +0800)]
cmake: make "WITH_CEPH_DEBUG_MUTEX" depend on CMAKE_BUILD_TYPE

this option is available only if CMAKE_BUILD_TYPE is Debug.

this change helps us to unify the checks for WITH_CEPH_DEBUG_MUTEX,
without this change, we always have to check both WITH_CEPH_DEBUG_MUTEX
*and* CMAKE_BUILD_TYPE.

after this change, we only respect WITH_CEPH_DEBUG_MUTEX.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40004 from vshankar/wip-cephfs-mirror-symlink-overrun
Venky Shankar [Fri, 12 Mar 2021 12:50:24 +0000 (18:20 +0530)]
Merge pull request #40004 from vshankar/wip-cephfs-mirror-symlink-overrun

cephfs-mirror: fix possible incorrect symbolic link synchronization

4 years agoMerge pull request #38476 from aclamk/wip-bs-alloc-check
Kefu Chai [Fri, 12 Mar 2021 12:31:56 +0000 (20:31 +0800)]
Merge pull request #38476 from aclamk/wip-bs-alloc-check

os/bluestore: add asserts for allocator regions

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #39670 from myoungwon/wip-fix-missing-snap-manifest
Kefu Chai [Fri, 12 Mar 2021 12:26:01 +0000 (20:26 +0800)]
Merge pull request #39670 from myoungwon/wip-fix-missing-snap-manifest

osd: fix missing adjacent snaps when handling manifest object

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #39941 from tchaikov/wip-mgr-localpool-ann
Kefu Chai [Fri, 12 Mar 2021 12:09:21 +0000 (20:09 +0800)]
Merge pull request #39941 from tchaikov/wip-mgr-localpool-ann

mgr/localpool: add type annotations

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge pull request #39994 from Rishabh4275/master
Kefu Chai [Fri, 12 Mar 2021 12:03:04 +0000 (20:03 +0800)]
Merge pull request #39994 from Rishabh4275/master

os/bluestore: Fix zoned code location in _do_truncate

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #39992 from tchaikov/wip-byteorder-endian
Kefu Chai [Fri, 12 Mar 2021 12:02:30 +0000 (20:02 +0800)]
Merge pull request #39992 from tchaikov/wip-byteorder-endian

include/byteorder: drop init_le*() helpers

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
4 years agoMerge pull request #39998 from tchaikov/wip-rwlock
Kefu Chai [Fri, 12 Mar 2021 12:00:57 +0000 (20:00 +0800)]
Merge pull request #39998 from tchaikov/wip-rwlock

src/: do not include RWLock.h unless RWLock is used

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39410 from sebastian-philipp/drive-group-validate-data-devices...
Sebastian Wagner [Fri, 12 Mar 2021 11:40:40 +0000 (12:40 +0100)]
Merge pull request #39410 from sebastian-philipp/drive-group-validate-data-devices-none

python-common: Verify data_devices is not None

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
4 years agoMerge pull request #39857 from adk3798/dup-labels
Sebastian Wagner [Fri, 12 Mar 2021 11:04:54 +0000 (12:04 +0100)]
Merge pull request #39857 from adk3798/dup-labels

mgr/cephadm: remove duplicate labels when adding a host

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agotest: add symbolic link synchronization test for cephfs-mirror 40004/head
Venky Shankar [Wed, 10 Mar 2021 13:40:40 +0000 (08:40 -0500)]
test: add symbolic link synchronization test for cephfs-mirror

Fixes: http://tracker.ceph.com/issues/49711
Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agocephfs-mirror: null terminate buffer before synchronizing symbolc link
Venky Shankar [Wed, 10 Mar 2021 13:37:47 +0000 (08:37 -0500)]
cephfs-mirror: null terminate buffer before synchronizing symbolc link

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agoosd: Revert "osd: avoid two copy with same src cancel each other" 40057/head
Kefu Chai [Fri, 12 Mar 2021 07:27:28 +0000 (15:27 +0800)]
osd: Revert "osd: avoid two copy with same src cancel each other"

This reverts commit 617f7114e261595e2e85970e171dcad41f283599.

Fixes: https://tracker.ceph.com/issues/49726
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40053 from rishabh-d-dave/readme-update
Kefu Chai [Fri, 12 Mar 2021 04:36:06 +0000 (12:36 +0800)]
Merge pull request #40053 from rishabh-d-dave/readme-update

README.md: replace "make" with "ninja"

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoREADME.md: replace "make" by "ninja" 40053/head
Rishabh Dave [Fri, 12 Mar 2021 04:21:39 +0000 (09:51 +0530)]
README.md: replace "make" by "ninja"

Update README.md since ninja is the default generator now.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
4 years agolibrbd/io: send alloc_hint when compression hint is set 40050/head
Jason Dillaman [Fri, 12 Mar 2021 00:44:15 +0000 (19:44 -0500)]
librbd/io: send alloc_hint when compression hint is set

Previously the hint would not be set if the object map indicated the
object may exist.

Fixes: https://tracker.ceph.com/issues/49690
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge PR #40034 into master
Sage Weil [Thu, 11 Mar 2021 23:52:03 +0000 (18:52 -0500)]
Merge PR #40034 into master

* refs/pull/40034/head:
qa/suites/rados/cephadm/upgrade: start at 15.2.9 to test iscsi upgrade
qa/tasks/cephadm.py: don't set mgr count to +1

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agodoc: 14.2.17 Release Notes 40044/head
David Galloway [Thu, 11 Mar 2021 20:24:25 +0000 (15:24 -0500)]
doc: 14.2.17 Release Notes

Signed-off-by: David Galloway <dgallowa@redhat.com>
4 years agocephadm: use image id, not name, when inspecting for RepoDigests 40045/head
Sage Weil [Thu, 11 Mar 2021 21:56:52 +0000 (16:56 -0500)]
cephadm: use image id, not name, when inspecting for RepoDigests

The name is ambiguous, but the image_id is not!  This fixes problems
during upgrade where upgrade thinks the container is upgraded (due to
an incorrect digest) when in fact it is not.

Fixes: 0826c45e0cb5d60fcf8cd71cd14edd34a6997cd4
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites/rados/cephadm/upgrade: start at 15.2.9 to test iscsi upgrade 40034/head
Sage Weil [Thu, 11 Mar 2021 03:58:33 +0000 (22:58 -0500)]
qa/suites/rados/cephadm/upgrade: start at 15.2.9 to test iscsi upgrade

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites/rados/cephadm: add back centos+rhel with kubic podman 40042/head
Sage Weil [Thu, 11 Mar 2021 19:46:23 +0000 (13:46 -0600)]
qa/suites/rados/cephadm: add back centos+rhel with kubic podman

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephadm.py: don't set mgr count to +1
Sage Weil [Thu, 11 Mar 2021 16:58:15 +0000 (11:58 -0500)]
qa/tasks/cephadm.py: don't set mgr count to +1

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #40007 from neha-ojha/wip-cc-weight
Neha Ojha [Thu, 11 Mar 2021 19:09:00 +0000 (11:09 -0800)]
Merge pull request #40007 from neha-ojha/wip-cc-weight

pybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing

Reviewed-by: David Zafman <dzafman@redhat.com>
4 years agoMerge PR #39845 into master
Patrick Donnelly [Thu, 11 Mar 2021 17:34:53 +0000 (09:34 -0800)]
Merge PR #39845 into master

* refs/pull/39845/head:
doc: clarify mirror daemon user capability requirements
doc: doc changes for additional mirroring interfaces
pybind/mirroring: add interface to list file system mirror peers
pybind/mirroring: set libcephfs handle root uid/gid as 0:0
test: add tests for mirroring bootstrap interfaces
pybind/mirroring: introduce peer_bootstrap {create|import} commands
cephfs-mirror: use peer cluster monitor address (and key) if available
mon: peer_add should accept Ceph file system UUID
mon: introduce "profile cephfs-mirror" cap constrained to "config-get cephfs/mirror/peer"
test: add test for failed filesystem mirror instances
cephfs-mirror: restart failed mirror filesystem instances

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #39671 into master
Patrick Donnelly [Thu, 11 Mar 2021 17:23:03 +0000 (09:23 -0800)]
Merge PR #39671 into master

* refs/pull/39671/head:
doc: snap-schedule documentation

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agodoc/mgr: fix formatting 40036/head
Kefu Chai [Thu, 11 Mar 2021 16:27:58 +0000 (00:27 +0800)]
doc/mgr: fix formatting

a code block should start with "::".

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agorbd: clarify trash remove error code from interrupted move 40010/head
Jason Dillaman [Wed, 10 Mar 2021 20:31:22 +0000 (15:31 -0500)]
rbd: clarify trash remove error code from interrupted move

Fixes: https://tracker.ceph.com/issues/49716
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd/trash: don't return -ENOENT error from move state machine
Jason Dillaman [Wed, 10 Mar 2021 20:37:39 +0000 (15:37 -0500)]
librbd/trash: don't return -ENOENT error from move state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd/api: trash remove/purge should indicate interrupted move
Jason Dillaman [Wed, 10 Mar 2021 20:29:11 +0000 (15:29 -0500)]
librbd/api: trash remove/purge should indicate interrupted move

This will help the user self-diagnose that a trash move operation
was interrupted and therefore the state is invalid.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #40006 from dillaman/wip-qa-rbd-rwl-ssd
Mykola Golub [Thu, 11 Mar 2021 13:59:33 +0000 (15:59 +0200)]
Merge pull request #40006 from dillaman/wip-qa-rbd-rwl-ssd

qa/suites/rbd: added SSD PWL cache mode to tests

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #39875 from zdover23/wip-doc-cephadm-adoption-overview-and-limitat...
Sebastian Wagner [Thu, 11 Mar 2021 11:19:37 +0000 (12:19 +0100)]
Merge pull request #39875 from zdover23/wip-doc-cephadm-adoption-overview-and-limitations-rewrite-2021-Mar-06

doc/cephadm: rewrite part of adoption.rst

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #40008 from mgfritch/cephadm-nfsv3-deprecate
Sebastian Wagner [Thu, 11 Mar 2021 11:06:20 +0000 (12:06 +0100)]
Merge pull request #40008 from mgfritch/cephadm-nfsv3-deprecate

doc/cephadm: add note about deprecation of NFSv3

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #39932 from mgfritch/custom-monitoring-j2
Sebastian Wagner [Thu, 11 Mar 2021 10:44:17 +0000 (11:44 +0100)]
Merge pull request #39932 from mgfritch/custom-monitoring-j2

doc/cephadm: update section on applying custom config (j2)

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agodoc: clarify mirror daemon user capability requirements 39845/head
Venky Shankar [Thu, 11 Mar 2021 04:31:45 +0000 (23:31 -0500)]
doc: clarify mirror daemon user capability requirements

Fixes: http://tracker.ceph.com/issues/49619
Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agodoc: doc changes for additional mirroring interfaces
Venky Shankar [Thu, 4 Mar 2021 04:29:03 +0000 (23:29 -0500)]
doc: doc changes for additional mirroring interfaces

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agopybind/mirroring: add interface to list file system mirror peers
Venky Shankar [Tue, 9 Mar 2021 04:44:29 +0000 (23:44 -0500)]
pybind/mirroring: add interface to list file system mirror peers

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agopybind/mirroring: set libcephfs handle root uid/gid as 0:0
Venky Shankar [Tue, 9 Mar 2021 11:18:20 +0000 (16:48 +0530)]
pybind/mirroring: set libcephfs handle root uid/gid as 0:0

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agotest: add tests for mirroring bootstrap interfaces
Venky Shankar [Thu, 4 Mar 2021 05:01:48 +0000 (00:01 -0500)]
test: add tests for mirroring bootstrap interfaces

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agopybind/mirroring: introduce peer_bootstrap {create|import} commands
Venky Shankar [Thu, 4 Mar 2021 05:07:43 +0000 (00:07 -0500)]
pybind/mirroring: introduce peer_bootstrap {create|import} commands

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agocephfs-mirror: use peer cluster monitor address (and key) if available
Venky Shankar [Tue, 23 Feb 2021 04:21:47 +0000 (23:21 -0500)]
cephfs-mirror: use peer cluster monitor address (and key) if available

This allows connecting to the peer cluster without having the cluster
configuration file on the primary cluster.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agomon: peer_add should accept Ceph file system UUID
Venky Shankar [Tue, 23 Feb 2021 04:06:19 +0000 (23:06 -0500)]
mon: peer_add should accept Ceph file system UUID

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agomon: introduce "profile cephfs-mirror" cap constrained to "config-get cephfs/mirror...
Venky Shankar [Thu, 4 Mar 2021 05:01:11 +0000 (00:01 -0500)]
mon: introduce "profile cephfs-mirror" cap constrained to "config-get cephfs/mirror/peer"

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agotest: add test for failed filesystem mirror instances
Venky Shankar [Mon, 8 Mar 2021 09:49:52 +0000 (04:49 -0500)]
test: add test for failed filesystem mirror instances

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agocephfs-mirror: restart failed mirror filesystem instances
Venky Shankar [Mon, 8 Mar 2021 09:48:56 +0000 (04:48 -0500)]
cephfs-mirror: restart failed mirror filesystem instances

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge pull request #40021 from xxhdx1985126/wip-io-sequencer-bug-fix
Kefu Chai [Thu, 11 Mar 2021 08:07:22 +0000 (16:07 +0800)]
Merge pull request #40021 from xxhdx1985126/wip-io-sequencer-bug-fix

crimson/osd: retrive client_requests' prev_op_id right before "start_op"

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: retrive client_requests' prev_op_id right before "start_op" 40021/head
Xuehan Xu [Wed, 10 Mar 2021 07:31:23 +0000 (15:31 +0800)]
crimson/osd: retrive client_requests' prev_op_id right before "start_op"

ClientRequest::prev_op_id should record its immediate predecessor in the
pipeline. If we capture sequencer's last_issued when creating the client
request, it may not represent that predecessor

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agoMerge pull request #39859 from jhonxue/master
Kefu Chai [Thu, 11 Mar 2021 04:10:10 +0000 (12:10 +0800)]
Merge pull request #39859 from jhonxue/master

osd: do not dump an osd multiple times

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoos/bluestore: Synchronize AvlAllocator device_size and block_size with other Allocators. 38476/head
Adam Kupczyk [Mon, 15 Feb 2021 13:17:25 +0000 (14:17 +0100)]
os/bluestore: Synchronize AvlAllocator device_size and block_size with other Allocators.

Modify AvlAllocator to use device_size and block_size from Allocator.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoos/bluestore: Added asserts for allocator regions
Adam Kupczyk [Mon, 7 Dec 2020 13:57:04 +0000 (14:57 +0100)]
os/bluestore: Added asserts for allocator regions

Functions release/init_add_free/init_rm_free did not check its input against device size.
It is incorrect and had been a problem when you shrink device.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #39989 from athanatos/sjust/wip-fix-seastore-gc
Kefu Chai [Thu, 11 Mar 2021 03:20:31 +0000 (11:20 +0800)]
Merge pull request #39989 from athanatos/sjust/wip-fix-seastore-gc

crimson: btree_lba_manager and segment_cleaner fixes

Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os/seastore/.../lba_btree_node_impl: fix lookup 39989/head
Samuel Just [Tue, 9 Mar 2021 04:42:54 +0000 (04:42 +0000)]
crimson/os/seastore/.../lba_btree_node_impl: fix lookup

lower_bound() here is wrong, use bound instead.

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore: add releasing state for segments pending close
Samuel Just [Tue, 9 Mar 2021 02:09:15 +0000 (18:09 -0800)]
crimson/os/seastore: add releasing state for segments pending close

This should fix a bug by which we might start scanning a segment a second
time as it is released and possibly even reused resulting in nonsensical
behavior.

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agoMerge PR #39677 into master
Sage Weil [Thu, 11 Mar 2021 00:24:30 +0000 (19:24 -0500)]
Merge PR #39677 into master

* refs/pull/39677/head:
mgr/cephadm: add iscsi and nfs to upgrade
mgr/cephadm: update caps if necessary when getting keyring

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agomgr/cephadm: add iscsi and nfs to upgrade 39677/head
Adam King [Wed, 24 Feb 2021 21:44:57 +0000 (16:44 -0500)]
mgr/cephadm: add iscsi and nfs to upgrade

Fixes: https://tracker.ceph.com/issues/49462
Signed-off-by: Adam King <adking@redhat.com>
4 years agomgr/cephadm: update caps if necessary when getting keyring
Adam King [Wed, 24 Feb 2021 21:13:01 +0000 (16:13 -0500)]
mgr/cephadm: update caps if necessary when getting keyring

If the caps change from the old version to the new one it causes
issues in the upgrade. This allows the caps to be updated. Currently
only seeing this with iscsi but changing it for other as a precaution

Signed-off-by: Adam King <adking@redhat.com>
4 years agopybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing 40007/head
Neha Ojha [Tue, 9 Mar 2021 00:48:58 +0000 (00:48 +0000)]
pybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing

Add an additional check to make sure that the choose_args section has the same
number of buckets as the crushmap. If not, ensure that
get_compat_weight_set_weights assigns weight-sets to all buckets.

Without this change, if we end up with an orig_ws, which has fewer buckets
than the crushmap, the mgr will crash due a KeyError in do_crush_compat().

Fixes: https://tracker.ceph.com/issues/49576
Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoqa/suites/rados/cephadm/upgrade: deploy a legacy r.z-style rgw 40046/head
Sage Weil [Wed, 10 Mar 2021 13:20:45 +0000 (08:20 -0500)]
qa/suites/rados/cephadm/upgrade: deploy a legacy r.z-style rgw

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agodoc/cephadm: add note about deprecation of NFSv3 40008/head
Michael Fritch [Wed, 10 Mar 2021 17:28:11 +0000 (10:28 -0700)]
doc/cephadm: add note about deprecation of NFSv3

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agolibrbd/api: allow an interrupted trash move to be restarted
Jason Dillaman [Wed, 10 Mar 2021 20:15:26 +0000 (15:15 -0500)]
librbd/api: allow an interrupted trash move to be restarted

Search the trash entries for a matching image name that is
still in the moving state and allow the operation to be
restarted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agoos/bluestore: Fix zoned code location in _do_truncate 39994/head
Rishabh Chawla [Wed, 10 Mar 2021 20:05:17 +0000 (12:05 -0800)]
os/bluestore: Fix zoned code location in _do_truncate

Signed-off-by: Rishabh Chawla <rishabhchawla1995@gmail.com>
4 years agolibrbd/api: helper method for natively listing the trash
Jason Dillaman [Wed, 10 Mar 2021 19:44:36 +0000 (14:44 -0500)]
librbd/api: helper method for natively listing the trash

The existing list method converts the native TrashImageSpec to the
API's rbd_trash_image_info_t which is missing the source field.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #39640 from sebastian-philipp/cephadm-cephfs-mirror
Sebastian Wagner [Wed, 10 Mar 2021 17:34:03 +0000 (18:34 +0100)]
Merge pull request #39640 from sebastian-philipp/cephadm-cephfs-mirror

cephadm: cephfs-mirror

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
4 years agodoc: snap-schedule documentation 39671/head
Jan Fajerski [Fri, 4 Sep 2020 13:12:55 +0000 (15:12 +0200)]
doc: snap-schedule documentation

Fixes: https://tracker.ceph.com/issues/48017
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
4 years agoqa/suites/rbd: added SSD PWL cache mode to tests 40006/head
Jason Dillaman [Wed, 10 Mar 2021 16:30:47 +0000 (11:30 -0500)]
qa/suites/rbd: added SSD PWL cache mode to tests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>