]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agoos/bluestore: fix cleaner race with collection removal
Sage Weil [Tue, 19 Oct 2021 20:09:37 +0000 (15:09 -0500)]
os/bluestore: fix cleaner race with collection removal

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: add missing ' ' to LruOnodeCacheShare _[un]pin
Sage Weil [Tue, 19 Oct 2021 15:39:45 +0000 (10:39 -0500)]
os/bluestore: add missing ' ' to LruOnodeCacheShare _[un]pin

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: use simpler map<> to track (onode, zone) -> offset
Sage Weil [Mon, 18 Oct 2021 19:28:42 +0000 (14:28 -0500)]
os/bluestore: use simpler map<> to track (onode, zone) -> offset

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: avoid casting zoned implementations again
Sage Weil [Mon, 18 Oct 2021 19:23:20 +0000 (14:23 -0500)]
os/bluestore: avoid casting zoned implementations again

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/ZonedFreelistManager: remove sanity checks
Sage Weil [Mon, 18 Oct 2021 19:10:15 +0000 (14:10 -0500)]
os/bluestore/ZonedFreelistManager: remove sanity checks

These were there when I was using the merge operator; not really needed
since it's just setting zeroed values now.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/ZonedAllocator: fix allocate() search
Sage Weil [Mon, 18 Oct 2021 17:30:29 +0000 (12:30 -0500)]
os/bluestore/ZonedAllocator: fix allocate() search

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: drain transactions on cleaner zone finish
Sage Weil [Fri, 1 Oct 2021 20:54:04 +0000 (15:54 -0500)]
os/bluestore: drain transactions on cleaner zone finish

Make sure all open transactions (the ones from the cleaner especially)
get drained before we clear the device zone.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/ZonedFreelistManager: simplify freelist merge update vs zone reset
Sage Weil [Fri, 1 Oct 2021 18:14:26 +0000 (13:14 -0500)]
os/bluestore/ZonedFreelistManager: simplify freelist merge update vs zone reset

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluetore: configurable sleep period for cleaner
Sage Weil [Fri, 1 Oct 2021 18:02:24 +0000 (13:02 -0500)]
os/bluetore: configurable sleep period for cleaner

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoblk/zoned: make discard a no-op
Sage Weil [Fri, 1 Oct 2021 17:50:21 +0000 (12:50 -0500)]
blk/zoned: make discard a no-op

Discard is meaningless on SMR or ZNS since we are always explicitly
managing the reset of entire zones.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/ZonedAllocator: count sequential only as 'free'
Sage Weil [Fri, 1 Oct 2021 17:43:23 +0000 (12:43 -0500)]
os/bluestore/ZonedAllocator: count sequential only as 'free'

Completely ignore the conventional region of the device.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: expect smr fields IFF device is smr
Sage Weil [Fri, 1 Oct 2021 14:44:34 +0000 (09:44 -0500)]
os/bluestore: expect smr fields IFF device is smr

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoceph_test_objectstore: Test for fixing write pointer
Adam Kupczyk [Wed, 22 Sep 2021 13:18:49 +0000 (15:18 +0200)]
ceph_test_objectstore: Test for fixing write pointer

Test for checking if bluestore mount() can nicely handle unexpected
change of SMR sequential zone write pointer.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agoceph_test_objectstore: complain if SMR support not compiled in
Adam Kupczyk [Fri, 17 Sep 2021 10:22:58 +0000 (12:22 +0200)]
ceph_test_objectstore: complain if SMR support not compiled in

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agotest/objectstore/run_smr_bluestore_test.sh
Adam Kupczyk [Fri, 17 Sep 2021 10:22:02 +0000 (12:22 +0200)]
test/objectstore/run_smr_bluestore_test.sh

Added execution permissions.
Modified script to account for different lsscsi outputs (7th column was not device path on Ubuntu 20.04).
Added comments.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agoos/bluestore/ZonedAllocator: handle alloc/release spanning zones
Sage Weil [Thu, 23 Sep 2021 15:23:11 +0000 (10:23 -0500)]
os/bluestore/ZonedAllocator: handle alloc/release spanning zones

The same txn may allocate the end of one zone and the start of the next.
These get combined in an interval_set in bluestore and submitted as one
extent to the freelist.  Ensure that we spread the allocate (or release)
over the appropriate zones.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: simple cleaner
Sage Weil [Fri, 17 Sep 2021 19:14:51 +0000 (14:14 -0500)]
os/bluestore: simple cleaner

Rewrite object ranges to move by reusing _do_read and _do_write.  Note that
this will rewrite shared/cloned extents multiple times, so it is
suitable only for workloads/datasets that do not use clone (snapshots).

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: be smarter about picking a zone to clean
Sage Weil [Fri, 17 Sep 2021 18:54:42 +0000 (13:54 -0500)]
os/bluestore: be smarter about picking a zone to clean

Base our selection on best "value" (benefit / cost).

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: avoid writes to cleaning zone
Sage Weil [Fri, 17 Sep 2021 17:38:34 +0000 (12:38 -0500)]
os/bluestore: avoid writes to cleaning zone

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/HybridAllocator: whitespace in debug output
Sage Weil [Thu, 16 Sep 2021 17:10:07 +0000 (12:10 -0500)]
os/bluestore/HybridAllocator: whitespace in debug output

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: give conventional region of SMR to bluefs
Sage Weil [Thu, 16 Sep 2021 17:09:54 +0000 (12:09 -0500)]
os/bluestore: give conventional region of SMR to bluefs

Let bluefs use the conventional region of an SMR HDD.  It won't be able to
use the sequential region if it runs out of space, but it does mean that
bluefs can function on an SMR drive without a dedicated db/wal device.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: separate alloc pointer from shared_alloc.a
Sage Weil [Thu, 16 Sep 2021 16:26:48 +0000 (11:26 -0500)]
os/bluestore: separate alloc pointer from shared_alloc.a

For the moment, these are always the same, so no change in functionality
form this patch.  In a future patch these may be different.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agotest/objectstore/run_smr_bluestore_test.sh
Sage Weil [Fri, 10 Sep 2021 20:25:36 +0000 (15:25 -0500)]
test/objectstore/run_smr_bluestore_test.sh

Needs sudo/root to set up.

Requires tcmu-runner and targetcli be installed (and a sufficiently
new kernel, not sure what the exact version is!).

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoceph_test_objectstore: skip tests that don't work on SMR
Sage Weil [Fri, 10 Sep 2021 18:50:19 +0000 (13:50 -0500)]
ceph_test_objectstore: skip tests that don't work on SMR

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: disable cleaner thread until it is implemented
Sage Weil [Thu, 9 Sep 2021 17:08:55 +0000 (12:08 -0500)]
os/bluestore: disable cleaner thread until it is implemented

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: fsck verify zone refs
Sage Weil [Thu, 9 Sep 2021 16:59:48 +0000 (11:59 -0500)]
os/bluestore: fsck verify zone refs

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: include object in zone ref keys
Sage Weil [Thu, 9 Sep 2021 16:16:29 +0000 (11:16 -0500)]
os/bluestore: include object in zone ref keys

We may have multiple objects referencing the same offset in the same
zone if the object gets cloned.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: refactor object key helpers a bit
Sage Weil [Thu, 9 Sep 2021 16:15:22 +0000 (11:15 -0500)]
os/bluestore: refactor object key helpers a bit

We want methods that work on partial keys.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoceph_test_objectstore: skip failing tests on SMR
Sage Weil [Thu, 9 Sep 2021 14:59:25 +0000 (09:59 -0500)]
ceph_test_objectstore: skip failing tests on SMR

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: report mismatch write pointer during fsck
Sage Weil [Thu, 9 Sep 2021 13:06:19 +0000 (08:06 -0500)]
os/bluestore: report mismatch write pointer during fsck

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: simplify zone to clean selection
Sage Weil [Wed, 8 Sep 2021 16:37:26 +0000 (11:37 -0500)]
os/bluestore: simplify zone to clean selection

Only pick one zone to clean based on the current.  Since the best victim
may change (maybe another zone gets a bunch of releases and new dead
bytes!) there is no reason (yet) to explicitly avoid the victim zone
during allocation.  There is also no need to track which zones we are
cleaning on disk because we can choose to clean from any zone at any time,
and in general want to clean from the best candidate at the time, not the
one that looked the best some time in the past.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoceph_test_objectstore: add trivial fsck test
Sage Weil [Wed, 8 Sep 2021 15:45:50 +0000 (10:45 -0500)]
ceph_test_objectstore: add trivial fsck test

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: fsck smr allocations (verify num_dead_bytes, alloc past write pointer)
Sage Weil [Wed, 8 Sep 2021 15:30:24 +0000 (10:30 -0500)]
os/bluestore: fsck smr allocations (verify num_dead_bytes, alloc past write pointer)

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: duplicate zone refs when cloning
Sage Weil [Tue, 7 Sep 2021 21:56:14 +0000 (16:56 -0500)]
os/bluestore: duplicate zone refs when cloning

When we clone an object, add zone refs pointing to the new object for
any relevant extents.

This is only half of the solution; we will want to make sure the cleaner
is clever enough to keep shared blobs shared when they are relocated.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: correct zoned freelist when device write pointers are ahead
Sage Weil [Tue, 7 Sep 2021 21:36:01 +0000 (16:36 -0500)]
os/bluestore: correct zoned freelist when device write pointers are ahead

If we find that the device's write pointers are ahead of ours, then we
need to advance the allocator *and* update the ondisk freelist so that we
don't see the adjustment on the next bluestore restart too.

(Actually, we could perhaps not manage the freelist at all and rely
entirely on the device's write pointers and a metadata scan on startup
w/ the null freelist mode, but it is cheap to track, and I like having
some redundancy so that we see if/when the device does something
unexpected.)

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/ZonedFreelistManager: whitespace
Sage Weil [Tue, 7 Sep 2021 21:19:01 +0000 (16:19 -0500)]
os/bluestore/ZonedFreelistManager: whitespace

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: fix startup vs device write pointers
Sage Weil [Tue, 7 Sep 2021 18:53:06 +0000 (13:53 -0500)]
os/bluestore: fix startup vs device write pointers

Compare freelist write pointers to the device on startup.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoblk/zoned: add get_zones() to fetch write pointers
Sage Weil [Tue, 7 Sep 2021 18:02:16 +0000 (13:02 -0500)]
blk/zoned: add get_zones() to fetch write pointers

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: use 64 bit values for zone_state_t
Sage Weil [Tue, 7 Sep 2021 17:36:32 +0000 (12:36 -0500)]
os/bluestore: use 64 bit values for zone_state_t

Simpler and future-proof for devices with zones >= 4GB.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: reimplement zone backrefs
Sage Weil [Tue, 7 Sep 2021 16:34:23 +0000 (11:34 -0500)]
os/bluestore: reimplement zone backrefs

Implement a (zone, offset) -> oid reference.  The offset is the first
offset referenced by this object in this zone; subsequent extents in the
same zone will not generate additional refs.  The ref will be removed only
when *all* refs for that object to that zone are gone.

- minimal metadata per zone (one ref to each object involved
- (zone, offset) keys are ordered for efficient sequential cleaning

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: fix smr allocator init
Sage Weil [Mon, 6 Sep 2021 21:45:23 +0000 (16:45 -0500)]
os/bluestore: fix smr allocator init

- initialize from device's pointers
- cross check against freelist manager's pointers (warn!)
- fix init_{add,rm}_free methods to do little/nothing (the other init
  method does most of what we need)

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: do not use null freelist with SMR
Sage Weil [Mon, 6 Sep 2021 21:00:18 +0000 (16:00 -0500)]
os/bluestore: do not use null freelist with SMR

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoblk/zones: implement HMSMRDevice has KernelDevice child
Sage Weil [Mon, 6 Sep 2021 20:36:55 +0000 (15:36 -0500)]
blk/zones: implement HMSMRDevice has KernelDevice child

No need to duplicate so much code when we are just adding a few things.
Also, we want to track KernelDevice changes/improvements.

We could probably integrate these SMR capabilities directly into
KernelDevice too...

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: fix/simplify zoned_cleaner thread start error handling
Sage Weil [Fri, 3 Sep 2021 21:46:14 +0000 (16:46 -0500)]
os/bluestore: fix/simplify zoned_cleaner thread start error handling

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: properly reset zoned allocator on startup
Sage Weil [Fri, 3 Sep 2021 21:41:27 +0000 (16:41 -0500)]
os/bluestore: properly reset zoned allocator on startup

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: force prefer_deferred_size=0 for smr
Sage Weil [Fri, 3 Sep 2021 21:41:03 +0000 (16:41 -0500)]
os/bluestore: force prefer_deferred_size=0 for smr

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: drop SMR 64K min_alloc_size restriction
Sage Weil [Fri, 3 Sep 2021 16:34:06 +0000 (11:34 -0500)]
os/bluestore: drop SMR 64K min_alloc_size restriction

used_blocks is only for fsck.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/ZonedAllocator: less verbose
Sage Weil [Fri, 3 Sep 2021 20:58:47 +0000 (15:58 -0500)]
os/bluestore/ZonedAllocator: less verbose

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/ZonedAllocator: simplify debug output prefix
Sage Weil [Fri, 3 Sep 2021 20:56:38 +0000 (15:56 -0500)]
os/bluestore/ZonedAllocator: simplify debug output prefix

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/ZonedAllocator: be consistent with hex debug output
Sage Weil [Fri, 3 Sep 2021 20:52:25 +0000 (15:52 -0500)]
os/bluestore/ZonedAllocator: be consistent with hex debug output

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore/ZonedAllocator: whitespace
Sage Weil [Fri, 3 Sep 2021 20:00:03 +0000 (15:00 -0500)]
os/bluestore/ZonedAllocator: whitespace

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoblk/zoned: remove dead VDO code
Sage Weil [Fri, 3 Sep 2021 21:22:30 +0000 (16:22 -0500)]
blk/zoned: remove dead VDO code

VDO won't work on an SMR device

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoblk/zoned: add reset_all_zones()
Sage Weil [Fri, 3 Sep 2021 20:53:50 +0000 (15:53 -0500)]
blk/zoned: add reset_all_zones()

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoblk/zoned: print error during init
Sage Weil [Fri, 3 Sep 2021 20:53:30 +0000 (15:53 -0500)]
blk/zoned: print error during init

Otherwise it is easy to miss things like EPERM during testing.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: adjust allocator+freelist interfaces for smr params
Sage Weil [Wed, 11 Aug 2021 16:48:45 +0000 (11:48 -0500)]
os/bluestore: adjust allocator+freelist interfaces for smr params

Instead of shoehorning these fields into alloc_size, adjust the inferfaces
to explicitly pass in zone_size and first_sequential_zone for
Allocator and FreelistManager.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoos/bluestore: select 'zoned' freelistmanager during mkfs, not mount
Sage Weil [Mon, 9 Aug 2021 21:53:19 +0000 (17:53 -0400)]
os/bluestore: select 'zoned' freelistmanager during mkfs, not mount

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoMerge PR #43709 into master
Sage Weil [Fri, 29 Oct 2021 13:54:01 +0000 (09:54 -0400)]
Merge PR #43709 into master

* refs/pull/43709/head:
qa/tasks/cephfs/test_nfs: wait for fs to come up before exporting

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
3 years agoMerge pull request #43602 from sebastian-philipp/cephadm-rgw-ipv6
Sebastian Wagner [Fri, 29 Oct 2021 10:23:19 +0000 (12:23 +0200)]
Merge pull request #43602 from sebastian-philipp/cephadm-rgw-ipv6

mgr/cephadm: Fix RGW ipv6 frontend configuration

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sage Weil <sage@newdream.net>
3 years agoMerge pull request #43260 from cfsnyder/wip-43692-repave-osds
Sebastian Wagner [Fri, 29 Oct 2021 08:02:11 +0000 (10:02 +0200)]
Merge pull request #43260 from cfsnyder/wip-43692-repave-osds

mgr/orchestrator: add --zap flag to 'orch osd rm'

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
3 years agoMerge pull request #43539 from orozery/ms-nocrc
Samuel Just [Fri, 29 Oct 2021 01:37:26 +0000 (18:37 -0700)]
Merge pull request #43539 from orozery/ms-nocrc

msg/async: support disabling data crc for protocol v2

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agoMerge pull request #31877 from rosinL/wip-fix-dpdk-link
Kefu Chai [Thu, 28 Oct 2021 22:58:20 +0000 (06:58 +0800)]
Merge pull request #31877 from rosinL/wip-fix-dpdk-link

cmake: link against DPDK shared libraries to avoid DPDK EAL double initialization

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #43693 from batrick/i53074
Sebastian Wagner [Thu, 28 Oct 2021 22:25:59 +0000 (00:25 +0200)]
Merge pull request #43693 from batrick/i53074

pybind/mgr/cephadm: upgrade MDS if no MDS is "up"

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
3 years agoMerge pull request #43293 from pcuzner/granular-alerts
Sebastian Wagner [Thu, 28 Oct 2021 22:23:24 +0000 (00:23 +0200)]
Merge pull request #43293 from pcuzner/granular-alerts

mgr/prometheus: expose ceph healthchecks as metrics

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
3 years agoMerge PR #43583 into master
Sage Weil [Thu, 28 Oct 2021 20:13:32 +0000 (16:13 -0400)]
Merge PR #43583 into master

* refs/pull/43583/head:
changes to logging code requested by Adam
remove allocation file after rollback to real-fm
bug-fix close db when umount failed to store allocation file
Bug-Fix: When restoring allocation from file use a temp allocator and only copy the allocation to the shared-allocator after the file was verified and all extents were cleared

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
3 years agoMerge PR #43645 into master
Sage Weil [Thu, 28 Oct 2021 20:12:36 +0000 (16:12 -0400)]
Merge PR #43645 into master

* refs/pull/43645/head:
os/bluestore: Disable compaction then no-column-b is storing allocations to bluefs file

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Gabriel Benhanokh <gbenhano@redhat.com>
3 years agoqa/tasks/cephfs/test_nfs: wait for fs to come up before exporting 43709/head
Sage Weil [Thu, 28 Oct 2021 15:23:21 +0000 (11:23 -0400)]
qa/tasks/cephfs/test_nfs: wait for fs to come up before exporting

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoMerge pull request #41325 from rhcs-dashboard/wip-cephadm_box-master
Ernesto Puerta [Thu, 28 Oct 2021 14:59:47 +0000 (16:59 +0200)]
Merge pull request #41325 from rhcs-dashboard/wip-cephadm_box-master

cephadm: add cephadm sandbox (Docker in Docker)

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: sebastian-philipp <NOT@FOUND>
3 years agoMerge pull request #43692 from liewegas/misc-rook-1
Sebastian Wagner [Thu, 28 Oct 2021 14:56:23 +0000 (16:56 +0200)]
Merge pull request #43692 from liewegas/misc-rook-1

mgr/orchestrator: log exception from wrapper

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
3 years agoMerge pull request #43330 from sebastian-philipp/CEPHADM_STRAY_DAEMON
Sebastian Wagner [Thu, 28 Oct 2021 13:05:58 +0000 (15:05 +0200)]
Merge pull request #43330 from sebastian-philipp/CEPHADM_STRAY_DAEMON

doc/cephadm/operations: extend CEPHADM_STRAY_DAEMON

Reviewed-by: Adam King <adking@redhat.com>
3 years agoMerge pull request #43601 from sebastian-philipp/doc-cephadm-osd-similar-disk-layout
Sebastian Wagner [Thu, 28 Oct 2021 10:14:57 +0000 (12:14 +0200)]
Merge pull request #43601 from sebastian-philipp/doc-cephadm-osd-similar-disk-layout

doc/cephadm: improve "Deploying OSDs on multiple similar hosts"

Reviewed-by: Joao Eduardo Luis <joao@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
3 years agoMerge pull request #43622 from Daniel-Pivonka/cephadm-doc-osd-replace-host
Sebastian Wagner [Thu, 28 Oct 2021 10:13:23 +0000 (12:13 +0200)]
Merge pull request #43622 from Daniel-Pivonka/cephadm-doc-osd-replace-host

doc/cephadm: note that replacment osd needs to be on same host as removed osd

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
3 years agoMerge pull request #43681 from cyx1231st/wip-seastore-fix-test-setup-teardown
Samuel Just [Thu, 28 Oct 2021 10:11:05 +0000 (03:11 -0700)]
Merge pull request #43681 from cyx1231st/wip-seastore-fix-test-setup-teardown

crimson/os/seastore: initialize tests in seastar reactor

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
3 years agocephadm/box: add no-tmpfs flag prepare osd bluestore 41325/head
Pere Diaz Bou [Wed, 27 Oct 2021 11:20:04 +0000 (13:20 +0200)]
cephadm/box: add no-tmpfs flag prepare osd bluestore

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agopybind/mgr/cephadm: upgrade MDS if no MDS is "up" 43693/head
Patrick Donnelly [Thu, 28 Oct 2021 00:26:55 +0000 (20:26 -0400)]
pybind/mgr/cephadm: upgrade MDS if no MDS is "up"

The upgrade process can get stuck if an MDS crashes. This should be rare
when straddling v16.2.5 where the compatset of the file system inherits
the FSMap "default". The MDS from pre-v16.2.5 do not yet share a
compatset with the mons so the mons will do no promotions, causing
upgrade task to get stuck.

Fixes: https://tracker.ceph.com/issues/53074
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoMerge pull request #43689 from rzarzynski/wip-auth-drop-get_supported_con_modes
Kefu Chai [Thu, 28 Oct 2021 00:25:06 +0000 (08:25 +0800)]
Merge pull request #43689 from rzarzynski/wip-auth-drop-get_supported_con_modes

auth: drop unused get_supported_con_modes() from AuthServer.

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agomgr/orchestrator: log exception from wrapper 43692/head
Sage Weil [Fri, 15 Oct 2021 15:44:59 +0000 (10:44 -0500)]
mgr/orchestrator: log exception from wrapper

This lets us see a proper traceback when we are calling across
modules.

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agoauth: drop unused get_supported_con_modes() from AuthServer. 43689/head
Radoslaw Zarzynski [Wed, 27 Oct 2021 16:04:11 +0000 (16:04 +0000)]
auth: drop unused get_supported_con_modes() from AuthServer.

In 2d530938753313a776258ff9fa8208db637c9d96 its last user has
been removed.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
3 years agoMerge pull request #43684 from ybwang0211/doc-host
zdover23 [Wed, 27 Oct 2021 14:26:17 +0000 (00:26 +1000)]
Merge pull request #43684 from ybwang0211/doc-host

doc: The description of "Host" on the page is inconsistent

Signed-off-by: wangyingbin ybwang0211@163.com
Reviewed-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #43581 from cbodley/wip-52800
J. Eric Ivancich [Wed, 27 Oct 2021 13:33:08 +0000 (09:33 -0400)]
Merge pull request #43581 from cbodley/wip-52800

rgw: fix lock scope in ObjectCache::get()

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
3 years agoMerge pull request #43170 from thotz/removeusercaps-in-modifyuser
J. Eric Ivancich [Wed, 27 Oct 2021 13:31:12 +0000 (09:31 -0400)]
Merge pull request #43170 from thotz/removeusercaps-in-modifyuser

rgw: remove dead code for user-caps from RGWOp_User_Modify

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #43153 from ivancich/wip-add-bucket-listing-log
J. Eric Ivancich [Wed, 27 Oct 2021 13:30:22 +0000 (09:30 -0400)]
Merge pull request #43153 from ivancich/wip-add-bucket-listing-log

rgw: add logging to bucket listing so calls are better understood

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
3 years agoMerge pull request #42704 from wzbxqt327/patch-1
J. Eric Ivancich [Wed, 27 Oct 2021 13:28:47 +0000 (09:28 -0400)]
Merge pull request #42704 from wzbxqt327/patch-1

rgw,doc: fix command problem

Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #41323 from pkalever/cookie
Mykola Golub [Wed, 27 Oct 2021 12:44:16 +0000 (15:44 +0300)]
Merge pull request #41323 from pkalever/cookie

rbd-nbd: generate and send device cookie with netlink connect request

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
3 years agoMerge pull request #43584 from rhcs-dashboard/add-multiple-hosts-at-once
Ernesto Puerta [Wed, 27 Oct 2021 12:41:35 +0000 (14:41 +0200)]
Merge pull request #43584 from rhcs-dashboard/add-multiple-hosts-at-once

mgr/dashboard: Cluster Creation Add multiple hosts at once

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>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43605 from rhcs-dashboard/bonding-metrics
Ernesto Puerta [Wed, 27 Oct 2021 12:00:29 +0000 (14:00 +0200)]
Merge pull request #43605 from rhcs-dashboard/bonding-metrics

monitoring: ethernet bonding filter in Network Load.

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43603 from rhcs-dashboard/fix-gather-facts-fetch-UI
Ernesto Puerta [Wed, 27 Oct 2021 11:18:52 +0000 (13:18 +0200)]
Merge pull request #43603 from rhcs-dashboard/fix-gather-facts-fetch-UI

mgr/dashboard: fetch host facts only if get_facts orch feature available

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43661 from rhcs-dashboard/review-page-fix
Ernesto Puerta [Wed, 27 Oct 2021 10:23:04 +0000 (12:23 +0200)]
Merge pull request #43661 from rhcs-dashboard/review-page-fix

mgr/dashboard: Cluster expansion review page minor bug fixes

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agocrimson/os/seastore: initialize tests in seastar reactor 43681/head
Yingxin Cheng [Wed, 27 Oct 2021 06:39:10 +0000 (14:39 +0800)]
crimson/os/seastore: initialize tests in seastar reactor

testing::Test from gtest is constructed and destructed outside seastar
application. It is unexpected for most seastore components, and causing
undefined behaviors.

For example, when registering metrics during construction, the logic
needs to be called inside seastar reactor thread because metrics are
maintained in reactor thread-local variables.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore: cleanup transaction_manager_test_state
Yingxin Cheng [Wed, 27 Oct 2021 06:37:54 +0000 (14:37 +0800)]
crimson/os/seastore: cleanup transaction_manager_test_state

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/randomblock-manager: cleanup unit test
Yingxin Cheng [Wed, 27 Oct 2021 06:33:41 +0000 (14:33 +0800)]
crimson/os/seastore/randomblock-manager: cleanup unit test

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/cache: get block-size from reader
Yingxin Cheng [Mon, 25 Oct 2021 08:39:29 +0000 (16:39 +0800)]
crimson/os/seastore/cache: get block-size from reader

Cache cannot get the correct block size before SegmentManager is
mounted.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/store-nbd: cleanup headers
Yingxin Cheng [Wed, 27 Oct 2021 06:23:02 +0000 (14:23 +0800)]
crimson/os/seastore/store-nbd: cleanup headers

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/journal: proper close journal when test finishes
Yingxin Cheng [Tue, 26 Oct 2021 06:19:33 +0000 (14:19 +0800)]
crimson/os/seastore/journal: proper close journal when test finishes

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agodoc: The description of "Host" on the page is inconsistent 43684/head
wangyingbin [Wed, 27 Oct 2021 07:44:19 +0000 (15:44 +0800)]
doc: The description of "Host" on the page is inconsistent

In the "https://docs.ceph.com/en/latest/radosgw/adminops/#radosgw-admin-ops" page, the description of "Host" is not uniform, so I changed it.

Signed-off-by: wangyingbin <ybwang0211@163.com>
3 years agomonitoring: ethernet bonding filter in Network Load 43605/head
Pere Diaz Bou [Thu, 21 Oct 2021 09:14:29 +0000 (11:14 +0200)]
monitoring: ethernet bonding filter in Network Load

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43630 from kkang-wr/master
Kefu Chai [Wed, 27 Oct 2021 01:26:05 +0000 (09:26 +0800)]
Merge pull request #43630 from kkang-wr/master

cmake: add support for python 3.10

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #43648 from rzarzynski/wip-crimson-proper-addrs-for-hbmsgrs
Kefu Chai [Wed, 27 Oct 2021 01:09:01 +0000 (09:09 +0800)]
Merge pull request #43648 from rzarzynski/wip-crimson-proper-addrs-for-hbmsgrs

crimson/osd: fix network address selection for hearbeat's messengers.

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
3 years agoMerge pull request #43671 from javicacheiro/python_data_as_binary
Kefu Chai [Wed, 27 Oct 2021 01:04:18 +0000 (09:04 +0800)]
Merge pull request #43671 from javicacheiro/python_data_as_binary

doc/rbd: correct sample code to use byte string for data

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #43674 from rzarzynski/wip-crimson-net-honor_listen_type
Kefu Chai [Wed, 27 Oct 2021 01:01:44 +0000 (09:01 +0800)]
Merge pull request #43674 from rzarzynski/wip-crimson-net-honor_listen_type

crimson/net: FixedCPUServerSocket::accept() respects the listening addr's type.

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agomgr/prometheus: remove cmake tests 43293/head
Paul Cuzner [Tue, 26 Oct 2021 20:58:17 +0000 (09:58 +1300)]
mgr/prometheus: remove cmake tests

Temporary removal of the cmake test integration

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>