]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
15 months agoceph-volume: fix zap_partitions() in devices.lvm.zap 55480/head
Guillaume Abrioux [Tue, 30 Jan 2024 14:17:35 +0000 (14:17 +0000)]
ceph-volume: fix zap_partitions() in devices.lvm.zap

The current logic is unable to find the holders for the
partition being zapped.

This commit fixes this issue.

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

15 months agoceph-volume: fix partitions support in disk.get_devices()
Guillaume Abrioux [Fri, 26 Jan 2024 20:35:18 +0000 (21:35 +0100)]
ceph-volume: fix partitions support in disk.get_devices()

The following:
```
is_part = get_file_contents(os.path.join(_sys_dev_block_path, item, 'partition')) == "1"
```
assumes any `/sys/dev/block/x:y/partition` contains '1' which is wrong.
This file actually contains the corresponding partition number.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit f72100bbd17539d9774ae72215afefee16f20775)

15 months agoceph-volume: fix util.get_partitions
Guillaume Abrioux [Tue, 3 Oct 2023 23:11:32 +0000 (01:11 +0200)]
ceph-volume: fix util.get_partitions

The current logic makes it report only the first
partitions of devices.

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

15 months agoMerge pull request #56496 from zdover23/wip-doc-2024-03-27-backport-56450-to-quincy
Zac Dover [Wed, 27 Mar 2024 13:33:20 +0000 (23:33 +1000)]
Merge pull request #56496 from zdover23/wip-doc-2024-03-27-backport-56450-to-quincy

quincy: docs/rados: remove incorrect ceph command

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
15 months agoMerge pull request #55543 from rhcs-dashboard/wip-61715-quincy
Nizamudeen A [Wed, 27 Mar 2024 05:20:20 +0000 (10:50 +0530)]
Merge pull request #55543 from rhcs-dashboard/wip-61715-quincy

quincy: mgr/dashboard: fix the jsonschema issue in install-deps

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: ivoalmeida <NOT@FOUND>
15 months agoMerge pull request #55545 from rhcs-dashboard/wip-61659-quincy
Nizamudeen A [Wed, 27 Mar 2024 05:19:48 +0000 (10:49 +0530)]
Merge pull request #55545 from rhcs-dashboard/wip-61659-quincy

quincy: mgr/dashboard: change deprecated grafana URL in daemon logs

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: ivoalmeida <NOT@FOUND>
15 months agodocs/rados: remove incorrect ceph command 56496/head
Taha Jahangir [Mon, 25 Mar 2024 10:02:12 +0000 (13:32 +0330)]
docs/rados: remove incorrect ceph command

The removed line was (incorrectly changed) output of the previous command.

Signed-off-by: Taha Jahangir <mtjahangir@gmail.com>
(cherry picked from commit 3cd39e3582ed830f86c55d2203ece72fa0f9426b)

15 months agoMerge pull request #56212 from idryomov/wip-63770-quincy
Yuri Weinstein [Tue, 26 Mar 2024 16:07:14 +0000 (09:07 -0700)]
Merge pull request #56212 from idryomov/wip-63770-quincy

quincy: librbd: account for discards that truncate in ObjectListSnapsRequest

Reviewed-by: Ramana Raja <rraja@redhat.com>
15 months agoMerge pull request #55501 from cbodley/wip-64363-quincy
Yuri Weinstein [Tue, 26 Mar 2024 16:06:36 +0000 (09:06 -0700)]
Merge pull request #55501 from cbodley/wip-64363-quincy

quincy: cmake/modules/BuildRocksDB.cmake: inherit parent's CMAKE_CXX_FLAGS

Reviewed-by: Mark Nelson <mnelson@redhat.com>
15 months agoMerge pull request #55154 from rzarzynski/wip-64007-quincy
Yuri Weinstein [Tue, 26 Mar 2024 16:05:56 +0000 (09:05 -0700)]
Merge pull request #55154 from rzarzynski/wip-64007-quincy

quincy:  common/weighted_shuffle: don't feed std::discrete_distribution with all-zero weights

Reviewed-by: Prashant D <pdhange@redhat.com>
15 months agoMerge pull request #54904 from kamoltat/wip-ksirivad-backport-quincy-52633
Yuri Weinstein [Tue, 26 Mar 2024 16:04:30 +0000 (09:04 -0700)]
Merge pull request #54904 from kamoltat/wip-ksirivad-backport-quincy-52633

quincy: pybind/mgr/pg_autoscaler: Cut back osdmap.get_pools calls

Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
15 months agoMerge pull request #54785 from ifed01/wip-ifed-better-osd-robust-qui
Igor Fedotov [Tue, 26 Mar 2024 11:28:59 +0000 (14:28 +0300)]
Merge pull request #54785 from ifed01/wip-ifed-better-osd-robust-qui

quincy: osd: improve OSD robustness.

Reviewed-by: Pere Diaz Bou <pere-altea@hotmail.com>
15 months agoMerge pull request #56121 from xhernandez/wip-64736-quincy
Venky Shankar [Tue, 26 Mar 2024 10:46:36 +0000 (16:16 +0530)]
Merge pull request #56121 from xhernandez/wip-64736-quincy

quincy: client: fix leak of file handles

Reviewed-by: Venky Shankar <vshankar@redhat.com>
15 months agoMerge pull request #56061 from mchangir/wip-64810-quincy
Venky Shankar [Tue, 26 Mar 2024 10:46:16 +0000 (16:16 +0530)]
Merge pull request #56061 from mchangir/wip-64810-quincy

quincy: mds: add debug logs during setxattr ceph.dir.subvolume

Reviewed-by: Venky Shankar <vshankar@redhat.com>
15 months agoMerge pull request #55986 from joscollin/wip-64742-quincy
Venky Shankar [Tue, 26 Mar 2024 10:46:06 +0000 (16:16 +0530)]
Merge pull request #55986 from joscollin/wip-64742-quincy

quincy: mds: add a command to dump directory information

Reviewed-by: Venky Shankar <vshankar@redhat.com>
15 months agoMerge pull request #55299 from neesingh-rh/wip-64097-quincy
Venky Shankar [Tue, 26 Mar 2024 10:45:26 +0000 (16:15 +0530)]
Merge pull request #55299 from neesingh-rh/wip-64097-quincy

quincy: src/mount: kernel mount command returning misleading error message

Reviewed-by: Venky Shankar <vshankar@redhat.com>
15 months agoMerge pull request #54465 from lxbsz/wip-63274
Venky Shankar [Tue, 26 Mar 2024 10:45:00 +0000 (16:15 +0530)]
Merge pull request #54465 from lxbsz/wip-63274

quincy: client: queue a delay cap flushing if there are ditry caps/snapcaps

Reviewed-by: Venky Shankar <vshankar@redhat.com>
15 months agoMerge pull request #56441 from rhcs-dashboard/wip-65101-quincy
Nizamudeen A [Tue, 26 Mar 2024 09:28:04 +0000 (14:58 +0530)]
Merge pull request #56441 from rhcs-dashboard/wip-65101-quincy

quincy: mgr/dashboard: rm warning/error threshold for cpu usage

Reviewed-by: afreen23 <NOT@FOUND>
15 months agomgr/dashboard: rm warning/error threshold for cpu usage 56441/head
Nizamudeen A [Tue, 19 Mar 2024 14:57:13 +0000 (20:27 +0530)]
mgr/dashboard: rm warning/error threshold for cpu usage

for multi-core cpu's the value can be more than 100% so it doesn't make
sense to show warning/error when the usage is at or more than 100%.
hence removing it

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.html
  - some changes are not in quincy for the threasholds. so adapting it

15 months agoMerge pull request #56427 from zdover23/wip-doc-2024-08-24-backport-56367-to-quincy
Anthony D'Atri [Sun, 24 Mar 2024 13:27:49 +0000 (09:27 -0400)]
Merge pull request #56427 from zdover23/wip-doc-2024-08-24-backport-56367-to-quincy

quincy: doc/start: improve MDS explanation

15 months agoMerge pull request #56411 from zdover23/wip-doc-2024-03-23-backport-56377-to-quincy
Zac Dover [Sun, 24 Mar 2024 07:32:25 +0000 (17:32 +1000)]
Merge pull request #56411 from zdover23/wip-doc-2024-03-23-backport-56377-to-quincy

quincy: doc/start: link to mon map command

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
15 months agodoc/start: improve MDS explanation 56427/head
Zac Dover [Thu, 21 Mar 2024 12:48:10 +0000 (22:48 +1000)]
doc/start: improve MDS explanation

Remove a prolix "on behalf of" and streamline some sentences explaining
the benefits of MDS.

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

15 months agodoc/start: link to mon map command 56411/head
Zac Dover [Thu, 21 Mar 2024 22:12:16 +0000 (08:12 +1000)]
doc/start: link to mon map command

Link to the "ceph mon stat" command when "Intro to Ceph" document first
mentions Monitor Maps.

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

15 months agoosd: read osd superblock from both disk and omap and choose the best 54785/head
Igor Fedotov [Thu, 9 Mar 2023 18:03:12 +0000 (21:03 +0300)]
osd: read osd superblock from both disk and omap and choose the best

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

15 months agoosd: improve OSD robustness.
Igor Fedotov [Thu, 29 Sep 2022 11:52:45 +0000 (14:52 +0300)]
osd: improve OSD robustness.

Achieved by
1. osd superblock data is replicated in onode's OMAP - hence one can
   recover from that after onode's content is corrupted.
2. pg_num_history object gets full overwrite which eliminatess the need to
   merge with previous data (and hence reading corrupted data wouldn't
   kill OSD).

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

16 months agoMerge pull request #56341 from zdover23/wip-doc-2024-03-20-backport-56333-to-quincy
Zac Dover [Thu, 21 Mar 2024 02:04:01 +0000 (12:04 +1000)]
Merge pull request #56341 from zdover23/wip-doc-2024-03-20-backport-56333-to-quincy

quincy: doc/cephfs: fix architecture link to correct relative path

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
16 months agoMerge pull request #56269 from zdover23/wip-doc-2024-08-19-backport-56240-to-quincy
Zac Dover [Thu, 21 Mar 2024 02:03:06 +0000 (12:03 +1000)]
Merge pull request #56269 from zdover23/wip-doc-2024-08-19-backport-56240-to-quincy

quincy: doc/rados: update common.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
16 months agoMerge pull request #55014 from Matan-B/wip-63879-quincy
Yuri Weinstein [Wed, 20 Mar 2024 23:20:14 +0000 (16:20 -0700)]
Merge pull request #55014 from Matan-B/wip-63879-quincy

quincy: tools/ceph_objectstore_tool: Support get/set/superblock

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
16 months agodoc/cephfs: fix architecture link to correct relative path 56341/head
molpako [Wed, 20 Mar 2024 09:43:42 +0000 (18:43 +0900)]
doc/cephfs: fix architecture link to correct relative path

Signed-off-by: molpako <35787116+molpako@users.noreply.github.com>
(cherry picked from commit ceeb1ca4b38dc307e493b04a59d5d07fed23971f)

16 months agoclient: fix leak of file handles 56121/head
Xavi Hernandez [Fri, 16 Feb 2024 18:14:07 +0000 (19:14 +0100)]
client: fix leak of file handles

Based on posix specification, the fd passed to fdopendir() will be
closed by closedir(). However CephFS client wasn't doing that. If the
user opened a directory using ceph_openat(), for example, and then
passed the returned fd to ceph_fdopendir(), the created Fh associated
with the new open was never destroyed.

This patch records the fd used in ceph_fdopendir() so that it can be
closed when ceph_closedir() is called.

Fixes: https://tracker.ceph.com/issues/64479
Signed-off-by: Xavi Hernandez <xhernandez@gmail.com>
(cherry picked from commit fe5c13d2e207473d48aa818484584d67dc3d23b5)

16 months agoMerge pull request #56195 from vshankar/wip-64925-quincy
Venky Shankar [Wed, 20 Mar 2024 05:04:57 +0000 (10:34 +0530)]
Merge pull request #56195 from vshankar/wip-64925-quincy

quincy: mds: disable `defer_client_eviction_on_laggy_osds' by default

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
16 months agoMerge pull request #55549 from k0ste/wip-64396-quincy
Yuri Weinstein [Tue, 19 Mar 2024 14:47:01 +0000 (07:47 -0700)]
Merge pull request #55549 from k0ste/wip-64396-quincy

quincy: mon: fix health store size growing infinitely

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Matan Breizman <Matan.Brz@gmail.com>
16 months agoMerge pull request #55698 from pdvian/wip-63843-quincy
Yuri Weinstein [Tue, 19 Mar 2024 14:45:37 +0000 (07:45 -0700)]
Merge pull request #55698 from pdvian/wip-63843-quincy

quincy: osd: Report health error if OSD public address is not within subnet

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
16 months agoMerge pull request #55929 from ajarr/wip-64667-quincy
Ilya Dryomov [Tue, 19 Mar 2024 14:40:10 +0000 (15:40 +0100)]
Merge pull request #55929 from ajarr/wip-64667-quincy

quincy: qa: add diff-continuous and compare-mirror-image tests to rbd and krbd suites respectively

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
16 months agoqa/suites: add diff-continuous and compare-mirror-image tests 55929/head
Ramana Raja [Thu, 29 Feb 2024 17:12:19 +0000 (12:12 -0500)]
qa/suites: add diff-continuous and compare-mirror-image tests

... to rbd and krbd suites respectively.

This allows the compare-mirror-image tests introduced in ea3a567
to be run against various kernel branches, e.g., testing branch.
And allows diff_continuous test in rbd_suite to run against distro
kernel.

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

16 months agoqa/suites/rbd: rename nbd folder to device folder
Ramana Raja [Thu, 29 Feb 2024 16:55:08 +0000 (11:55 -0500)]
qa/suites/rbd: rename nbd folder to device folder

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

16 months agoMerge pull request #55210 from mchangir/wip-64033-quincy
Milind Changire [Tue, 19 Mar 2024 03:11:56 +0000 (08:41 +0530)]
Merge pull request #55210 from mchangir/wip-64033-quincy

quincy: mgr/snap_schedule: support subvol and group arguments

16 months agoMerge pull request #56272 from idryomov/wip-doc-undo-flatten-encryption
Zac Dover [Mon, 18 Mar 2024 20:02:26 +0000 (06:02 +1000)]
Merge pull request #56272 from idryomov/wip-doc-undo-flatten-encryption

doc/rbd: "rbd flatten" doesn't take encryption options in quincy

Reviewed-by: Zac Dover <zac.dover@proton.me>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
16 months agodoc/rbd: "rbd flatten" doesn't take encryption options in quincy 56272/head
Ilya Dryomov [Mon, 18 Mar 2024 19:11:26 +0000 (20:11 +0100)]
doc/rbd: "rbd flatten" doesn't take encryption options in quincy

This sneaked in in commit 0262dc99ff48 ("doc/rbd: minor changes to the
rbd man page") with an incorrect conflict resolution.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
16 months agodoc/rados: update common.rst 56269/head
Zac Dover [Sun, 17 Mar 2024 09:27:11 +0000 (19:27 +1000)]
doc/rados: update common.rst

Clarify some overwritten paragraphs in
doc/rados/configuration/common.rst. Cf.
https://github.com/ceph/ceph/pull/50795/files#r1153897231.

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

16 months agoMerge pull request #56263 from zdover23/wip-doc-2024-03-19-backport-56247-to-quincy
Zac Dover [Mon, 18 Mar 2024 17:39:44 +0000 (03:39 +1000)]
Merge pull request #56263 from zdover23/wip-doc-2024-03-19-backport-56247-to-quincy

quincy: docs/rbd: fix typo in arg name

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
16 months agodocs/rbd: fix typo in arg name 56263/head
N Balachandran [Mon, 18 Mar 2024 04:02:39 +0000 (09:32 +0530)]
docs/rbd: fix typo in arg name

Replace "{image-}" with "{image-id}" in the "rbd trash rm"
command description.

Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit f3eb489520fd4fae057e61275d16c6c8fd596f3f)

docs/rbd: replace introspect with inspect

Replace "introspect" with "inspect" in the rbd basic commands
description.

Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit ebf2f60f784728c04d8ec59015d666bafcef8218)

docs/rbd: typo in "retrieving image information"

Replace "for the image" with "of the image".

Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit 4fd5c134536d652ae1f9e05ecf52cb81adb3b850)

16 months agoMerge pull request #56257 from zdover23/wip-doc-2024-03-18-backport-56248-to-quincy
Anthony D'Atri [Mon, 18 Mar 2024 14:06:21 +0000 (10:06 -0400)]
Merge pull request #56257 from zdover23/wip-doc-2024-03-18-backport-56248-to-quincy

quincy: doc/rbd: minor changes to the rbd man page

16 months agodoc/rbd: minor changes to the rbd man page 56257/head
N Balachandran [Mon, 18 Mar 2024 12:22:47 +0000 (17:52 +0530)]
doc/rbd: minor changes to the rbd man page

Fixes typos and grammar for some commands. Adds
additional details for some commandds.

Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit 5dcff6a4b8d835fc55e454af977dc5ebad99d37f)

16 months agoMerge pull request #56088 from adk3798/wip-64688-quincy
Adam King [Mon, 18 Mar 2024 12:27:33 +0000 (08:27 -0400)]
Merge pull request #56088 from adk3798/wip-64688-quincy

quincy: mgr/cephadm: fix placement with label and host pattern

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #56086 from adk3798/wip-64630-quincy
Adam King [Mon, 18 Mar 2024 12:26:23 +0000 (08:26 -0400)]
Merge pull request #56086 from adk3798/wip-64630-quincy

quincy: mgr/cephadm: catch CancelledError in asyncio timeout handler

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #56083 from adk3798/wip-63534-quincy
Adam King [Mon, 18 Mar 2024 12:25:18 +0000 (08:25 -0400)]
Merge pull request #56083 from adk3798/wip-63534-quincy

quincy: mgr/cephadm: fix reweighting of OSD when OSD removal is stopped

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #55973 from adk3798/wip-62531-quincy
Adam King [Mon, 18 Mar 2024 12:24:15 +0000 (08:24 -0400)]
Merge pull request #55973 from adk3798/wip-62531-quincy

quincy: mgr/cephadm: allow draining host without removing conf/keyring files

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #55763 from ajarr/wip-64555-quincy
Yuri Weinstein [Sat, 16 Mar 2024 16:10:09 +0000 (09:10 -0700)]
Merge pull request #55763 from ajarr/wip-64555-quincy

quincy: qa: Add tests to validate synced images on rbd-mirror

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
16 months agoMerge pull request #55664 from idryomov/wip-64423-quincy
Yuri Weinstein [Sat, 16 Mar 2024 16:09:21 +0000 (09:09 -0700)]
Merge pull request #55664 from idryomov/wip-64423-quincy

quincy: librbd: fix split() for SparseExtent and SparseBufferlistExtent

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
16 months agoMerge pull request #55618 from trociny/wip-64463-quincy
Yuri Weinstein [Sat, 16 Mar 2024 16:07:58 +0000 (09:07 -0700)]
Merge pull request #55618 from trociny/wip-64463-quincy

quincy: tools/rbd: make 'children' command support --image-id

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
16 months agoMerge pull request #56236 from zdover23/wip-doc-2024-03-16-backport-56182-to-quincy
Anthony D'Atri [Sat, 16 Mar 2024 01:32:38 +0000 (21:32 -0400)]
Merge pull request #56236 from zdover23/wip-doc-2024-03-16-backport-56182-to-quincy

quincy: doc/glossary: add "librados" entry

16 months agodoc/glossary: add "librados" entry 56236/head
Zac Dover [Thu, 14 Mar 2024 06:29:09 +0000 (16:29 +1000)]
doc/glossary: add "librados" entry

Add a "librados" entry to the glossary.

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

16 months agoMerge pull request #56087 from adk3798/wip-64645-quincy
Adam King [Fri, 15 Mar 2024 19:36:15 +0000 (15:36 -0400)]
Merge pull request #56087 from adk3798/wip-64645-quincy

quincy: cephadm: remove restriction for crush device classes

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #56085 from adk3798/wip-63818-quincy
Adam King [Fri, 15 Mar 2024 19:35:27 +0000 (15:35 -0400)]
Merge pull request #56085 from adk3798/wip-63818-quincy

quincy: python-common/drive_selection: fix limit with existing devices

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #56084 from adk3798/wip-63816-quincy
Adam King [Fri, 15 Mar 2024 19:34:41 +0000 (15:34 -0400)]
Merge pull request #56084 from adk3798/wip-63816-quincy

quincy: python-common: fix osdspec_affinity check

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #56081 from adk3798/wip-63446-quincy
Adam King [Fri, 15 Mar 2024 19:25:17 +0000 (15:25 -0400)]
Merge pull request #56081 from adk3798/wip-63446-quincy

quincy: mgr/cephadm: support for removing host entry from crush map during host removal

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
16 months agoMerge pull request #56080 from adk3798/wip-63435-quincy
Adam King [Fri, 15 Mar 2024 19:24:00 +0000 (15:24 -0400)]
Merge pull request #56080 from adk3798/wip-63435-quincy

quincy: mgr/cephadm: update timestamp on repeat daemon/service events

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #56079 from adk3798/wip-63116-quincy
Adam King [Fri, 15 Mar 2024 19:23:21 +0000 (15:23 -0400)]
Merge pull request #56079 from adk3798/wip-63116-quincy

quincy: mgr/cephadm: ceph orch add fails when ipv6 address is surrounded by square brackets.

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agomgr/cephadm: add ability to zap OSDs' devices while draining host 55973/head
Adam King [Mon, 5 Jun 2023 19:05:55 +0000 (15:05 -0400)]
mgr/cephadm: add ability to zap OSDs' devices while draining host

Currently, when cephadm drains a host, it will remove all OSDs on
the host, but provides no option to zap the OSD's devices afterwards.
Given users are draining the host likely to remove it from the cluster,
it makes sense some users would want to clean up the devices on the
host that were being used for OSDs. Cephadm already supports zapping
devices outside of host draining, so it makes shouldn't take much to
add that functionality to the host drain as well.

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

16 months agomgr/cephadm: add utils class for tracking special host labels
Adam King [Wed, 22 Feb 2023 19:07:58 +0000 (14:07 -0500)]
mgr/cephadm: add utils class for tracking special host labels

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

Conflicts:
src/pybind/mgr/cephadm/inventory.py

16 months agomgr/cephadm: allow draining host without removing conf/keyring files
Adam King [Tue, 21 Feb 2023 18:53:32 +0000 (13:53 -0500)]
mgr/cephadm: allow draining host without removing conf/keyring files

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

16 months agoMerge pull request #55970 from adk3798/wip-62471-quincy
Adam King [Fri, 15 Mar 2024 19:19:52 +0000 (15:19 -0400)]
Merge pull request #55970 from adk3798/wip-62471-quincy

quincy: mgr/cephadm: pick correct IPs for ingress service based on VIP

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #55963 from adk3798/quincy-rgw-frontend-args
Adam King [Fri, 15 Mar 2024 19:19:29 +0000 (15:19 -0400)]
Merge pull request #55963 from adk3798/quincy-rgw-frontend-args

quincy: mgr/cephadm: Adding extra arguments support for RGW frontend

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #55960 from adk3798/wip-61676-quincy
Adam King [Fri, 15 Mar 2024 19:18:42 +0000 (15:18 -0400)]
Merge pull request #55960 from adk3798/wip-61676-quincy

quincy: cephadm: allow ports to be opened in firewall during adoption, reconfig, redeploy

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agotest/librbd: add DiffIterateTruncate and DiffIterateWriteAndTruncate 56212/head
Ilya Dryomov [Tue, 5 Mar 2024 20:05:22 +0000 (21:05 +0100)]
test/librbd: add DiffIterateTruncate and DiffIterateWriteAndTruncate

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d84485ec534ccf42327242a9141906f4881c030e)

16 months agolibrbd: don't clip expanded diff on truncate in ObjectListSnapsRequest
Ilya Dryomov [Wed, 28 Feb 2024 13:20:16 +0000 (14:20 +0100)]
librbd: don't clip expanded diff on truncate in ObjectListSnapsRequest

If the diff was expanded due to LIST_SNAPS_FLAG_WHOLE_OBJECT, clipping
it when handling a truncate is wrong -- when subtracting that interval,
we either split the expanded extent into two or chop off a piece of it.
However the point of LIST_SNAPS_FLAG_WHOLE_OBJECT is to report a single
extent covering the entire object.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 0ebca5fe22d976f1a17f8078f20a47c49a057edb)

16 months agolibrados/snap_set_diff: ignore truncates above size at start
Ilya Dryomov [Sun, 18 Feb 2024 10:46:15 +0000 (11:46 +0100)]
librados/snap_set_diff: ignore truncates above size at start

Because currently calc_snap_set_diff() only ever appends to the running
diff, an excessive (either too large or completely bogus) zero extent
is reported in cases where an object is first expanded (with a snapshot
taken at that point) and then truncated but still above the size of the
object as of the starting snapshot.

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

16 months agoMerge pull request #56176 from zdover23/wip-doc-2024-03-14-quincy-compiling-cephadm...
Zac Dover [Thu, 14 Mar 2024 19:46:13 +0000 (05:46 +1000)]
Merge pull request #56176 from zdover23/wip-doc-2024-03-14-quincy-compiling-cephadm-note-2

quincy: doc/cephadm: explain different methods of cephadm delivery

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agomds: disable `defer_client_eviction_on_laggy_osds' by default 56195/head
Venky Shankar [Mon, 4 Mar 2024 13:23:53 +0000 (18:53 +0530)]
mds: disable `defer_client_eviction_on_laggy_osds' by default

This config can result in a single client holding up mds to service
other clients since once a client is deferred from eviction due to
laggy OSD(s), a new clients cap acquire request can be possibly
blocked until the other laggy client resumes operation, i.e., when
the laggy OSD is considered non-laggy anymore.

Disable the config by default till the issue is fixed.

Fixes: http://tracker.ceph.com/issues/64685
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 109de8bdab86e1adaad580d9e7322c18fa01bc09)

16 months agoqa/workunits/rbd: switch rbd-mirror workunits to bash 55763/head
Ilya Dryomov [Sat, 9 Mar 2024 21:53:44 +0000 (22:53 +0100)]
qa/workunits/rbd: switch rbd-mirror workunits to bash

By making use of here strings in commit ea3a567f7f03 ("qa/workunits:
make wait_for_status_in_pool_dir() reentrant") we grew a dependency on
bash.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 166a2362378b1ff93e43f483f354c428fd6cef9e)
Signed-off-by: Ramana Raja <rraja@redhat.com>
Conflicts:
qa/workunits/rbd/rbd_mirror_journal.sh
        -  Commit 3fd8a03887354 not backported
           "qa/workunits/rbd: merge journal and snapshot test scripts"

16 months agoqa: Add tests to validate syncing of images using rbd-mirror
Ramana Raja [Thu, 25 May 2023 16:48:12 +0000 (16:48 +0000)]
qa: Add tests to validate syncing of images using rbd-mirror

Introduce functional tests to validate that the images under
workloads are correctly mirrored between two clusters using snapshot
based mirroring.

Run workload on a primary image using a krbd or nbd client. Take
mirror snapshots of the image under workload. Unmount the mapped image
and calculate its MD5 checksum before demoting it. After demotion,
wait for the mirror status of the image to be 'up+unknown' in both
the clusters. This is to make sure that the non-primary image in the
other cluster is ready to be promoted. Now promote the non-primary
image in the other cluster. Map the promoted image and calculate its
MD5 checksum. Verify that the checksums of the demoted and promoted
images in the two clusters are the same.

The above test is run as part of two different workunits:
 - a workunit that validates the syncing of multiple mirrored images
   with workloads running on them
 - another workunit that validates the syncing of a single mirrored
   image with workload running on it and the image is set as primary
   alternatively between the two clusters, as it happens during
   failover and failback scenarios.

Fixes: https://tracker.ceph.com/issues/61617
Signed-off-by: Ramana Raja <rraja@redhat.com>
Co-authored-by: Ilya Dryomov <idryomov@redhat.com>
Co-authored-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit b7aae5c3c5a1dd24c4cb7ceb499292af00bae680)

Cherry-pick notes:
- In qa/workunits/rbd/compare_mirror_images.sh, replace
  `wait_for_replaying_status_in_pool_dir` with `wait_for_status_in_pool_dir`
  Commit 3fd8a03 that added `wait_for_replaying_status_in_pool_dir`
  not backported

16 months agoPendingReleaseNotes: support for subvolumes and subvolume groups in snap_schedule 55210/head
Milind Changire [Thu, 14 Dec 2023 07:25:08 +0000 (12:55 +0530)]
PendingReleaseNotes: support for subvolumes and subvolume groups in snap_schedule

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit b3ff5f794985c173ba87926f34e6d9793c5d5c67)

16 months agosnap_schedule/tests: fix db upgrade issue
Milind Changire [Tue, 17 Oct 2023 04:36:48 +0000 (10:06 +0530)]
snap_schedule/tests: fix db upgrade issue

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit dfc35a4679495a3d7136927374e838409c29ab4a)

16 months agoqa: add yaml for on demand subvol version testing
Milind Changire [Thu, 14 Dec 2023 11:01:05 +0000 (16:31 +0530)]
qa: add yaml for on demand subvol version testing

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 2533ac5b90f367dd55f61c1e95dee0e154940930)

16 months agoqa: add test cases for testing --subvol and --group arguments
Milind Changire [Mon, 20 Nov 2023 10:39:57 +0000 (16:09 +0530)]
qa: add test cases for testing --subvol and --group arguments

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 006c68f492044327594fbf7204774d7d7d4ee518)

Conflicts:
- qa/tasks/cephfs/test_snap_schedules.py
  Minor conflict due missing refactor of command runner helper

16 months agomgr/volumes: conditionalize subvolume upgrade
Milind Changire [Thu, 7 Dec 2023 08:31:42 +0000 (14:01 +0530)]
mgr/volumes: conditionalize subvolume upgrade

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 0c5804ab4e5eb284d127044c5e51fbc870f5727a)

16 months agomgr/volumes: ensure correct init of v1 subvol
Milind Changire [Wed, 22 Nov 2023 09:50:17 +0000 (15:20 +0530)]
mgr/volumes: ensure correct init of v1 subvol

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 614d112cff522439c08e554a14472f1f391dd125)

16 months agomgr/snap_schedule: add subvol and subvol group arguments to cli
Milind Changire [Thu, 9 Nov 2023 07:55:02 +0000 (13:25 +0530)]
mgr/snap_schedule: add subvol and subvol group arguments to cli

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 5b250907d03196bf99fe4a56ea00245a4c830264)

16 months agomds/snap_schedule: add subvolume group column management
Milind Changire [Thu, 9 Nov 2023 07:08:48 +0000 (12:38 +0530)]
mds/snap_schedule: add subvolume group column management

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit ffa197c03159e2acb7c3892f09a1ed616b9c1cd8)

16 months agomgr/volumes: add remote helper methods to fetch subvolume info
Milind Changire [Thu, 7 Dec 2023 08:33:39 +0000 (14:03 +0530)]
mgr/volumes: add remote helper methods to fetch subvolume info

  * add remote method to fetch subvolume path
  * add remote method to list subvolumes
  * add remote method to fetch subvolume attributes

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit d2205bf8247edec08a456377c1e8988428e9ba29)

16 months agoMerge pull request #54315 from batrick/wip-63420-quincy
Venky Shankar [Thu, 14 Mar 2024 01:17:42 +0000 (06:47 +0530)]
Merge pull request #54315 from batrick/wip-63420-quincy

quincy: mds: ensure next replay is queued on req drop

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
16 months agoMerge pull request #55318 from adk3798/wip-62447-quincy
Adam King [Wed, 13 Mar 2024 18:21:12 +0000 (14:21 -0400)]
Merge pull request #55318 from adk3798/wip-62447-quincy

quincy: mgr/cephadm: Add "networks" parameter to orch apply rgw

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #53425 from adk3798/quincy-tcmu-custom-configs
Adam King [Wed, 13 Mar 2024 18:20:20 +0000 (14:20 -0400)]
Merge pull request #53425 from adk3798/quincy-tcmu-custom-configs

quincy: cephadm: make custom_configs work for tcmu-runner container

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoMerge pull request #55473 from idryomov/wip-47287-quincy
Ilya Dryomov [Wed, 13 Mar 2024 18:05:23 +0000 (19:05 +0100)]
Merge pull request #55473 from idryomov/wip-47287-quincy

quincy: librbd: return ENOENT from Snapshot::get_timestamp for nonexistent snap_id

Reviewed-by: Ramana Raja <rraja@redhat.com>
16 months agodoc/cephadm: explain different methods of cephadm delivery 56176/head
Zac Dover [Wed, 13 Mar 2024 17:25:06 +0000 (03:25 +1000)]
doc/cephadm: explain different methods of cephadm delivery

Explain that only in Reef and later releases is cephadm distributed as
an executable compiled from source code. This note is to go into Quincy
and only into Quincy, to direct new users of Ceph whom circumstance has
delivered into the hands of Quincy and who might have the wrong idea
that the documentation of Reef and later releases applies to their
release.

Signed-off-by: Zac Dover <zac.dover@proton.me>
16 months agoMerge pull request #55235 from ifed01/wip-ifed-cache-ratios-qui
Igor Fedotov [Wed, 13 Mar 2024 15:15:50 +0000 (18:15 +0300)]
Merge pull request #55235 from ifed01/wip-ifed-cache-ratios-qui

quincy: osd: make _set_cache_sizes ratio aware of cache_kv_onode_ratio

Reviewed-by: Mark Nelson <mark.nelson@clyso.com>
Reviewed-by: Pere Diaz Bou <pere-altea@hotmail.com>
16 months agomgr/cephadm: catch CancelledError in asyncio timeout handler 56086/head
Adam King [Fri, 16 Feb 2024 16:24:32 +0000 (11:24 -0500)]
mgr/cephadm: catch CancelledError in asyncio timeout handler

Specifically, concurrent.futures.CancelledError. At least on
python 3.9, this error can be raised when certain commands
being run asynchronously fail. Not catching this results in
the whole cephadm module crashing with something like

Traceback (most recent call last):
  File "/usr/share/ceph/mgr/cephadm/utils.py", line 94, in do_work
    return f(*arg)
  File "/usr/share/ceph/mgr/cephadm/serve.py", line 267, in refresh
    r = self._refresh_facts(host)
  File "/usr/share/ceph/mgr/cephadm/serve.py", line 370, in _refresh_facts
    val = self.mgr.wait_async(self._run_cephadm_json(
  File "/usr/share/ceph/mgr/cephadm/module.py", line 671, in wait_async
    return self.event_loop.get_result(coro, timeout)
  File "/usr/share/ceph/mgr/cephadm/ssh.py", line 64, in get_result
    return future.result(timeout)
  File "/lib64/python3.9/concurrent/futures/_base.py", line 444, in result
    raise CancelledError()
concurrent.futures._base.CancelledError

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

16 months agoMerge pull request #55556 from adk3798/quincy-cephadm-asyncio-timeout-fixup
Adam King [Wed, 13 Mar 2024 14:41:04 +0000 (10:41 -0400)]
Merge pull request #55556 from adk3798/quincy-cephadm-asyncio-timeout-fixup

quincy: mgr/cephadm: fixups for asyncio based timeout

Reviewed-by: John Mulligan <jmulligan@redhat.com>
16 months agoqa/cephadm: test --rm-crush-entry host rm flag in host drain test 56081/head
Adam King [Fri, 29 Sep 2023 20:52:37 +0000 (16:52 -0400)]
qa/cephadm: test --rm-crush-entry host rm flag in host drain test

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

16 months agoqa/cephadm: add teuthology test for host draining
Adam King [Fri, 29 Sep 2023 20:09:48 +0000 (16:09 -0400)]
qa/cephadm: add teuthology test for host draining

This was a gap in our testing in general, but I'm
adding it here right now specifically to use it
to test the "--rm-crush-entry" flag in a follow
up commit

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

16 months agomgr/cephadm: add --rm-crush-entry flag to host removal
Adam King [Fri, 29 Sep 2023 18:39:10 +0000 (14:39 -0400)]
mgr/cephadm: add --rm-crush-entry flag to host removal

This will tell cephadm to try and remove the
crush bucket for the host at the end of the host
removal process. If this fails, we still consider the
host as having been successfully remove from
cephadm's POV, but the user will get back an error
message telling them we failed to remove the
host from the crush map

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

Conflicts:
src/pybind/mgr/cephadm/module.py

16 months agomgr/cephadm: update timestamp on repeat daemon/service events 56080/head
Adam King [Wed, 18 Oct 2023 18:00:05 +0000 (14:00 -0400)]
mgr/cephadm: update timestamp on repeat daemon/service events

If you have a daemon/service event and then an identical
event happens later (e.g. the same daemon is redeployed
multiple times) the events are not updated on the repeat
instances. In cases like this I think it makes more
sense to update the timestamp so users can see the most
recent time the event happened.

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

16 months agoMerge pull request #55174 from ronen-fr/wip-64018-quincy
Ronen Friedman [Wed, 13 Mar 2024 12:50:39 +0000 (14:50 +0200)]
Merge pull request #55174 from ronen-fr/wip-64018-quincy

quincy: osd/scrub: increasing max_osd_scrubs to 3

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Pere Diaz Bou <pere-altea@hotmail.com>
16 months agoMerge pull request #56134 from zdover23/wip-doc-2024-03-12-backport-56113-to-quincy-2
zdover23 [Wed, 13 Mar 2024 03:45:57 +0000 (13:45 +1000)]
Merge pull request #56134 from zdover23/wip-doc-2024-03-12-backport-56113-to-quincy-2

quincy: doc/cephadm: Improve multiple files

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
16 months agoosd/scrub: increasing max_osd_scrubs to 3 55174/head
Ronen Friedman [Mon, 22 May 2023 15:09:28 +0000 (18:09 +0300)]
osd/scrub: increasing max_osd_scrubs to 3

Bug reports seem to hint that the current default value of
'1' is too low: the cluster is susceptible to scrub scheduling
delays and issues stemming from local software/networking/hardware
problems, even if affecting a very small number of OSDs.

Squid will include a major overhaul of the way scrubs are counted
in the cluster, providing a better solution to the problem. For
now - modifying the default is an effective stop-gap measure.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit cc7b4afda972c144d7ebc679ff7f42d86f1dc493)

16 months agodoc/cephadm: Improve multiple files 56134/head
Anthony D'Atri [Mon, 11 Mar 2024 07:04:47 +0000 (03:04 -0400)]
doc/cephadm: Improve multiple files

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

16 months agoMerge pull request #56128 from adk3798/wip-64837-quincy
Nizamudeen A [Tue, 12 Mar 2024 13:22:52 +0000 (18:52 +0530)]
Merge pull request #56128 from adk3798/wip-64837-quincy

quincy: mgr/dashboard: debugging make check failure

16 months agoMerge PR #54374 into quincy
Patrick Donnelly [Tue, 12 Mar 2024 13:17:58 +0000 (09:17 -0400)]
Merge PR #54374 into quincy

* refs/pull/54374/head:
common: resolve config proxy deadlock using refcounted pointers
common: add missing locks in config_proxy methods
common/ceph_mutex: note whether mutex debug methods are usable
qa: add reproducer for obs removal deadlock
qa: narrow search to debug_asok

Reviewed-by: Laura Flores <lflores@redhat.com>
16 months agomon: fix health store size growing infinitely 55549/head
Wei Wang [Mon, 29 Jan 2024 08:26:24 +0000 (08:26 +0000)]
mon: fix health store size growing infinitely

The `check_mutes` wrongly marks `changed` to true, trigger `propose_pending` and block following `maybe_trim` logic (`have_pending` will be always be false); as a result, the health store will never be trimmed.

Signed-off-by: Wei Wang <lightmelodies@outlook.com>
(cherry picked from commit 05a85848a01c443d67564a9904a778acfe19cee5)