]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
23 months agomgr/rbd_support: log number of images 51464/head
Ramana Raja [Wed, 14 Jun 2023 21:41:48 +0000 (17:41 -0400)]
mgr/rbd_support: log number of images

... that have one snapshot request pending when the
mirror_snapshot_schedule handler is shutting down.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit edc3b0e80653c30d0fc318a24673e8a0568912ad)

Conflicts:
src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
 - Above conflict was due to commit e4a16e2
   ("mgr/rbd_support: add type annotation") not in pacific

23 months agomgr/rbd_support: add user-friendly stderr message
Ramana Raja [Wed, 14 Jun 2023 20:17:09 +0000 (16:17 -0400)]
mgr/rbd_support: add user-friendly stderr message

... when the rbd_support module is not ready.

Fixes: https://tracker.ceph.com/issues/61688
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 6351ef5c8e691e359b1bf913dde4dbc8a441be1d)

Conflicts:
src/pybind/mgr/rbd_support/module.py
 - Above conflict was due to commit dcb51b0
   ("mgr/rbd_support: define commands using CLICommand") not in pacific

23 months agorbd_support: recover from "double blocklisting"
Ramana Raja [Wed, 10 May 2023 18:37:44 +0000 (14:37 -0400)]
rbd_support: recover from "double blocklisting"

Recover from being blocklisted while recovering from blocklisting.
When the rbd_support  module is being set up to recover from client
blocklisting, the module's new rados client connection can also get
blocklisted. Currently, this will cause the recovery to fail and
the module will remain inoperable. Instead, retry module recovery
when the new client gets blocklisted during the module setup in the
recovery thread.

Fixes: https://tracker.ceph.com/issues/59713
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 4523d9b68ee84f69e8665a728d4037b53cdf3d6f)

Conflicts:
src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
src/pybind/mgr/rbd_support/module.py
src/pybind/mgr/rbd_support/perf.py
src/pybind/mgr/rbd_support/task.py
src/pybind/mgr/rbd_support/trash_purge_schedule.py
 - Above conflicts were due to commit e4a16e2
   ("mgr/rbd_support: add type annotation") not in pacific
 - Above conflicts were due to commit dcb51b0
   ("mgr/rbd_support: define commands using CLICommand") not in pacific

23 months agoqa/workunits/rbd: Add tests for rbd_support module recovery
Ramana Raja [Sun, 5 Feb 2023 03:36:16 +0000 (22:36 -0500)]
qa/workunits/rbd: Add tests for rbd_support module recovery

... after the module's RADOS client is blocklisted.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit a2f15d4b2f876c79ee1de59fb79851b0eb505951)

23 months agomgr/rbd_support: recover from rados client blocklisting
Ramana Raja [Wed, 15 Feb 2023 15:12:54 +0000 (10:12 -0500)]
mgr/rbd_support: recover from rados client blocklisting

In certain scenarios the OSDs were slow to process RBD requests.
This lead to the rbd_support module's RBD client not being able to
gracefully handover a RBD exclusive lock to another RBD client.
After the condition persisted for some time, the other RBD client
forcefully acquired the lock by blocklisting the rbd_support module's
RBD client, and consequently blocklisted the module's RADOS client. The
rbd_support module stopped working. To recover the module, the entire
mgr service had to be restarted which reloaded other mgr modules.

Instead of recovering the rbd_support module from client blocklisting
by being disruptive to other mgr modules, recover the module
automatically without restarting the mgr serivce. On client getting
blocklisted, shutdown the module's handlers and blocklisted client,
create a new rados client for the module, and start the new handlers.

Fixes: https://tracker.ceph.com/issues/56724
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit cc0468738e5ddb98f7ac10b50e54446197b9c9a0)

Conflicts:
src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
src/pybind/mgr/rbd_support/module.py
src/pybind/mgr/rbd_support/perf.py
src/pybind/mgr/rbd_support/task.py
src/pybind/mgr/rbd_support/trash_purge_schedule.py
 - Above conflicts were due to commit e4a16e2
   ("mgr/rbd_support: add type annotation") not in pacific
 - Above conflicts were due to commit dcb51b0
   ("mgr/rbd_support: define commands using CLICommand") not in pacific

23 months agopybind/rados: add ConnectionShutdown exception class
Ramana Raja [Thu, 12 Jan 2023 02:53:16 +0000 (21:53 -0500)]
pybind/rados: add ConnectionShutdown exception class

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit e452899013323def87a8b9e6edbdae66067a827c)

23 months agomgr/rbd_support: notify the thread waiting on pending snapshot
Ramana Raja [Tue, 17 Jan 2023 03:04:08 +0000 (22:04 -0500)]
mgr/rbd_support: notify the thread waiting on pending snapshot

... requests to be completed.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 38a7e3715f0cee225aa49f3331d85ad37e2b7422)

2 years agodoc/start: fix "Planet Ceph" link 51421/head
Zac Dover [Tue, 9 May 2023 03:39:10 +0000 (13:39 +1000)]
doc/start: fix "Planet Ceph" link

Fix a link to Planet Ceph on the doc/start/get-involved.rst page.

Reported 2023 Apr 21, here:
https://pad.ceph.com/p/Report_Documentation_Bugs

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

2 years agoMerge pull request #51404 from ceph/pacific-release
Laura Flores [Tue, 9 May 2023 21:35:49 +0000 (16:35 -0500)]
Merge pull request #51404 from ceph/pacific-release

v16.2.13

2 years agoMerge pull request #51059 from idryomov/wip-59431-pacific
Yuri Weinstein [Tue, 9 May 2023 19:56:10 +0000 (12:56 -0700)]
Merge pull request #51059 from idryomov/wip-59431-pacific

pacific: qa/suites/rbd: install qemu-utils in addition to qemu-block-extra on Ubuntu

Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #50926 from chrisphoffman/wip-59370-pacific
Yuri Weinstein [Tue, 9 May 2023 19:55:32 +0000 (12:55 -0700)]
Merge pull request #50926 from chrisphoffman/wip-59370-pacific

pacific: librbd: don't wait for a watch in send_acquire_lock() if client is blocklisted

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #50778 from batrick/i58187
Yuri Weinstein [Tue, 9 May 2023 19:54:30 +0000 (12:54 -0700)]
Merge pull request #50778 from batrick/i58187

pacific: log: writes to stderr (pipe) may not be atomic

Reviewed-by: Rishabh Dave <ridave@redhat.com>
2 years agoMerge pull request #47232 from cfsnyder/wip-55830-pacific
Yuri Weinstein [Tue, 9 May 2023 19:51:24 +0000 (12:51 -0700)]
Merge pull request #47232 from cfsnyder/wip-55830-pacific

pacific: common: notify all when max backlog reached in OutputDataSocket

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
2 years agoMerge pull request #51399 from zdover23/wip-doc-2023-05-09-backport-51394-to-pacific
Anthony D'Atri [Tue, 9 May 2023 08:48:15 +0000 (04:48 -0400)]
Merge pull request #51399 from zdover23/wip-doc-2023-05-09-backport-51394-to-pacific

pacific: doc/dev/encoding.txt: update per std::optional

2 years agoMerge pull request #51402 from zdover23/wip-doc-2023-05-09-backport-51392-to-pacific
Anthony D'Atri [Tue, 9 May 2023 08:37:22 +0000 (04:37 -0400)]
Merge pull request #51402 from zdover23/wip-doc-2023-05-09-backport-51392-to-pacific

pacific: doc: update multisite doc

2 years agodoc: update multisite doc 51402/head
parth-gr [Mon, 8 May 2023 13:53:29 +0000 (19:23 +0530)]
doc: update multisite doc

cmd for getting zone group was spelled incorrectly
Updated to rdosgw-admin

Signed-off-by: parth-gr <paarora@redhat.com>
(cherry picked from commit edab93b2f15b19f05a86aab499ba11b56135aaf3)

2 years agodoc/dev/encoding.txt: update per std::optional 51399/head
Radoslaw Zarzynski [Mon, 8 May 2023 14:41:22 +0000 (14:41 +0000)]
doc/dev/encoding.txt: update per std::optional

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 622829cebcca8ae4ec6f0463a4d74c909998a92d)

2 years ago16.2.13 51404/head v16.2.13
Ceph Release Team [Mon, 8 May 2023 20:39:37 +0000 (20:39 +0000)]
16.2.13

Signed-off-by: Ceph Release Team <ceph-maintainers@ceph.io>
2 years agoMerge pull request #51391 from zdover23/wip-doc-2023-05-08-backport-51387-to-pacific
zdover23 [Mon, 8 May 2023 13:37:19 +0000 (23:37 +1000)]
Merge pull request #51391 from zdover23/wip-doc-2023-05-08-backport-51387-to-pacific

pacific: doc/rados: stretch-mode.rst (other commands)

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/rados: stretch-mode.rst (other commands) 51391/head
Zac Dover [Mon, 8 May 2023 11:08:49 +0000 (21:08 +1000)]
doc/rados: stretch-mode.rst (other commands)

Edit the "Other Commands" section of
doc/rados/operations/stretch-mode.rst.

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

2 years agoMerge pull request #51379 from zdover23/wip-doc-2023-05-07-backport-51322-to-pacific 51100/head
Anthony D'Atri [Sun, 7 May 2023 10:37:53 +0000 (06:37 -0400)]
Merge pull request #51379 from zdover23/wip-doc-2023-05-07-backport-51322-to-pacific

pacific: doc/rados: stretch-mode: stretch cluster issues

2 years agodoc/rados: stretch-mode: stretch cluster issues 51379/head
Zac Dover [Wed, 3 May 2023 05:16:07 +0000 (15:16 +1000)]
doc/rados: stretch-mode: stretch cluster issues

Edit "Stretch Cluster Issues", which might better be called "Netsplits"
or "Recognizing Netsplits".

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

2 years agoMerge pull request #51373 from zdover23/wip-doc-2023-05-06-backport-51359-to-pacific
Anthony D'Atri [Sat, 6 May 2023 11:58:21 +0000 (07:58 -0400)]
Merge pull request #51373 from zdover23/wip-doc-2023-05-06-backport-51359-to-pacific

pacific: doc/cephfs: repairing inaccessible FSes

2 years agodoc/cephfs: repairing inaccessible FSes 51373/head
Zac Dover [Fri, 5 May 2023 06:35:28 +0000 (16:35 +1000)]
doc/cephfs: repairing inaccessible FSes

Add a procedure to doc/cephfs/troubleshooting.rst that explains how to
restore access to FileSystems that became inaccessible after
post-Nautilus upgrades. The procedure included here was written by Harry
G Coin, and merely lightly edited by me. I include him here as a
"co-author", but it should be noted that he did the heavy lifting on
this.

See the email thread here for more context:
https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/message/HS5FD3QFR77NAKJ43M2T5ZC25UYXFLNW/

Co-authored-by: Harry G Coin <hgcoin@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 2430127c6e88834c5a6ec46fae15aad04d6d8551)

2 years agoqa: check each fs for health
Yuri Weinstein [Sat, 6 May 2023 00:13:59 +0000 (00:13 +0000)]
qa: check each fs for health

Fixes: https://tracker.ceph.com/issues/59425
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 06c90a6c484f961c2b9b53d26080c38699555180)
(cherry picked from commit acbc33208f1a8ff19138ed7b704f4ebf04cece8c)

2 years agoqa/cephfs: update ceph_fuse.py to fix bug introduced by commit b05b886
Rishabh Dave [Thu, 4 May 2023 13:13:43 +0000 (18:43 +0530)]
qa/cephfs: update ceph_fuse.py to fix bug introduced by commit b05b886

Commit b05b886 removes createfs flag which breaks ceph_fuse.py. Update
ceph_fuse.py accordingly.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 48c5e4531b635d8554894b8c16a89661436d786b)

2 years agoqa/cephfs: check for Ceph FS before mounting
Rishabh Dave [Tue, 23 Feb 2021 18:35:48 +0000 (00:05 +0530)]
qa/cephfs: check for Ceph FS before mounting

If the given Ceph FS, or the default Ceph FS when no Ceph FS is given,
is absent, abort the execution with AsssertionError and an error
message.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 95eb0043bf1987307cb8a2307d54bf482f6abfae)
(cherry picked from commit a9a29fe98c4c6026dfcab96bc08e455cbb94ad78)

2 years agoqa/cephfs: remove parameter createfs from mount classes
Rishabh Dave [Fri, 19 Feb 2021 16:03:45 +0000 (21:33 +0530)]
qa/cephfs: remove parameter createfs from mount classes

It's better to get rid of this paramter since it doesn't actually create
any new Ceph file system.

Fixes: https://tracker.ceph.com/issues/59626
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit db0b85b44076ef952ca71033f3b5b819b8d768af)
(cherry picked from commit f607defb101d2df10267a54a5a44ba644e941551)

2 years agorgw/s3: dump Message field in Error response even if empty
Casey Bodley [Wed, 12 Apr 2023 15:18:15 +0000 (11:18 -0400)]
rgw/s3: dump Message field in Error response even if empty

some clients like veeam fail to decode the response if Message is missing

Fixes: https://tracker.ceph.com/issues/59433
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 6de9e376b61fc11be9033a03d027dd0fa7f200ad)
(cherry picked from commit 796f50b08e1b424d67812d1e7f443618b9059cd9)

2 years agocommon/options: rocksdb_cf_compact_on_deletion is false by default
Radoslaw Zarzynski [Thu, 4 May 2023 15:36:10 +0000 (15:36 +0000)]
common/options: rocksdb_cf_compact_on_deletion is false by default

This is a pacific-specific commit; not a backport. All it does is
switching the default value of `rocksdb_cf_compact_on_deletion`.
The rationale is purely our preference towards avoiding huge
baheavioral changes in minor release, particularly of an old
release family.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit c7fd52f207a72c3ac1bb1b83354fd5bd6a44bd13)

2 years agokv/RocksDBStore: Add CompactOnDeletion support
Mark Nelson [Thu, 21 Jul 2022 21:31:07 +0000 (21:31 +0000)]
kv/RocksDBStore: Add CompactOnDeletion support

This commit adds support to compact column families when a certain number
of tombstone entries have been observed within a certain sliding window
during iteration.  It only helps when itereating over entries already in
SST files and not when iterating over ranges in memtables.

Likely we will still need to provide a mechanism to flush memtables and
compact column families once a certain number of rmkey or rm_range_key
calls are made.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit fba5488728e89d9b0a1c1ab94b7024fcc81b3b15)

Conflicts:
src/common/options/global.yaml.in

Cherry-pick notes:
- Conflicts due to change in configuration options format after Pacific

(cherry picked from commit 317eb8f69834fa08dbb17b19656db2359dbdcbd0)

2 years agoMerge pull request #51344 from rishabh-d-dave/backport-pr-39607-pacific
Yuri Weinstein [Fri, 5 May 2023 18:23:55 +0000 (11:23 -0700)]
Merge pull request #51344 from rishabh-d-dave/backport-pr-39607-pacific

pacific: backport PR #39607

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #51232 from rishabh-d-dave/wip-59560-pacific
Yuri Weinstein [Fri, 5 May 2023 15:37:47 +0000 (08:37 -0700)]
Merge pull request #51232 from rishabh-d-dave/wip-59560-pacific

pacific: qa: check each fs for health

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #50894 from cfsnyder/wip-59330-pacific
Radoslaw Zarzynski [Fri, 5 May 2023 15:31:17 +0000 (17:31 +0200)]
Merge pull request #50894 from cfsnyder/wip-59330-pacific

pacific: kv/RocksDBStore: Add CompactOnDeletion support

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #51150 from rhcs-dashboard/wip-59467-pacific
Nizamudeen A [Fri, 5 May 2023 05:27:59 +0000 (10:57 +0530)]
Merge pull request #51150 from rhcs-dashboard/wip-59467-pacific

pacific: mgr/dashboard: skip Create OSDs step in Cluster expansion

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
2 years agoMerge pull request #51351 from zdover23/wip-doc-2023-05-05-backport-51348-to-pacific
Anthony D'Atri [Fri, 5 May 2023 03:10:16 +0000 (23:10 -0400)]
Merge pull request #51351 from zdover23/wip-doc-2023-05-05-backport-51348-to-pacific

pacific: doc: Use `ceph osd crush tree` command to display weight set weights

2 years agodoc: Use `ceph osd crush tree` command to display weight set weights 51351/head
James Lakin [Thu, 4 May 2023 17:02:36 +0000 (18:02 +0100)]
doc: Use `ceph osd crush tree` command to display weight set weights

The previous `ceph osd tree` doesn't show pool-defined weight-sets as the above documentation suggests.

Signed-off-by: James Lakin <james@jameslakin.co.uk>
(cherry picked from commit 15c3d72a43a37798de823b26f1429f7776f67aaa)

2 years agoMerge pull request #49903 from ifed01/wip-ifed-fix-cls-queue-list-pac
Yuri Weinstein [Thu, 4 May 2023 16:35:42 +0000 (09:35 -0700)]
Merge pull request #49903 from ifed01/wip-ifed-fix-cls-queue-list-pac

pacific: cls/queue: use larger read chunks in queue_list_entries

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51200 from cfsnyder/wip-59528-pacific
Yuri Weinstein [Thu, 4 May 2023 16:16:03 +0000 (09:16 -0700)]
Merge pull request #51200 from cfsnyder/wip-59528-pacific

pacific: rgw/s3: dump Message field in Error response even if empty

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2 years agoMerge pull request #51056 from rhcs-dashboard/wip-59434-pacific
Nizamudeen A [Thu, 4 May 2023 15:37:39 +0000 (21:07 +0530)]
Merge pull request #51056 from rhcs-dashboard/wip-59434-pacific

pacific: mgr/dashboard: rbd-mirror force promotion

Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agocommon/options: rocksdb_cf_compact_on_deletion is false by default 50894/head
Radoslaw Zarzynski [Thu, 4 May 2023 15:36:10 +0000 (15:36 +0000)]
common/options: rocksdb_cf_compact_on_deletion is false by default

This is a pacific-specific commit; not a backport. All it does is
switching the default value of `rocksdb_cf_compact_on_deletion`.
The rationale is purely our preference towards avoiding huge
baheavioral changes in minor release, particularly of an old
release family.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 years agoqa/cephfs: update ceph_fuse.py to fix bug introduced by commit b05b886 51344/head
Rishabh Dave [Thu, 4 May 2023 13:13:43 +0000 (18:43 +0530)]
qa/cephfs: update ceph_fuse.py to fix bug introduced by commit b05b886

Commit b05b886 removes createfs flag which breaks ceph_fuse.py. Update
ceph_fuse.py accordingly.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
2 years agoqa/cephfs: check for Ceph FS before mounting
Rishabh Dave [Tue, 23 Feb 2021 18:35:48 +0000 (00:05 +0530)]
qa/cephfs: check for Ceph FS before mounting

If the given Ceph FS, or the default Ceph FS when no Ceph FS is given,
is absent, abort the execution with AsssertionError and an error
message.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 95eb0043bf1987307cb8a2307d54bf482f6abfae)

2 years agoqa/cephfs: remove parameter createfs from mount classes
Rishabh Dave [Fri, 19 Feb 2021 16:03:45 +0000 (21:33 +0530)]
qa/cephfs: remove parameter createfs from mount classes

It's better to get rid of this paramter since it doesn't actually create
any new Ceph file system.

Fixes: https://tracker.ceph.com/issues/59626
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit db0b85b44076ef952ca71033f3b5b819b8d768af)

2 years agoMerge pull request #51339 from zdover23/wip-doc-2023-05-04-backport-51292-to-pacific
Anthony D'Atri [Thu, 4 May 2023 02:19:40 +0000 (22:19 -0400)]
Merge pull request #51339 from zdover23/wip-doc-2023-05-04-backport-51292-to-pacific

pacific: doc/rados: edit stretch-mode.rst

2 years agodoc/rados: edit stretch-mode.rst 51339/head
Zac Dover [Sun, 30 Apr 2023 02:09:51 +0000 (12:09 +1000)]
doc/rados: edit stretch-mode.rst

Edit "Stretch Mode Limitations" (renamed "Limitations of Stretch Mode"
in this commit) in doc/rados/operations/stretch-mode.rst.

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

2 years agoMerge pull request #51214 from adk3798/wip-59544-pacific
Adam King [Wed, 3 May 2023 21:14:29 +0000 (17:14 -0400)]
Merge pull request #51214 from adk3798/wip-59544-pacific

pacific: cephadm: reschedule haproxy from an offline host

Reviewed-by: Michael Fritch <mfritch@suse.com>
2 years agoMerge pull request #51213 from adk3798/wip-59520-pacific
Adam King [Wed, 3 May 2023 21:12:58 +0000 (17:12 -0400)]
Merge pull request #51213 from adk3798/wip-59520-pacific

pacific: orchestrator: add `--no-destroy` arg to `ceph orch osd rm`

Reviewed-by: Teoman ONAY <tonay@ibm.com>
2 years agoMerge pull request #51212 from adk3798/wip-59309-pacific
Adam King [Wed, 3 May 2023 21:11:22 +0000 (17:11 -0400)]
Merge pull request #51212 from adk3798/wip-59309-pacific

pacific: cephadm: using ip instead of short hostname for prometheus urls

Reviewed-by: Teoman ONAY <tonay@ibm.com>
2 years agoMerge pull request #51211 from adk3798/wip-59181-pacific
Adam King [Wed, 3 May 2023 21:03:22 +0000 (17:03 -0400)]
Merge pull request #51211 from adk3798/wip-59181-pacific

pacific: mgr/orchestrator: fix device size in `orch device ls` output

Reviewed-by: Teoman ONAY <tonay@ibm.com>
2 years agoMerge pull request #51311 from zdover23/wip-doc-2023-05-02-backport-51133-to-pacific
zdover23 [Tue, 2 May 2023 22:25:22 +0000 (08:25 +1000)]
Merge pull request #51311 from zdover23/wip-doc-2023-05-02-backport-51133-to-pacific

pacific: doc/mgr: update prompts in prometheus.rst

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agorgw/s3: dump Message field in Error response even if empty 51200/head
Casey Bodley [Wed, 12 Apr 2023 15:18:15 +0000 (11:18 -0400)]
rgw/s3: dump Message field in Error response even if empty

some clients like veeam fail to decode the response if Message is missing

Fixes: https://tracker.ceph.com/issues/59433
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 6de9e376b61fc11be9033a03d027dd0fa7f200ad)

2 years agoMerge pull request #51207 from guits/wip-59517-pacific
Guillaume Abrioux [Tue, 2 May 2023 12:09:03 +0000 (14:09 +0200)]
Merge pull request #51207 from guits/wip-59517-pacific

pacific: ceph-volume: fix batch refactor issue

2 years agoMerge pull request #51196 from guits/wip-59522-pacific
Guillaume Abrioux [Tue, 2 May 2023 12:07:51 +0000 (14:07 +0200)]
Merge pull request #51196 from guits/wip-59522-pacific

pacific: ceph-volume: quick fix in zap.py

2 years agoMerge pull request #51209 from guits/wip-59256-pacific
Guillaume Abrioux [Tue, 2 May 2023 12:07:16 +0000 (14:07 +0200)]
Merge pull request #51209 from guits/wip-59256-pacific

pacific: ceph-volume: fix drive-group issue that expects the batch_args to be a string

2 years agodoc/mgr: update prompts in prometheus.rst 51311/head
Zac Dover [Tue, 18 Apr 2023 14:28:50 +0000 (16:28 +0200)]
doc/mgr: update prompts in prometheus.rst

Update prompts in prometheus.rst so that they're unselectable.

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

2 years agoMerge pull request #51307 from zdover23/wip-doc-2023-05-02-backport-51299-to-pacific
Anthony D'Atri [Mon, 1 May 2023 23:26:03 +0000 (19:26 -0400)]
Merge pull request #51307 from zdover23/wip-doc-2023-05-02-backport-51299-to-pacific

pacific: doc/radosgw: rabbitmq - push-endpoint edit

2 years agoMerge pull request #51174 from trociny/wip-59237-pacific
Adam King [Mon, 1 May 2023 22:00:42 +0000 (18:00 -0400)]
Merge pull request #51174 from trociny/wip-59237-pacific

pacific: cephadm: mount host /etc/hosts for daemon containers in podman deployments

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2 years agodoc/radosgw: rabbitmq - push-endpoint edit 51307/head
Zac Dover [Mon, 1 May 2023 17:14:01 +0000 (03:14 +1000)]
doc/radosgw: rabbitmq - push-endpoint edit

Remove a note that directed users to change "push-endpoint" (with a
hyphen) to "push_endpoint" (with an underscore) when using rabbitmq.

Re: https://github.com/ceph/ceph/pull/48486#issuecomment-1529925389

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

2 years agoMerge pull request #51304 from zdover23/wip-doc-2023-05-02-backport-51296-to-pacific
Anthony D'Atri [Mon, 1 May 2023 20:36:54 +0000 (16:36 -0400)]
Merge pull request #51304 from zdover23/wip-doc-2023-05-02-backport-51296-to-pacific

pacific: doc/rados: edit stretch-mode.rst

2 years agodoc/rados: edit stretch-mode.rst 51304/head
Zac Dover [Mon, 1 May 2023 02:29:07 +0000 (12:29 +1000)]
doc/rados: edit stretch-mode.rst

Refine and supplement the introductory and explanatory text at the top
of the /doc/rados/operations/stretch-mode.rst file.

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

2 years agoMerge pull request #51291 from zdover23/wip-doc-2023-04-30-backport-51285-to-pacific
Anthony D'Atri [Sat, 29 Apr 2023 20:01:14 +0000 (16:01 -0400)]
Merge pull request #51291 from zdover23/wip-doc-2023-04-30-backport-51285-to-pacific

pacific: doc/rados: edit stretch-mode procedure

2 years agodoc/rados: edit stretch-mode procedure 51291/head
Zac Dover [Sat, 29 Apr 2023 00:14:02 +0000 (10:14 +1000)]
doc/rados: edit stretch-mode procedure

Edit the "stretch mode" section in doc/rados/operations/stretch-mode.rst
so that the procedure is formatted as a procedure and the sentences
correctly have heads.

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

2 years agoMerge pull request #51274 from zdover23/wip-doc-2023-04-28-backport-51271-to-pacific
Anthony D'Atri [Fri, 28 Apr 2023 00:51:58 +0000 (20:51 -0400)]
Merge pull request #51274 from zdover23/wip-doc-2023-04-28-backport-51271-to-pacific

pacific: doc/rados: m-config-ref: edit "background"

2 years agodoc/rados: m-config-ref: edit "background" 51274/head
Zac Dover [Thu, 27 Apr 2023 22:35:17 +0000 (08:35 +1000)]
doc/rados: m-config-ref: edit "background"

Edit the "Background" section of doc/rados/monitor/config-ref.rst

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

2 years agoMerge pull request #51241 from zdover23/wip-doc-2023-04-27-backport-51154-to-pacific
zdover23 [Thu, 27 Apr 2023 00:44:42 +0000 (10:44 +1000)]
Merge pull request #51241 from zdover23/wip-doc-2023-04-27-backport-51154-to-pacific

pacific: doc/rados/ops: edit user-management.rst (3 of x)

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados/ops: edit user-management.rst (3 of x) 51241/head
Zac Dover [Thu, 20 Apr 2023 08:25:00 +0000 (10:25 +0200)]
doc/rados/ops: edit user-management.rst (3 of x)

Line-edit doc/rados/user-management.rst (3 of x).

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

Follows https://github.com/ceph/ceph/pull/51140.

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

2 years agoMerge pull request #51157 from zdover23/wip-doc-2023-04-20-backport-51140-to-pacific
zdover23 [Thu, 27 Apr 2023 00:09:27 +0000 (10:09 +1000)]
Merge pull request #51157 from zdover23/wip-doc-2023-04-20-backport-51140-to-pacific

pacific: doc/rados: edit user-management (2 of x)

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agoMerge pull request #51237 from zdover23/wip-doc-2023-04-27-backport-51204-to-pacific
Anthony D'Atri [Wed, 26 Apr 2023 22:27:10 +0000 (18:27 -0400)]
Merge pull request #51237 from zdover23/wip-doc-2023-04-27-backport-51204-to-pacific

pacific: doc/cephfs: explain cephfs data and metadata set

2 years agodoc/cephfs: explain cephfs data and metadata set 51237/head
Zac Dover [Tue, 25 Apr 2023 07:46:53 +0000 (17:46 +1000)]
doc/cephfs: explain cephfs data and metadata set

Explain how to set application metadata for the CephFS data pool and the
CephFS metadata pool.

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

2 years agoqa: check each fs for health 51232/head
Patrick Donnelly [Tue, 11 Apr 2023 14:16:53 +0000 (10:16 -0400)]
qa: check each fs for health

Fixes: https://tracker.ceph.com/issues/59425
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 06c90a6c484f961c2b9b53d26080c38699555180)

2 years agoMerge pull request #51222 from zdover23/wip-doc-2023-04-26-backport-51193-to-pacific
Anthony D'Atri [Wed, 26 Apr 2023 00:21:39 +0000 (20:21 -0400)]
Merge pull request #51222 from zdover23/wip-doc-2023-04-26-backport-51193-to-pacific

pacific: doc/start: rewrite intro paragraph

2 years agodoc/start: rewrite intro paragraph 51222/head
Zac Dover [Mon, 24 Apr 2023 11:02:16 +0000 (13:02 +0200)]
doc/start: rewrite intro paragraph

Rewrite the first paragraph in doc/start/intro.rst.

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

2 years agomgr/dashboard: rbd-mirror force promotion 51056/head
Pedro Gonzalez Gomez [Wed, 5 Apr 2023 15:42:52 +0000 (17:42 +0200)]
mgr/dashboard: rbd-mirror force promotion

resolves: https://tracker.ceph.com/issues/59327
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
(cherry picked from commit 9696b6a04830297c23c4cccd6e7c225f183ba0b2)

2 years agocephadm: reschedule haproxy from an offline host 51214/head
Michael Fritch [Mon, 17 Apr 2023 14:14:07 +0000 (08:14 -0600)]
cephadm: reschedule haproxy from an offline host

The ingress service (haproxy+keepalived) should be redeployed from an
offline host to allow for client recovery during failover.

Fixes: https://tracker.ceph.com/issues/59472
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 5273a86588b37993a5457fb6a16e3940a53d8a47)

2 years agocephadm: osd replacement improvement 51213/head
Guillaume Abrioux [Fri, 31 Mar 2023 09:27:13 +0000 (11:27 +0200)]
cephadm: osd replacement improvement

This adds a new parameter `--no-destroy` to the command
`ceph orch osd rm`.

By default, it removes any VGs/LVs related to the osd being removed.
For specific workflows, this can be useful to preserve them.

Fixes: https://tracker.ceph.com/issues/59289
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit ef810a4ebf91b538f778da4ca3ea0fdc2968e2fe)

2 years agocephadm: using ip instead of short hostname for prometheus urls 51212/head
Redouane Kachach [Mon, 23 Jan 2023 12:22:27 +0000 (13:22 +0100)]
cephadm: using ip instead of short hostname for prometheus urls
Fixes: https://tracker.ceph.com/issues/58548
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit f56b131c804327411a1ae3cb68042f182f42996e)

2 years agomgr/orchestrator: fix device size in `orch device ls` output 51211/head
Adam King [Thu, 17 Nov 2022 18:14:55 +0000 (13:14 -0500)]
mgr/orchestrator: fix device size in `orch device ls` output

Fixes: https://tracker.ceph.com/issues/58045
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 7e576185ac87877e4d626c09bdef34e194042778)

2 years agoceph-volume: fix drive-group issue 51209/head
Mohan Sharma [Tue, 27 Dec 2022 06:01:04 +0000 (11:31 +0530)]
ceph-volume: fix drive-group issue

The drive-group expects the batch_args to be a string,
however in the current version it is passed as a list
of one element, thus calling the first item of the list solves the issue.

Fixes: https://tracker.ceph.com/issues/59203
Signed-off-by: Mohan Sharma <mohan7427@gmail.com>
(cherry picked from commit 7602a99f7a1308c684a7c1d619bb6d9f09c79af9)

2 years agoceph-volume: fix batch refactor regression 51207/head
Guillaume Abrioux [Thu, 13 Apr 2023 14:42:32 +0000 (16:42 +0200)]
ceph-volume: fix batch refactor regression

This makes sure `ceph-volume lvm batch` will recreate the db device
with the right size when coming from a cluster deployed prior to 14.2.13

Fixes: https://tracker.ceph.com/issues/59442
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 98c68f2c8f648a5b9faac295999de212d362744d)

2 years agoMerge pull request #50694 from kamoltat/wip-ksirivad-backport-pacific-50334
Yuri Weinstein [Mon, 24 Apr 2023 22:46:20 +0000 (15:46 -0700)]
Merge pull request #50694 from kamoltat/wip-ksirivad-backport-pacific-50334

pacific: pybind/mgr/pg_autoscaler: Reorderd if statement for the func: _maybe_adjust

Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agoMerge pull request #51183 from zdover23/wip-doc-2023-04-23-backport-51177-to-pacific
Yuri Weinstein [Mon, 24 Apr 2023 21:15:51 +0000 (21:15 +0000)]
Merge pull request #51183 from zdover23/wip-doc-2023-04-23-backport-51177-to-pacific

pacific: doc/start: edit first 150 lines of documenting-ceph

2 years agoceph-volume: quick fix in zap.py 51196/head
Guillaume Abrioux [Wed, 29 Mar 2023 14:58:11 +0000 (16:58 +0200)]
ceph-volume: quick fix in zap.py

`api.get_single_pv(filters={'lv_uuid': lv.lv_uuid})` needs to be called
only if `--destroy` is passed in order to remove vg and pv when there's
nothing left.

With old deployments, it is possible that a lv_uuid matches more than 1
PV.
Given that `get_single_pv()` is only needed when `--destroy` is passed,
let's move this call where it is actually needed.

This makes `ceph-volume lvm zap` fail even though

Fixes: https://tracker.ceph.com/issues/59210
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit a666f700f16937565484dffc90713f6c04d76313)

2 years agoMerge pull request #51183 from zdover23/wip-doc-2023-04-23-backport-51177-to-pacific
Anthony D'Atri [Sun, 23 Apr 2023 21:19:57 +0000 (23:19 +0200)]
Merge pull request #51183 from zdover23/wip-doc-2023-04-23-backport-51177-to-pacific

pacific: doc/start: edit first 150 lines of documenting-ceph

2 years agoMerge pull request #51186 from zdover23/wip-doc-2023-04-23-backport-51178-to-pacific
Anthony D'Atri [Sun, 23 Apr 2023 21:17:38 +0000 (23:17 +0200)]
Merge pull request #51186 from zdover23/wip-doc-2023-04-23-backport-51178-to-pacific

pacific: doc/glossary: add "Placement Groups" definition

2 years agodoc/glossary: add "Placement Groups" definition 51186/head
Zac Dover [Sat, 22 Apr 2023 08:55:38 +0000 (10:55 +0200)]
doc/glossary: add "Placement Groups" definition

Add a definition of "Placement Groups" to the Glossary.

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

2 years agodoc/start: edit first 50 lines of documenting-ceph 51183/head
Zac Dover [Sat, 22 Apr 2023 07:03:12 +0000 (09:03 +0200)]
doc/start: edit first 50 lines of documenting-ceph

Edit the first 150 lines of doc/start/documenting-ceph.rst. This is part
of an initiative to harvest the fruits of Cephalocon 2023, at which
documentation proved to be in demand to a surprising degree.

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

2 years agoqa/cephadm: add check that iscsi daemon /etc/hosts matches host /etc/hosts 51174/head
Adam King [Mon, 30 Jan 2023 16:27:09 +0000 (11:27 -0500)]
qa/cephadm: add check that iscsi daemon /etc/hosts matches host /etc/hosts

To make sure we aren't being affected by any podman introduced
changes to the /etc/hosts file and test that we're properly
mounting /etc/hosts in our daemon containers

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

Conflicts:
qa/suites/orch/cephadm/dashboard/0-distro/centos_8.stream_container_tools.yaml
qa/suites/orch/cephadm/thrash-old-clients/0-size-min-size-overrides/.qa
qa/suites/orch/cephadm/workunits/task/test_iscsi_container/.qa
qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml
qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml
qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit.yaml
qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/.qa
qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/centos_8.stream_container_tools.yaml
qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/test_iscsi_pids_limit.yaml
   (due to test_iscsi_pids_limit not backported)

2 years agocephadm: mount host /etc/hosts for containers in podman deployments
Adam King [Sat, 21 Jan 2023 23:44:22 +0000 (18:44 -0500)]
cephadm: mount host /etc/hosts for containers in podman deployments

Podman messes with the /etc/hosts file in certain version. There
was already a past issue with it placing the container name
there fixed by https://github.com/ceph/ceph/pull/42242. This time
it is adding an entry for "host.containers.internal" (seems to be
podman 4.1 onward currently). Iscsi figures out the FQDN for a
host by running

python3 -c 'import socket; print(socket.getfqdn())

which is resolving to "host.containers.internal" when run in
the container with the podman modified /etc/hosts.

There is also an issue with grafana dashboard with
this entry present

Passing --no-hosts resolves this, but I think in the past
we avoided that due to not wanting to break deployments
where host name resolution was handled using /etc/hosts.
That's why we had that workaround previously linked. This
time I'm not sure such a workaround exists. The try here
is to mount a copy of the host's version of /etc/hosts
into the iscsi container. That copy won't have the extra
entry podman adds in but will have any user created entries in
case they were actually using it for host name resolution.
If /etc/hosts file isn't present for whatever reason, we're
assuming that this user isn't using /etc/hosts for hostname
resolution, and just going back to passing --no-hosts.

Fixes: https://tracker.ceph.com/issues/58532
Fixes: https://tracker.ceph.com/issues/57018
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit dd8627bbe3ebc6d924912a37785859d8124f95e5)

2 years agodoc/rados: edit user-management (2 of x) 51157/head
Zac Dover [Tue, 18 Apr 2023 20:59:09 +0000 (22:59 +0200)]
doc/rados: edit user-management (2 of x)

Line-edit doc/rados/user-management.rst (2 of x). Some internal
references had to be removed, but these will be repaired when the next
part of this file is updated in a future PR.

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

2 years agomgr/dashboard: skip Create OSDs step in Cluster expansion 51150/head
Nizamudeen A [Fri, 14 Apr 2023 19:33:11 +0000 (01:03 +0530)]
mgr/dashboard: skip Create OSDs step in Cluster expansion

Its to ensure OSDs are not deployed on all hosts because that would make
the host draining impossible

Fixes: https://tracker.ceph.com/issues/59457
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 0f6d23a7aa024495a79cdedc80f7a00902115b6b)

2 years agoMerge pull request #50597 from neesingh-rh/wip-58986-pacific
Yuri Weinstein [Tue, 18 Apr 2023 15:04:04 +0000 (08:04 -0700)]
Merge pull request #50597 from neesingh-rh/wip-58986-pacific

pacific: cephfs-top: Handle `METRIC_TYPE_NONE` fields for sorting

Reviewed-by: Rishabh Dave <ridave@redhat.com>
2 years agoMerge pull request #50305 from idryomov/wip-58647-pacific
Yuri Weinstein [Tue, 18 Apr 2023 15:01:37 +0000 (08:01 -0700)]
Merge pull request #50305 from idryomov/wip-58647-pacific

pacific: mon/MgrMap: dump last_failure_osd_epoch and active_clients at top level

Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #51081 from rhcs-dashboard/wip-59453-pacific
Nizamudeen A [Mon, 17 Apr 2023 13:39:22 +0000 (19:09 +0530)]
Merge pull request #51081 from rhcs-dashboard/wip-59453-pacific

pacific: mgr/dashboard: fix cephadm e2e expression changed error

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
2 years agoMerge pull request #51118 from zdover23/wip-doc-2023-04-17-backport-51114-to-pacific
colemitchell [Mon, 17 Apr 2023 10:43:36 +0000 (12:43 +0200)]
Merge pull request #51118 from zdover23/wip-doc-2023-04-17-backport-51114-to-pacific

pacific: doc/radosgw: format part of s3select

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/radosgw: format part of s3select 51118/head
Cole Mitchell [Mon, 17 Apr 2023 09:34:49 +0000 (05:34 -0400)]
doc/radosgw: format part of s3select

Partially format the 'Basic Workflow' section's introduction and 'Basic Functionalities' subsection in s3select. Nothing else is being fixed.

Signed-off-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
(cherry picked from commit 13cf134c0610509da52aa68e11e26f0740002bde)

2 years agoMerge pull request #51094 from zdover23/wip-doc-2023-04-16-backport-51091-to-pacific
zdover23 [Sun, 16 Apr 2023 16:26:30 +0000 (18:26 +0200)]
Merge pull request #51094 from zdover23/wip-doc-2023-04-16-backport-51091-to-pacific

pacific: doc/mgr/prometheus: fix confval reference

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #51109 from zdover23/wip-doc-2023-04-16-backport-51099-to-pacific
zdover23 [Sun, 16 Apr 2023 16:24:49 +0000 (18:24 +0200)]
Merge pull request #51109 from zdover23/wip-doc-2023-04-16-backport-51099-to-pacific

pacific: doc/dev: format command in cephfs-mirroring

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #51098 from zdover23/wip-doc-2023-04-16-backport-51062-to-pacific
zdover23 [Sun, 16 Apr 2023 16:22:54 +0000 (18:22 +0200)]
Merge pull request #51098 from zdover23/wip-doc-2023-04-16-backport-51062-to-pacific

pacific: doc/glossary: add "Hybrid Storage"

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/mgr/prometheus: fix confval reference 51094/head
Piotr Parczewski [Sat, 15 Apr 2023 21:16:35 +0000 (23:16 +0200)]
doc/mgr/prometheus: fix confval reference

Signed-off-by: Piotr Parczewski <piotr@stackhpc.com>
(cherry picked from commit b9b75dafe248e07b21f2958023697397094cc537)