]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
23 months agoos/bluestore: introduce a cooldown period for failed BlueFS allocations. 52212/head
Igor Fedotov [Fri, 11 Nov 2022 14:31:19 +0000 (17:31 +0300)]
os/bluestore: introduce a cooldown period for failed BlueFS allocations.

When using bluefs_shared_alloc_size one might get a long-lasting state when
that large chunks are not available any more and fallback to shared
device min alloc size occurs. The introduced cooldown is intended to
prevent repetitive allocation attempts with bluefs_shared_alloc_size for
a while. The rationale is to eliminate performance penalty these failing
attempts might cause.

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit e52bcc852ce51ab99138420f9069e2f59e1cb706)

 Conflicts:
src/common/options/global.yaml.in
 (legacy options declarations, no yamls in pacific)

2 years agoos/bluestore: get rid off BlueFS::allocate_without_fallback.
Igor Fedotov [Fri, 11 Nov 2022 00:17:51 +0000 (03:17 +0300)]
os/bluestore: get rid off BlueFS::allocate_without_fallback.

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 62ae4e4dc68dd7fc97f9f80e4da7699ec3668d2b)

2 years agoos/bluestore: support main/slow device's alloc unit for BlueFS.
Igor Fedotov [Thu, 10 Nov 2022 22:06:15 +0000 (01:06 +0300)]
os/bluestore: support main/slow device's alloc unit for BlueFS.

This effectively enables having 4K allocation units for BlueFS.
But it doesn't turn it on by default for the sake of performance.
Using main device which lacks enough free large continuous extents
might do the trick though.

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 001b08d0b755a855f19f15b84104c7eb3d367c60)

 Conflicts:
src/os/bluestore/BlueFS.cc
(trivial, no https://github.com/ceph/ceph/pull/39871/)
src/os/bluestore/BlueStore.cc
(trivial, no commits for zoned support)
src/test/objectstore/test_bluefs.cc
(trivial, no https://github.com/ceph/ceph/pull/45883)

2 years agoos/bluestore: dump alloc unit size on bluefs allocation failure.
Igor Fedotov [Mon, 23 Aug 2021 14:54:03 +0000 (17:54 +0300)]
os/bluestore: dump alloc unit size on bluefs allocation failure.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 6a4e328161e4d692bf45605d62ca8fab2fee7670)

2 years agoos/bluestore: output cosmetics for BlueFS
Igor Fedotov [Wed, 9 Nov 2022 14:58:52 +0000 (17:58 +0300)]
os/bluestore: output cosmetics for BlueFS

This includes finer position specification during replay
and logging read size in hex.

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit e5b7ba93191ad41c4a4beae802b7e86c8febec04)

2 years agoos/bluestore: new BlueFS perf counters on compaction.
Igor Fedotov [Wed, 9 Nov 2022 14:36:07 +0000 (17:36 +0300)]
os/bluestore: new BlueFS perf counters on compaction.

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit d4a556128e2df1a495dd7897c6a1b0c66a285aa4)

2 years agotest/test_bluefs: get rid of build warning
Igor Fedotov [Wed, 9 Nov 2022 13:45:03 +0000 (16:45 +0300)]
test/test_bluefs: get rid of build warning

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 228c0532d2886b7662343b68d4c27e6917e2c753)

2 years agoos/bluestore: prepend compacted BlueFS log with a starter part.
Igor Fedotov [Wed, 2 Nov 2022 16:39:14 +0000 (19:39 +0300)]
os/bluestore: prepend compacted BlueFS log with a starter part.

The rationale is to have initial log fnode after compaction small
enough to fit into 4K superblock. Without that compacted metadata might
require fnode longer than 4K which goes beyond existing 4K
superblock. BlueFS assert in this case for now.
Hence the resulting log allocation disposition is like:
- superblock(4K) keeps initial log fnode which refers:
  op_init, op_update_inc(log), op_jump(next seq)
- updated log fnode built from superblock + above op_update_inc refers:
  compacted meta (a bunch of op_update and others)
- *
- more op_update_inc(log) to follow if log is extended
- *

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit b65c780a3b524a44d0f860b0edda3baaac13c539)

2 years agoos/bluestore/bluefs: Fix sync compaction
Adam Kupczyk [Thu, 3 Mar 2022 14:39:00 +0000 (15:39 +0100)]
os/bluestore/bluefs: Fix sync compaction

Fixes problem with sync compaction (_rewrite_log_and_layout_sync).
There was a problem with not updating log_seq after compacting log.

It cause to stop _replay log right after first transaction.

... 20 bluefs _replay 0x0:  op_dir_create sharding
... 20 bluefs _replay 0x0:  op_dir_link  sharding/def to 21
... 20 bluefs _replay 0x0:  op_jump_seq 1025
... 10 bluefs _read h 0x555557c46400 0x1000~1000 from file(ino 1 size 0x1000 mtime 0.000000 allocated 410000 alloc_commit 410000 extents [1:0x1540000~410000])
... 20 bluefs _read left 0xff000 len 0x1000
... 20 bluefs _read got 4096
... 10 bluefs _replay 0x1000: stop: seq 1025 != expected 1026

This is a product of bluefs fine grain locks refactor.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 2f8e37064ca079c960929d7bb91e84fbf7f5cd47)

Conflicts:
src/test/objectstore/test_bluefs.cc
(cherry picked from commit 4fd98ce0359d6c3a36f08a3d87a78c3f0b65018d)

2 years agoos/bluestore: introduce bluefs_fnode_t::swap method
Igor Fedotov [Wed, 9 Nov 2022 02:24:00 +0000 (05:24 +0300)]
os/bluestore: introduce bluefs_fnode_t::swap method

+ minor refactoring.

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 0af28582453122ccd87389261a45127d399caf7d)

2 years agoos/bluestore: increment Bluefs::super.version at _write_super
Igor Fedotov [Wed, 9 Nov 2022 01:39:44 +0000 (04:39 +0300)]
os/bluestore: increment Bluefs::super.version at _write_super

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 0bfc42ac8d3586367e55e71e978d3eb4f62cf5b3)

2 years agoos/bluestore: introduce method to estimate BlueFS transaction size
Igor Fedotov [Tue, 8 Nov 2022 15:16:21 +0000 (18:16 +0300)]
os/bluestore: introduce method to estimate BlueFS transaction size

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 05478fc46bc6437e8e57642a5ffdedde851f08f3)

2 years agoos/bluestore: simplify and cleanup BlueFS::_compact_log_async_...()
Igor Fedotov [Tue, 8 Nov 2022 16:21:08 +0000 (19:21 +0300)]
os/bluestore: simplify and cleanup BlueFS::_compact_log_async_...()

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 0fc0ced22c49c80dc5c0b972fd6e9465252f1909)

2 years agoos/bluestore: get rid off BlueFS::_compact_log_async_dump_metadata_NF()
Igor Fedotov [Tue, 8 Nov 2022 14:51:12 +0000 (17:51 +0300)]
os/bluestore: get rid off BlueFS::_compact_log_async_dump_metadata_NF()

We can reuse _compact_log_dump_metadata_NF() instead

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 285df4b43e8096cb1b3c9c3c5b380cad759ea52c)

2 years agoos/bluestore: unify allocation functions' signature at BlueFS.
Igor Fedotov [Mon, 10 Oct 2022 11:41:43 +0000 (14:41 +0300)]
os/bluestore: unify allocation functions' signature at BlueFS.

Signed-off-by: Igor Fedotov <ifedotov@croit.io>
(cherry picked from commit bd207412f11685297aef2b54502290a1c29bc83b)

2 years agoos/bluestore/bluefs: Add tags and comments for locks
Adam Kupczyk [Tue, 4 Jan 2022 18:03:16 +0000 (19:03 +0100)]
os/bluestore/bluefs: Add tags and comments for locks

Add function tags and comments related to locks.
Fixed locking graph documentation.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit a091ea714d546d91b10484bcac59d6a356591be6)

 Conflicts:
src/os/bluestore/BlueFS.h
 (Lacking backport for https://github.com/ceph/ceph/pull/41557/)

2 years agoos/bluestore/bluefs: Added minor improvements
Adam Kupczyk [Thu, 23 Dec 2021 14:30:59 +0000 (15:30 +0100)]
os/bluestore/bluefs: Added minor improvements

Added comments.
Removed comments.
Fixed lock-tracking suffixes to functions stemming from change
_compact_log_dump_metadata_N -> _compact_log_dump_metadata_NF
Removed extra lock_fnode_print.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit fd9ef8b0c1d4de01be36904a638b86fb8fa58702)

2 years agoos/bluestore/bluefs: Cleanup on pending_release variable
Adam Kupczyk [Thu, 23 Dec 2021 14:12:52 +0000 (15:12 +0100)]
os/bluestore/bluefs: Cleanup on pending_release variable

Moved pending_release to struct dirty {}.
Restructured BlueFS::open_for_write to modify pending_release under dirty.lock.
Now all pending_release modifications are under dirty.lock.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 2b36f27707ba6efb80eeebef487d7403a478a528)

2 years agoos/bluestore/bluefs: Modify _update_logger_stats
Adam Kupczyk [Thu, 23 Dec 2021 12:26:17 +0000 (13:26 +0100)]
os/bluestore/bluefs: Modify _update_logger_stats

Extract updating of num files and log size from _update_logger_stats
and put it exactly where modification happens.
It allows to escape problem of taking nodes.lock and log.lock.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 281504340958f9cdc5ea6737739379726c77a44c)

2 years agoos/bluestore/bluefs: Review comments, misc changes.
Adam Kupczyk [Sat, 4 Dec 2021 15:50:22 +0000 (16:50 +0100)]
os/bluestore/bluefs: Review comments, misc changes.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 9709b14066c359fdb4a56331c0e4feb4f0e732dc)

2 years agoos/bluestore/bluefs: Fix problem with access to fnode in _consume_dirty
Adam Kupczyk [Sat, 4 Dec 2021 15:47:42 +0000 (16:47 +0100)]
os/bluestore/bluefs: Fix problem with access to fnode in _consume_dirty

Fixed problem that fnode in _consume_dirty could be broken if during fsync()
some other thread was writing to the file.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 49b0ee41dd72e5079d41920d35387c3649e6076a)

2 years agoos/bluestore/bluefs: Fix missing lock in compact_log_async
Adam Kupczyk [Tue, 2 Nov 2021 12:17:31 +0000 (13:17 +0100)]
os/bluestore/bluefs: Fix missing lock in compact_log_async

During phase of log fnode switch from new_log to actual log it is necessary to hold lock.
Added that locking.
Modified procedure of transporting extents from old_log to new_log.
Now new_log gets additional extents, instead of removing from old_log; this shortens time
when we need to hold log.lock.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit f2acf52f8d9ea41e1816159c01dd8e6b4b3271c1)

 Conflicts:
src/os/bluestore/BlueFS.cc
(
- Lacking https://github.com/ceph/ceph/pull/41557
- misc stuff with vselector
)

2 years agoos/bluestore/bluefs: Fix vselector
Adam Kupczyk [Tue, 15 Feb 2022 22:13:59 +0000 (23:13 +0100)]
os/bluestore/bluefs: Fix vselector

Fix bluefs volume selector in device_migrate_to_existing.
Fix bluefs volume selector in _rewrite_log_and_layout_sync_LNF_LD.

Fixes: https://tracker.ceph.com/issues/54248
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 3813416e6a8d296312271598e823f876a09b2504)

2 years agoos/bluestore/bluefs: Fix improper vselector tracking in _flush_special()
Adam Kupczyk [Wed, 9 Feb 2022 15:19:56 +0000 (16:19 +0100)]
os/bluestore/bluefs: Fix improper vselector tracking in _flush_special()

Moves vselector size tracking outside _flush_special().
Function _compact_log_async...() updated sizes twice.
Problem could not be solved by making second modification of size just update,
as it will possibly disrupt vselector consistency check (_vselector_check()).
Feature to track vselector consistency relies on the fact that either log.lock or nodes.lock
are taken when the check is performed. Which is not true for _compact_log_async...().

Now _flush_special does not update vselector sizes by itself but leaves the update to
the caller.

Fixes: https://tracker.ceph.com/issues/54248
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 4bc0f61d23299724fad2d8e6f2858734f1db6e5a)

2 years agoos/bluestore/bluefs: Fix incorrect file capture in compact_log_async
Adam Kupczyk [Sat, 30 Oct 2021 18:05:35 +0000 (20:05 +0200)]
os/bluestore/bluefs: Fix incorrect file capture in compact_log_async

It was possible to skip capture of file that was recently modified.
New procedure under one log.lock flushed pending files and captures state.
It is much less interruptible then I had hoped for but I cannot now do it better.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit a296989b54083633af733c517f01fe2abf4b73ff)

2 years agoos/bluestore/bluefs: Fix volume selection / accounting
Adam Kupczyk [Sat, 23 Oct 2021 18:28:25 +0000 (18:28 +0000)]
os/bluestore/bluefs: Fix volume selection / accounting

BlueFS fine grain lock refactor did break accounting in volume selection module.
It caused ceph_test_objectstore to fail on SpilloverFixedTest test.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 41eb537489b790be620b1c29b121f4fb044089f1)

2 years agoos/bluestore/bluefs: Fix false collision with lockdep module
Adam Kupczyk [Tue, 19 Oct 2021 12:38:32 +0000 (12:38 +0000)]
os/bluestore/bluefs: Fix false collision with lockdep module

Usually sequence of locking is 1) FileWriter 2) File.
In _compact_log_async_LD_NF_D it was in reversed order.
No real deadlock was possible, but lockdep complained.

Bonus: Improved lock dependency graph.

Fixes: https://tracker.ceph.com/issues/52939
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 7b7945d6117eb7502729c5dd0b5d383d8bc73f10)

2 years agoos/bluestore/bluefs: Removed unused fields
Adam Kupczyk [Wed, 22 Sep 2021 14:36:21 +0000 (16:36 +0200)]
os/bluestore/bluefs: Removed unused fields

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit d23f0b14c229141a6f777dde39009b57db19db99)

2 years agoos/bluestore/bluefs: Rearrange locks in prealocate
Adam Kupczyk [Tue, 10 Aug 2021 13:15:52 +0000 (15:15 +0200)]
os/bluestore/bluefs: Rearrange locks in prealocate

Rearranged locks in preallocate to avoid possible deadlock with
compact_log_async_dump_metadata_NF.
Cycle was:
L->N rename/mkdir
N->F compact_log_async_dump_metadata_NF
F->L preallocate

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 49316abbc9873f50bf70c5eba3b67f3ebab189bf)

2 years agoos/bluestore/bluefs: Weaken locks in open_for_write
Adam Kupczyk [Thu, 1 Jul 2021 09:33:20 +0000 (11:33 +0200)]
os/bluestore/bluefs: Weaken locks in open_for_write

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit eac1807cf5f19dd79eb95bcb0cde80c67acb69f8)

2 years agoos/bluestore/bluefs: Weaken locks in append_try_flush
Adam Kupczyk [Tue, 29 Jun 2021 11:24:04 +0000 (13:24 +0200)]
os/bluestore/bluefs: Weaken locks in append_try_flush

Extracted _maybe_compact_log outside of file lock.
The sequence FL could deadlock with LNF that is executed in _async_dump_metadata.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit c967c576b1b2218eb383201b57f9f79ec2e4b974)

2 years agoos/bluestore/bluefs: Modify dirty_seq progression logic
Adam Kupczyk [Mon, 28 Jun 2021 12:57:31 +0000 (14:57 +0200)]
os/bluestore/bluefs: Modify dirty_seq progression logic

Modified File.dirty_seq to capture dirty.seq_stable instead of 0. This is used to distunguish
files already serialized for compact_log_async_dump_metadata() function.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 6590a30ebf861a188029af2b59859d2e051c6199)

2 years agoos/bluestore/bluefs: Rename functions to reflect lock that are used
Adam Kupczyk [Mon, 28 Jun 2021 10:56:36 +0000 (12:56 +0200)]
os/bluestore/bluefs: Rename functions to reflect lock that are used

This is modification that only changes names of functions, so tracking of potential deadlocks is simpler.
All internal functions start with _.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit dc787693ed500161c8923787a699ae117423cbbc)

2 years agoos/bluestore/bluefs: Clean up log seq progression
Adam Kupczyk [Thu, 24 Jun 2021 09:08:42 +0000 (11:08 +0200)]
os/bluestore/bluefs: Clean up log seq progression

Splits seq into seq_live and seq_stable. Cleans up log sequencing.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 80ed7b329bba6bb72e7e6d770537356234cf7a4e)

2 years agoos/bluestore/bluefs: Reorganize BlueFS state variables
Adam Kupczyk [Tue, 22 Jun 2021 11:15:21 +0000 (13:15 +0200)]
os/bluestore/bluefs: Reorganize BlueFS state variables

Reorganize BlueFS state variables into separate domains: 1) log, 2) dirty, 3) nodes.
Each has separate lock. This change is intended to make it easier to control which locks
need to be held when specific elements are modified.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit b661fa2fbcda1b7793f6bdd04cd5336613f82d55)

 Conflicts:
src/os/bluestore/BlueFS.cc
 (misordered backports, lacking https://github.com/ceph/ceph/pull/48171 in the source commit)

2 years agoos/bluestore/bluefs: Split single bluefs lock into multiple smaller locks
Adam Kupczyk [Tue, 29 Jun 2021 11:03:56 +0000 (13:03 +0200)]
os/bluestore/bluefs: Split single bluefs lock into multiple smaller locks

Splits bluefs lock into log, dirty, dirs, file and writer locks.
This breaks severe locking issues, and makes bluefs more multithreaded.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit e74474d1fd29164555e1ffab79bde991f621130d)

 Conflicts:
src/os/bluestore/BlueFS.cc
 (misordered backports, lacking https://github.com/ceph/ceph/pull/48171
  in the source commit)

2 years agoos/bluestore/bluefs: Refactor _flush
Adam Kupczyk [Sat, 5 Jun 2021 18:50:46 +0000 (20:50 +0200)]
os/bluestore/bluefs: Refactor _flush

This refactor prepares _flush for fine-grain locks in BlueFS.
Introduced _flush_special, a flush dedicated to bluefs special files (ino=1) and (ino=0).
Function _flush no longer accepts these special files.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit edebf9f9bfae8113d23f1861f6c1eccd74fe3c34)

2 years agoos/bluestore/bluefs: Refactor flush_and_sync_log
Adam Kupczyk [Sat, 5 Jun 2021 06:55:14 +0000 (08:55 +0200)]
os/bluestore/bluefs: Refactor flush_and_sync_log

This refactor prepares flush_and_sync_log and compact_log_async for fine-grain locks in BlueFS.
There is no new logic introduced, but refactor is accompanied by some new comments.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 05703cccee205ef4541448917a9926d55bb57274)

2 years agoMerge pull request #51950 from rhcs-dashboard/wip-61280-pacific
Nizamudeen A [Fri, 23 Jun 2023 08:44:02 +0000 (14:14 +0530)]
Merge pull request #51950 from rhcs-dashboard/wip-61280-pacific

pacific: mgr/dashboard: SSO error: AttributeError: 'str' object has no attribute 'decode'

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2 years agoMerge pull request #52048 from trociny/wip-61301-pacific
Yuri Weinstein [Wed, 21 Jun 2023 15:41:41 +0000 (11:41 -0400)]
Merge pull request #52048 from trociny/wip-61301-pacific

pacific: qa/rgw: add POOL_APP_NOT_ENABLED to log-ignorelist

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #51836 from cbodley/wip-61513
Yuri Weinstein [Wed, 21 Jun 2023 14:25:58 +0000 (10:25 -0400)]
Merge pull request #51836 from cbodley/wip-61513

pacific: radosgw-admin: try reshard even if bucket is resharding

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #51876 from idryomov/wip-61382-pacific
Yuri Weinstein [Mon, 19 Jun 2023 20:14:05 +0000 (16:14 -0400)]
Merge pull request #51876 from idryomov/wip-61382-pacific

pacific: osd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agoMerge pull request #52017 from ljflores/wip-61604-pacific
Laura Flores [Mon, 19 Jun 2023 20:01:23 +0000 (15:01 -0500)]
Merge pull request #52017 from ljflores/wip-61604-pacific

pacific: qa/suites/rados: remove rook coverage from the rados suite

2 years agoMerge pull request #51431 from chrisphoffman/wip-59710-pacific
Ilya Dryomov [Fri, 16 Jun 2023 09:23:38 +0000 (11:23 +0200)]
Merge pull request #51431 from chrisphoffman/wip-59710-pacific

pacific: librbd: localize snap_remove op for mirror snapshots

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2 years agolibrbd: localize snap_remove op for mirror snapshots 51431/head
Christopher Hoffman [Wed, 19 Apr 2023 15:26:27 +0000 (15:26 +0000)]
librbd: localize snap_remove op for mirror snapshots

A client may attempt a lock request not quickly enough to
obtain exclusive lock for operations when another competing
client responds quicker. This can happen when a peer site has
different performance characteristics or latency. Instead of
relying on this unpredictable behavior, localize operation to
primary cluster.

Fixes: https://tracker.ceph.com/issues/59393
Signed-off-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit ac552c9b4d65198db8038d397a3060d5a030917d)

Conflicts:
src/cls/rbd/cls_rbd.cc [ commit 3a93b40 ("librbd:
  s/boost::variant/std::variant/") not in pacific ]
src/librbd/mirror/snapshot/UnlinkPeerRequest.cc [ ditto ]

2 years agoMerge pull request #51856 from petrutlucian94/wip-61525-pacific
Yuri Weinstein [Thu, 15 Jun 2023 19:38:23 +0000 (15:38 -0400)]
Merge pull request #51856 from petrutlucian94/wip-61525-pacific

pacific: librbd: avoid decrementing iterator before first element

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #51778 from idryomov/wip-61368-pacific
Yuri Weinstein [Thu, 15 Jun 2023 19:37:47 +0000 (15:37 -0400)]
Merge pull request #51778 from idryomov/wip-61368-pacific

pacific: tools/ceph-dencoder: Fix incorrect type define for trash_watcher

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
2 years agoMerge pull request #51429 from chrisphoffman/wip-59506-pacific
Yuri Weinstein [Thu, 15 Jun 2023 19:34:46 +0000 (15:34 -0400)]
Merge pull request #51429 from chrisphoffman/wip-59506-pacific

pacific: librbd: remove previous incomplete primary snapshot after successfully creating a new one

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoqa/rgw: add POOL_APP_NOT_ENABLED to log-ignorelist 52048/head
Casey Bodley [Mon, 15 May 2023 18:26:48 +0000 (14:26 -0400)]
qa/rgw: add POOL_APP_NOT_ENABLED to log-ignorelist

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit f0d53e56f8d05090a5f429c8826ca552e0140798)

Conflicts:
qa/rgw/ignore-pg-availability.yaml (trivial)

2 years agoqa/suites/rados: remove rook coverage from the rados suite 52017/head
Laura Flores [Mon, 5 Jun 2023 20:23:42 +0000 (15:23 -0500)]
qa/suites/rados: remove rook coverage from the rados suite

The rook team relies on a daily CI system to validate
rook changes. It doesn't seem that the teuthology tests
are maintained, so it makes sense to remove them from the
rados suite.

By removing this symlink, rook test coverage will remain
in the orch suite, and coverage will only be removed from the
rados suite.

Workaround for: https://tracker.ceph.com/issues/58585
Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit c26674ef4c6cbbdd94c54cafbd66e98704f044d7)

2 years agomgr/dashboard: SSO error: AttributeError: 'str' object has no attribute 'decode' 51950/head
Volker Theile [Tue, 9 May 2023 13:19:42 +0000 (15:19 +0200)]
mgr/dashboard: SSO error: AttributeError: 'str' object has no attribute 'decode'

The token is `str` in PyJWT >= 2 and Python3. Check `controllers/auth.py` where the same code is used.

Fixes: https://tracker.ceph.com/issues/59689
References: https://github.com/SUSE/ceph/pull/506

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 0fc6e7637657a96acfb0aa01dde6b3fbd81a136d)

2 years agoMerge pull request #51882 from adk3798/pacific-no-log-to-journald
zdover23 [Fri, 2 Jun 2023 03:04:11 +0000 (11:04 +0800)]
Merge pull request #51882 from adk3798/pacific-no-log-to-journald

pacific: doc/cephadm: Revert "doc/cephadm: update about disabling logging to journald for quincy"

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/cephadm: Revert "doc/cephadm: update about disabling logging to journald for... 51882/head
Adam King [Fri, 2 Jun 2023 00:47:35 +0000 (20:47 -0400)]
doc/cephadm: Revert "doc/cephadm: update about disabling logging to journald for quincy"

This reverts commit bdb2241ca5a9758e8c52d47320d8b5ea0766aea9.

This commit https://github.com/ceph/ceph/commit/bdb2241ca5a9758e8c52d47320d8b5ea0766aea9
was updating on logging changes in quincy, but seems to have been
erroneously included in a pacific batch backport https://github.com/ceph/ceph/pull/42736

This stuff doesn't work in pacific. For example,

[ceph: root@vm-00 /]# ceph version
ceph version 16.2.13-257-gd8c5d349 (d8c5d34975dce1c5eb0aa3a7979a4d9b9a99d1ec) pacific (stable)
[ceph: root@vm-00 /]# ceph config set global log_to_journald false
Error EINVAL: unrecognized config option 'log_to_journald'

so we shouldn't have it in the pacific docs

Signed-off-by: Adam King <adking@redhat.com>
2 years agoosd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile 51876/head
Ilya Dryomov [Sat, 27 May 2023 10:28:40 +0000 (12:28 +0200)]
osd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile

This was missed in commit acc447d5de7b ("osd/OSDCap: rbd profile
permits use of rbd.metadata_list cls method") which adjusted only
"profile rbd" OSD cap.  Listing image metadata is an essential part
of opening the image and "profile rbd-read-only" OSD cap must allow
it too.

While at it, constrain the existing grant for rbd profile from "any
object in the pool" to just "rbd_info object in the global namespace of
the pool" as this is where pool-level image metadata actually lives.

Fixes: https://tracker.ceph.com/issues/61382
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit b580cdad8d42b4e54fd9e4ef9def13d091f719e9)

2 years agolibrbd: avoid decrementing iterator before first element 51856/head
Lucian Petrut [Thu, 27 Apr 2023 12:44:51 +0000 (12:44 +0000)]
librbd: avoid decrementing iterator before first element

While trying to merge delayed requests, SimpleSchedulerObjectDispatch
can end up iterating before the first element.

With llvm, this leads to a crash:
https://paste.opendev.org/raw/bxnQqqDtIrkOfVvRfkZ6/

This change adds a check, ensuring that we won't decrement the iterator
before the first map element.

Fixes: https://tracker.ceph.com/issues/61503
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit ca65e85575f7b35ce679309e92e0c9bee8d6b96a)

2 years agoMerge pull request #51826 from zdover23/wip-doc-2023-05-30-backport-51798-to-pacific
zdover23 [Tue, 30 May 2023 23:03:34 +0000 (07:03 +0800)]
Merge pull request #51826 from zdover23/wip-doc-2023-05-30-backport-51798-to-pacific

pacific: doc/rados: edit balancer.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoradosgw-admin: try reshard even if bucket is resharding 51836/head
Casey Bodley [Mon, 1 Feb 2021 17:02:44 +0000 (12:02 -0500)]
radosgw-admin: try reshard even if bucket is resharding

allow reshard in case a previous reshard failed. if the reshard is
actually still in progress, we'll fail to get the reshard lock

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 122da8f14a1dae247a5f2f62a3a6e219a9c9de8f)

Conflicts:
src/rgw/rgw_admin.cc  no rgw::current_num_shards()

2 years agodoc/rados: edit balancer.rst 51826/head
Zac Dover [Mon, 29 May 2023 01:18:00 +0000 (09:18 +0800)]
doc/rados: edit balancer.rst

Edit doc/rados/operations/balancer.rst.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit d3660aa20d737729dac708264ceed37560362f91)

2 years agoMerge pull request #51795 from zdover23/wip-doc-2023-05-28-backport-51587-to-pacific...
zdover23 [Sun, 28 May 2023 05:11:57 +0000 (13:11 +0800)]
Merge pull request #51795 from zdover23/wip-doc-2023-05-28-backport-51587-to-pacific-second-attempt

doc/rados: edit bluestore-config-ref.rst (2 of x)

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/rados: edit bluestore-config-ref.rst (2 of x) 51795/head
Zac Dover [Fri, 26 May 2023 18:44:18 +0000 (04:44 +1000)]
doc/rados: edit bluestore-config-ref.rst (2 of x)

Edit the second part of doc/rados/configuration/bluestore-config-ref.rst.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthoy D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 1ceeab30ebde767aaf675fe46e79b9b7d28b881a)

2 years agoMerge pull request #51791 from zdover23/wip-doc-2023-05-27-backport-51771-to-pacific
zdover23 [Sun, 28 May 2023 02:23:04 +0000 (12:23 +1000)]
Merge pull request #51791 from zdover23/wip-doc-2023-05-27-backport-51771-to-pacific

pacific: doc/rados: edit bluestore-config-ref.rst (1 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/rados: edit bluestore-config-ref.rst (1 of x) 51791/head
Zac Dover [Fri, 26 May 2023 08:59:36 +0000 (18:59 +1000)]
doc/rados: edit bluestore-config-ref.rst (1 of x)

Edit the first part of doc/rados/configuration/bluestore-config-ref.rst.

https://tracker.ceph.com/issues/58485

Confval directives have been removed from this backport, because they do
not build in the Pacific release branch.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 3879e4ad417dddef1247521c199925a679d490ac)

2 years agoMerge pull request #51647 from adk3798/pacific-prom-ret-size
Adam King [Fri, 26 May 2023 21:07:55 +0000 (17:07 -0400)]
Merge pull request #51647 from adk3798/pacific-prom-ret-size

pacific: mgr/cephadm: Adding --storage.tsdb.retention.size prometheus option

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agotools/ceph-dencoder: Fix incorrect type define for trash_watcher 51778/head
Chen Yuanrun [Thu, 25 May 2023 08:28:10 +0000 (08:28 +0000)]
tools/ceph-dencoder: Fix incorrect type define for trash_watcher

Signed-off-by: Chen Yuanrun <chen-yuanrun@foxmail.com>
Fixes: https://tracker.ceph.com/issues/61368
(cherry picked from commit e10bcb6905b7e4da4b3a04307d3a2b546da6d5b1)

2 years agomgr/cephadm: Adding --storage.tsdb.retention.size prometheus option 51647/head
Redouane Kachach [Wed, 7 Sep 2022 12:51:10 +0000 (14:51 +0200)]
mgr/cephadm: Adding --storage.tsdb.retention.size prometheus option
fixes: https://tracker.ceph.com/issues/57422

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 4da92c59597dcbf0bba4be50db73233e34108ca9)

Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_services.py

2 years agoMerge pull request #51517 from adk3798/pacific-custom-config
Adam King [Thu, 25 May 2023 14:28:57 +0000 (10:28 -0400)]
Merge pull request #51517 from adk3798/pacific-custom-config

pacific: mgr/cephadm: support for miscellaneous config files for daemons

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #51757 from zdover23/wip-doc-2023-05-25-backport-51754-to-pacific
Anthony D'Atri [Thu, 25 May 2023 11:21:21 +0000 (07:21 -0400)]
Merge pull request #51757 from zdover23/wip-doc-2023-05-25-backport-51754-to-pacific

pacific: doc/rados: fix link in common.rst

2 years agodoc/rados: fix link in common.rst 51757/head
Zac Dover [Thu, 25 May 2023 09:01:49 +0000 (19:01 +1000)]
doc/rados: fix link in common.rst

Fix a link in doc/rados/configuration/common.rst that was missing its
final letter, causing a 404 error when readers attempted to follow it.

This bug was reported by stalwart friend of the Ceph documentation
project Eugen Block, who is here credited as a co-author. This bug was
reported at https://pad.ceph.com/p/Report_Documentation_Bugs.

Co-authored-by: Eugen Block <eblock@nde.ag>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8128ce20fef3d75c6251691d10af21861c01e155)

2 years agoMerge pull request #51753 from zdover23/wip-doc-2023-05-25-backport-51745-to-pacific
Anthony D'Atri [Thu, 25 May 2023 10:02:21 +0000 (06:02 -0400)]
Merge pull request #51753 from zdover23/wip-doc-2023-05-25-backport-51745-to-pacific

pacific: doc/rados: edit filestore-config-ref.rst

2 years agodoc/rados: edit filestore-config-ref.rst 51753/head
Zac Dover [Thu, 25 May 2023 00:16:51 +0000 (10:16 +1000)]
doc/rados: edit filestore-config-ref.rst

Edit doc/rados/configuration/filestore-config-ref.rst.

https://tracker.ceph.com/issues/58485

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 1202e4207bc182d83f193adb1557359d52687103)

2 years agoMerge pull request #51075 from aaSharma14/wip-59446-pacific
Nizamudeen A [Thu, 25 May 2023 07:26:29 +0000 (12:56 +0530)]
Merge pull request #51075 from aaSharma14/wip-59446-pacific

pacific: mgr/dashboard: Fix rbd snapshot creation

Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #51113 from rhcs-dashboard/wip-59460-pacific
Nizamudeen A [Thu, 25 May 2023 05:23:24 +0000 (10:53 +0530)]
Merge pull request #51113 from rhcs-dashboard/wip-59460-pacific

pacific: mgr/dashboard: expose more grafana configs in service form

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agoMerge pull request #51741 from zdover23/wip-doc-2023-05-25-backport-50858-to-pacific
Anthony D'Atri [Thu, 25 May 2023 02:14:41 +0000 (22:14 -0400)]
Merge pull request #51741 from zdover23/wip-doc-2023-05-25-backport-50858-to-pacific

pacific: doc/rados/operations: Acting Set question

2 years agoMerge pull request #51744 from zdover23/wip-doc-2023-05-25-backport-51730-to-pacific
Anthony D'Atri [Thu, 25 May 2023 02:13:05 +0000 (22:13 -0400)]
Merge pull request #51744 from zdover23/wip-doc-2023-05-25-backport-51730-to-pacific

pacific: doc/rados/operations: Fix erasure-code-jerasure.rst fix

2 years agodoc/rados/operations: Fix erasure-code-jerasure.rst fix 51744/head
Anthony D'Atri [Wed, 24 May 2023 13:57:42 +0000 (09:57 -0400)]
doc/rados/operations: Fix erasure-code-jerasure.rst fix

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 2a3177e60d93742d3125f3ef0913dfeb8743e8bf)

2 years agodoc/rados/operations: Acting Set question 51741/head
Zac Dover [Tue, 4 Apr 2023 03:59:46 +0000 (13:59 +1000)]
doc/rados/operations: Acting Set question

Clear up a paragraph that describes the behavior of the Acting Set.

https://tracker.ceph.com/issues/58485

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 3bc9cfd83b3b836775433c7f1b075fe397b56463)

2 years agoMerge pull request #51433 from Svelar/wip-59687-pacific
Adam King [Wed, 24 May 2023 21:47:26 +0000 (17:47 -0400)]
Merge pull request #51433 from Svelar/wip-59687-pacific

pacific: cephadm: eliminate duplication of sections

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #51346 from mgfritch/wip-59649-pacific
Adam King [Wed, 24 May 2023 21:45:24 +0000 (17:45 -0400)]
Merge pull request #51346 from mgfritch/wip-59649-pacific

pacific: mgr/cephadm: don't try to write client/os tuning profiles to known offline hosts

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #51727 from zdover23/wip-doc-2023-05-24-backport-51273-to-pacific
zdover23 [Wed, 24 May 2023 03:15:04 +0000 (13:15 +1000)]
Merge pull request #51727 from zdover23/wip-doc-2023-05-24-backport-51273-to-pacific

pacific: doc: Update jerasure.org references

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc: Update jerasure.org references 51727/head
Anthony D'Atri [Tue, 23 May 2023 23:13:33 +0000 (19:13 -0400)]
doc: Update jerasure.org references

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 5e60e0de275f7260aeae9e664ca22ebfdf8fc5f9)

2 years agoMerge pull request #51722 from zdover23/wip-doc-2023-05-24-backport-51679-to-pacific
Anthony D'Atri [Tue, 23 May 2023 22:35:31 +0000 (18:35 -0400)]
Merge pull request #51722 from zdover23/wip-doc-2023-05-24-backport-51679-to-pacific

pacific: doc/mgr: edit "leaderboard" in telemetry.rst

2 years agodoc/mgr: edit "leaderboard" in telemetry.rst 51722/head
Zac Dover [Mon, 22 May 2023 20:06:52 +0000 (06:06 +1000)]
doc/mgr: edit "leaderboard" in telemetry.rst

Standardize the presentation of commands in the "Leaderboard" section of
doc/mgr/telemetry.rst.

Follow-up to https://github.com/ceph/ceph/pull/50977

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 4935ad8aed2aa796015473de5b38cc973ba85ba1)

2 years agoMerge pull request #51261 from k0ste/wip-53166-pacific
Yuri Weinstein [Tue, 23 May 2023 19:36:55 +0000 (15:36 -0400)]
Merge pull request #51261 from k0ste/wip-53166-pacific

pacific: ceph_test_rados_api_watch_notify: extend Watch3Timeout test

Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #51330 from trociny/wip-59616-pacific
Yuri Weinstein [Tue, 23 May 2023 16:01:58 +0000 (12:01 -0400)]
Merge pull request #51330 from trociny/wip-59616-pacific

pacific: rgw/rados: check_quota() uses real bucket owner

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51266 from mkogan1/wip-58332-pacific
Yuri Weinstein [Tue, 23 May 2023 16:01:31 +0000 (12:01 -0400)]
Merge pull request #51266 from mkogan1/wip-58332-pacific

pacific: rgw: under fips & openssl 3.x allow md5 usage in select rgw ops

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #50560 from ljflores/wip-59091-pacific
Yuri Weinstein [Tue, 23 May 2023 16:00:50 +0000 (12:00 -0400)]
Merge pull request #50560 from ljflores/wip-59091-pacific

pacific: rgw: LDAP fix resource leak with wrong credentials

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #48928 from yuvalif/wip-58036-pacific
Yuri Weinstein [Tue, 23 May 2023 16:00:08 +0000 (12:00 -0400)]
Merge pull request #48928 from yuvalif/wip-58036-pacific

pacific: tests: remove pubsub tests from multisite

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51341 from NitzanMordhai/wip-59628-pacific
Yuri Weinstein [Tue, 23 May 2023 15:28:02 +0000 (11:28 -0400)]
Merge pull request #51341 from NitzanMordhai/wip-59628-pacific

pacific: src/valgrind.supp: Adding know leaks unrelated to ceph

Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #51258 from k0ste/wip-56604-pacific
Yuri Weinstein [Tue, 23 May 2023 15:26:22 +0000 (11:26 -0400)]
Merge pull request #51258 from k0ste/wip-56604-pacific

pacific: Monitor: forward report command to leader

Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #51324 from rhcs-dashboard/wip-59622-pacific
Nizamudeen A [Tue, 23 May 2023 12:48:26 +0000 (18:18 +0530)]
Merge pull request #51324 from rhcs-dashboard/wip-59622-pacific

pacific: mgr/dashboard: fix the rbd mirroring configure check

Reviewed-by: cloudbehl <NOT@FOUND>
2 years agoMerge pull request #51695 from zdover23/wip-doc-2023-05-23-backport-51682-to-pacific
Anthony D'Atri [Tue, 23 May 2023 12:11:15 +0000 (08:11 -0400)]
Merge pull request #51695 from zdover23/wip-doc-2023-05-23-backport-51682-to-pacific

pacific: doc/glossary: update bluestore entry

2 years agodoc/glossary: update bluestore entry 51695/head
Zac Dover [Mon, 22 May 2023 21:41:09 +0000 (07:41 +1000)]
doc/glossary: update bluestore entry

Update the BlueStore entry in the glossary, explaining that as of Reef
BlueStore and only BlueStore (and not FileStore) is the storage backend
for Ceph.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit bcee264276128f622c35e3aab81fdecb2b8afc10)

2 years agoMerge pull request #51654 from zdover23/wip-doc-2023-05-22-backport-51319-to-pacific
Anthony D'Atri [Mon, 22 May 2023 08:55:53 +0000 (04:55 -0400)]
Merge pull request #51654 from zdover23/wip-doc-2023-05-22-backport-51319-to-pacific

pacific: doc: deprecate the cache tiering

2 years agodoc: deprecate the cache tiering 51654/head
Radosław Zarzyński [Tue, 2 May 2023 15:52:23 +0000 (17:52 +0200)]
doc: deprecate the cache tiering

This topic has been discussed many times; recently at the Dev
Summit of Cephalocon 2023.

This commit is the minial version of the work, contained entirely
within the `doc`. However, likely it will be expanded as there
were ideas like e.g. adding cache tiering back experimental feature
list (Sam) to warn users when deploying a new cluster.

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit 535b8db33ea03fbab7ef0c4df5251658f956b0c5)

2 years agoMerge pull request #51621 from zdover23/wip-doc-2023-05-21-backport-51618-to-pacific
Anthony D'Atri [Sat, 20 May 2023 22:16:56 +0000 (18:16 -0400)]
Merge pull request #51621 from zdover23/wip-doc-2023-05-21-backport-51618-to-pacific

pacific: doc: Add missing `ceph` command in documentation section `REPLACING A…

2 years agodoc: Add missing `ceph` command in documentation section `REPLACING AN OSD` 51621/head
Alexander Proschek [Sat, 20 May 2023 21:06:09 +0000 (14:06 -0700)]
doc: Add missing `ceph` command in documentation section `REPLACING AN OSD`

Signed-off-by: Alexander Proschek <alexander.proschek@protonmail.com>
Signed-off-by: Alexander Proschek <alexander.proschek@protonmail.com>
(cherry picked from commit 0557d5e465556adba6d25db62a40ba55a5dd2400)

2 years agodoc/cephadm: custom config files documentation 51517/head
Adam King [Tue, 28 Jun 2022 20:52:05 +0000 (16:52 -0400)]
doc/cephadm: custom config files documentation

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit fa08b55acea0d2fe11e6bfdcf1b414bbf92f5566)

Conflicts:
doc/cephadm/services/index.rst

2 years agomgr/cephadm: unit testing for custom config files
Adam King [Tue, 28 Jun 2022 20:30:58 +0000 (16:30 -0400)]
mgr/cephadm: unit testing for custom config files

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 78598ea58410891cbd38a450500753d7124d476e)

Conflicts:
src/pybind/mgr/cephadm/tests/test_cephadm.py

2 years agoMerge pull request #51597 from zdover23/wip-doc-2023-05-20-backport-51594-to-pacific
zdover23 [Fri, 19 May 2023 20:19:55 +0000 (06:19 +1000)]
Merge pull request #51597 from zdover23/wip-doc-2023-05-20-backport-51594-to-pacific

pacific: doc/rados: edit data-placement.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/rados: edit data-placement.rst 51597/head
Zac Dover [Fri, 19 May 2023 16:26:45 +0000 (02:26 +1000)]
doc/rados: edit data-placement.rst

Edit doc/rados/data-placement.rst.

Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 32600c27c4dca6b9d5fae9892c0a1660b672781c)