]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agoMerge pull request #51342 from k0ste/wip-59634-reef
Adam King [Tue, 23 May 2023 12:32:34 +0000 (08:32 -0400)]
Merge pull request #51342 from k0ste/wip-59634-reef

reef: pybind/mgr: improve error when inbuf is given to commands that don't use it

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
2 years agoMerge pull request #51693 from zdover23/wip-doc-2023-05-23-backport-51682-to-reef
Anthony D'Atri [Tue, 23 May 2023 12:10:34 +0000 (08:10 -0400)]
Merge pull request #51693 from zdover23/wip-doc-2023-05-23-backport-51682-to-reef

reef: doc/glossary: update bluestore entry

2 years agoMerge pull request #51672 from k0ste/wip-61342-reef
Pere Diaz Bou [Tue, 23 May 2023 11:16:44 +0000 (13:16 +0200)]
Merge pull request #51672 from k0ste/wip-61342-reef

reef: mgr/prometheus: fix pool_objects_repaired and daemon_health_metrics format

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agoMerge pull request #51636 from Matan-B/wip-50584-reef
Matan [Tue, 23 May 2023 11:11:07 +0000 (13:11 +0200)]
Merge pull request #51636 from Matan-B/wip-50584-reef

reef: qa/suites/crimson-rados/thrash: Enable supported tests and ops

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51625 from Matan-B/wip-47974-reef
Matan [Tue, 23 May 2023 11:08:56 +0000 (13:08 +0200)]
Merge pull request #51625 from Matan-B/wip-47974-reef

reef: crimson/os/seastore: evict cold data to slower devices

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
2 years agoMerge pull request #51588 from Svelar/reef-vstart-filestore-cleanup
Ilya Dryomov [Tue, 23 May 2023 10:52:50 +0000 (12:52 +0200)]
Merge pull request #51588 from Svelar/reef-vstart-filestore-cleanup

reef: vstart: remove filestore options and config snippets

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2 years agoMerge pull request #51644 from Matan-B/wip-51167-reef
Matan [Tue, 23 May 2023 08:32:49 +0000 (10:32 +0200)]
Merge pull request #51644 from Matan-B/wip-51167-reef

reef: crimson/qa: make crimson run multicore in teuthology test

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51641 from Matan-B/wip-50457-reef
Matan [Tue, 23 May 2023 08:31:41 +0000 (10:31 +0200)]
Merge pull request #51641 from Matan-B/wip-50457-reef

reef: qa/suites/crimson-rados/rbd: Add new rbd image format api tests

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51675 from Matan-B/wip-47637-reef
Matan [Tue, 23 May 2023 08:30:50 +0000 (10:30 +0200)]
Merge pull request #51675 from Matan-B/wip-47637-reef

reef: crimson/osd: bring support for client blocklisting

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51674 from Matan-B/wip-51198-reef
Matan [Tue, 23 May 2023 08:29:50 +0000 (10:29 +0200)]
Merge pull request #51674 from Matan-B/wip-51198-reef

reef: crimson/osd/snaptrim_event: Handle missing clone obc case

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoqa/suites/crimson-rados/thrash: Enable supported thrashers 51636/head
Matan Breizman [Sun, 19 Mar 2023 11:56:03 +0000 (11:56 +0000)]
qa/suites/crimson-rados/thrash: Enable supported thrashers

Balanced/Localized reads are now supported.
snap_remove and rollback are supported as well.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit b888cfa3da956aad527d05c3dbe507efb368363f)

2 years agoqa/suites/crimson-rados/thrash: Add snap_remove/create weights
Matan Breizman [Sun, 19 Mar 2023 11:53:38 +0000 (11:53 +0000)]
qa/suites/crimson-rados/thrash: Add snap_remove/create weights

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 8839f829d60e0f0a3e6feca37b8eaa167bccdfd0)

2 years agoqa/suites/crimson-rados: Remove rados_api_test.yaml.disabled
Matan Breizman [Sun, 19 Mar 2023 11:49:03 +0000 (11:49 +0000)]
qa/suites/crimson-rados: Remove rados_api_test.yaml.disabled

This test is already included in:
crimson-rados/basic/tasks/rados_api_tests.yaml

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit bb23ddc5dc31ced752db0310d9857ba268005182)

2 years agoMerge pull request #51635 from Matan-B/wip-49980-reef
Matan [Tue, 23 May 2023 08:24:52 +0000 (10:24 +0200)]
Merge pull request #51635 from Matan-B/wip-49980-reef

reef: crimson/os/seastore/journal: generalize recordsubmitter

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51629 from Matan-B/wip-50491-reef
Matan [Tue, 23 May 2023 08:23:05 +0000 (10:23 +0200)]
Merge pull request #51629 from Matan-B/wip-50491-reef

reef: test/librados/snapshots*: Enable Crimson supported tests

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agodoc/glossary: update bluestore entry 51693/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 agotest/crimson/seasatore: add evction test 51625/head
Zhang Song [Fri, 17 Feb 2023 06:25:20 +0000 (14:25 +0800)]
test/crimson/seasatore: add evction test

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit c53446df687dd82860ba012f89ae783be8a4f51c)

2 years agocrimson/os/seastore/EPM: cleanup alloc_new_extent
Zhang Song [Fri, 17 Feb 2023 06:23:36 +0000 (14:23 +0800)]
crimson/os/seastore/EPM: cleanup alloc_new_extent

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 5bc650a0605ef9559ac32fe70930d446652c2d1d)

2 years agocrimson/os/seasotre/segment_manager_group: ensure the types of devices are same
Zhang Song [Wed, 1 Mar 2023 10:19:54 +0000 (18:19 +0800)]
crimson/os/seasotre/segment_manager_group: ensure the types of devices are same

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 61156355385aaa06cf9d15870a8830256874714d)

2 years agocrimson/os/seastore: add EPHEMERAL_COLD device type
Zhang Song [Tue, 14 Feb 2023 09:47:35 +0000 (17:47 +0800)]
crimson/os/seastore: add EPHEMERAL_COLD device type

rename SEGMENTED_EPHEMERAL to EPHEMERAL_MAIN

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit b40304092b6ce8b29e97437642928cc84afa1be5)

2 years agocrimson/os/seastore/EPM/BackgroundProcess: introduce more eviction policy
Zhang Song [Wed, 11 Jan 2023 10:17:41 +0000 (18:17 +0800)]
crimson/os/seastore/EPM/BackgroundProcess: introduce more eviction policy

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 45c53a26c662b2c23efdecaaa186b6ac8811c2ea)

2 years agocrimson/os/seastore/EPM/BackgroundProcess: reserve space on cold cleaner
Zhang Song [Tue, 10 Jan 2023 10:52:04 +0000 (18:52 +0800)]
crimson/os/seastore/EPM/BackgroundProcess: reserve space on cold cleaner

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 4aea0e266de43281a5d8c24fe91034bdaae45d98)

2 years agocrimson/os/seastore: get segment info from cold segment provider
Zhang Song [Tue, 10 Jan 2023 10:02:50 +0000 (18:02 +0800)]
crimson/os/seastore: get segment info from cold segment provider

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 7b0ccecbced037bbceca707d62d81fe2accc5a39)

2 years agocrimson/os/seastore: support mark_space_{free, used} on cold_cleaner
Zhang Song [Tue, 10 Jan 2023 10:01:25 +0000 (18:01 +0800)]
crimson/os/seastore: support mark_space_{free, used} on cold_cleaner

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 783c5e7662006c6efca7ade795e6e731b0b18332)

2 years agosrc/vstart.sh: support specify the type of secondary device
Zhang Song [Tue, 10 Jan 2023 09:59:21 +0000 (17:59 +0800)]
src/vstart.sh: support specify the type of secondary device

doc/crimson: add options and example about SeaStore

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit b40f6421f0d6f7966e13941ba13e70b5639bce93)

2 years agocrimson/os/seastore: change the category of COLL_BLOCK
Zhang Song [Tue, 10 Jan 2023 09:01:57 +0000 (17:01 +0800)]
crimson/os/seastore: change the category of COLL_BLOCK

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 9283b72e476f306a8926aa2f7ae191ca8705fcd4)

2 years agocrimson/os/seastore: specify the device type explicitly when constructing BlockSegmen...
Zhang Song [Mon, 6 Mar 2023 07:06:19 +0000 (15:06 +0800)]
crimson/os/seastore: specify the device type explicitly when constructing BlockSegmentManager

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 1e515e8561519ded43b1046942057d705441ee22)

2 years agocrimson/os/seastore: make segment_manager work with HDD
Zhang Song [Tue, 10 Jan 2023 09:01:30 +0000 (17:01 +0800)]
crimson/os/seastore: make segment_manager work with HDD

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 89939e7ad7c1dffaa1c842be601fa372d074a86a)

2 years agocrimson/os/seasotre: add CLEANER_COLD transaction type
Zhang Song [Tue, 10 Jan 2023 09:00:12 +0000 (17:00 +0800)]
crimson/os/seasotre: add CLEANER_COLD transaction type

rename CLEANER to CLEANER_MAIN

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 0d20f1595a0c839e780540b61ff68f52be29a99b)

2 years agocrimson/os/seastore: init cold segment cleaner
Zhang Song [Tue, 10 Jan 2023 08:59:31 +0000 (16:59 +0800)]
crimson/os/seastore: init cold segment cleaner

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 5876ef35b651ab5ac94f891382553d25f641f19e)

2 years agocrimson/os/seastore/SegmentCleaner: distinguish the cold cleaner from the normal
Zhang Song [Tue, 10 Jan 2023 08:58:58 +0000 (16:58 +0800)]
crimson/os/seastore/SegmentCleaner: distinguish the cold cleaner from the normal

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 483e36826802745e68855f0f0f2a89d199903011)

2 years agocrimson/os/seastore/EPM/BackgroundProcess: add cold_cleaner
Zhang Song [Tue, 10 Jan 2023 08:58:16 +0000 (16:58 +0800)]
crimson/os/seastore/EPM/BackgroundProcess: add cold_cleaner

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 343f579748d9856a7f8fde49025db91cdce1367d)

2 years agocrimson/os/seastore: move ool segment seq allocator to EPM
Zhang Song [Tue, 10 Jan 2023 08:49:22 +0000 (16:49 +0800)]
crimson/os/seastore: move ool segment seq allocator to EPM

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 944c1253bf52fb6f7d773b4bfeb5f7cc8f0ffebc)

2 years agocrimson/os/seastore/EPM: refactor reserve process
Zhang Song [Tue, 10 Jan 2023 08:47:43 +0000 (16:47 +0800)]
crimson/os/seastore/EPM: refactor reserve process

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 86e2f4b24bff98b775a76289aa3fd382333d42ad)

2 years agocrimson/os/seastore/EPM/BackgroundProcess: rename cleaner to main_cleaner
Zhang Song [Tue, 10 Jan 2023 08:19:38 +0000 (16:19 +0800)]
crimson/os/seastore/EPM/BackgroundProcess: rename cleaner to main_cleaner

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
(cherry picked from commit 3adb17bf04252d9c1afd9050ed1e876bd6c654b9)

2 years agoMerge pull request #51623 from Matan-B/wip-50317-reef
Matan [Tue, 23 May 2023 08:00:32 +0000 (10:00 +0200)]
Merge pull request #51623 from Matan-B/wip-50317-reef

reef: crimson/os/seastore/epm: also do prepare_write for rbm

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agovstart: modify FreeBSD objectstore to memstore. 51588/head
Rongqi Sun [Tue, 16 May 2023 07:23:52 +0000 (15:23 +0800)]
vstart: modify FreeBSD objectstore to memstore.

Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>
(cherry picked from commit 27e66f506f10dca7018c10e3e1804f0b3c217b8e)

2 years agovstart.sh:drop filestore support
Rongqi Sun [Fri, 5 May 2023 06:50:18 +0000 (14:50 +0800)]
vstart.sh:drop filestore support

Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>
(cherry picked from commit 41f2af4f5e70accd3da1a5761f73bda8786b7f4f)

2 years agoMerge pull request #51677 from zdover23/wip-doc-2023-05-23-backport-51646-to-reef
Anthony D'Atri [Mon, 22 May 2023 21:21:38 +0000 (17:21 -0400)]
Merge pull request #51677 from zdover23/wip-doc-2023-05-23-backport-51646-to-reef

reef: doc/dev/crimson: Improve crimson.rst

2 years agoMerge pull request #51678 from zdover23/wip-doc-2023-05-23-backport-51651-to-reef
Anthony D'Atri [Mon, 22 May 2023 21:21:30 +0000 (17:21 -0400)]
Merge pull request #51678 from zdover23/wip-doc-2023-05-23-backport-51651-to-reef

reef: doc: note deprecation of Cache Tiering in Reef

2 years agoMerge pull request #51612 from adk3798/wip-59548-reef
Adam King [Mon, 22 May 2023 20:38:12 +0000 (16:38 -0400)]
Merge pull request #51612 from adk3798/wip-59548-reef

reef: mgr/cephadm: allow setting mon crush locations through mon service spec

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #51611 from adk3798/wip-59546-reef
Adam King [Mon, 22 May 2023 20:36:58 +0000 (16:36 -0400)]
Merge pull request #51611 from adk3798/wip-59546-reef

reef: cephadm: reschedule haproxy from an offline host

Reviewed-by: Michael Fritch <mfritch@suse.com>
2 years agoMerge pull request #51208 from guits/wip-59255-reef
Adam King [Mon, 22 May 2023 20:36:04 +0000 (16:36 -0400)]
Merge pull request #51208 from guits/wip-59255-reef

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

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #51205 from guits/wip-59516-reef
Adam King [Mon, 22 May 2023 20:35:10 +0000 (16:35 -0400)]
Merge pull request #51205 from guits/wip-59516-reef

reef: ceph-volume: fix batch refactor issue

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #51194 from guits/wip-59523-reef
Adam King [Mon, 22 May 2023 20:34:22 +0000 (16:34 -0400)]
Merge pull request #51194 from guits/wip-59523-reef

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

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #51191 from guits/wip-59519-reef
Adam King [Mon, 22 May 2023 20:33:30 +0000 (16:33 -0400)]
Merge pull request #51191 from guits/wip-59519-reef

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

Reviewed-by: Adam King <adking@redhat.com>
2 years agodoc: note deprecation of Cache Tiering in Reef 51678/head
Zac Dover [Mon, 22 May 2023 01:35:26 +0000 (11:35 +1000)]
doc: note deprecation of Cache Tiering in Reef

Add a note to the documentation that cache tiering is deprecated in
Reef.

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

2 years agodoc/dev/crimson: Improve crimson.rst 51677/head
Anthony D'Atri [Sun, 21 May 2023 12:39:56 +0000 (08:39 -0400)]
doc/dev/crimson: Improve crimson.rst

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

2 years agoMerge pull request #51593 from cbodley/wip-61219-reef
Yuri Weinstein [Mon, 22 May 2023 19:57:29 +0000 (15:57 -0400)]
Merge pull request #51593 from cbodley/wip-61219-reef

reef: rgw: use string_view to parse Accept header

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2 years agoMerge pull request #51592 from cbodley/wip-61298-reef
Yuri Weinstein [Mon, 22 May 2023 19:56:52 +0000 (15:56 -0400)]
Merge pull request #51592 from cbodley/wip-61298-reef

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

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2 years agoMerge pull request #51569 from amathuria/wip-61232-reef
Yuri Weinstein [Mon, 22 May 2023 19:40:41 +0000 (15:40 -0400)]
Merge pull request #51569 from amathuria/wip-61232-reef

reef: qa/tasks: Changing default mClock profile to high_recovery_ops

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #51409 from kamoltat/wip-ksirivad-reef-backport-50857
Yuri Weinstein [Mon, 22 May 2023 19:39:38 +0000 (15:39 -0400)]
Merge pull request #51409 from kamoltat/wip-ksirivad-reef-backport-50857

reef:mon/Monitor.cc: exit function if !osdmon()->is_writeable()

Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #50977 from yaarith/wip-59390-reef
Laura Flores [Mon, 22 May 2023 19:38:54 +0000 (14:38 -0500)]
Merge pull request #50977 from yaarith/wip-59390-reef

reef: mgr/telemetry: add leaderboard description and documentation

2 years agoMerge pull request #51357 from rhcs-dashboard/wip-59633-reef
Adam King [Mon, 22 May 2023 18:33:25 +0000 (14:33 -0400)]
Merge pull request #51357 from rhcs-dashboard/wip-59633-reef

reef: mgr/cephadm: update monitoring stack versions

Reviewed-by: Adam King <adking@redhat.com>
2 years agocrimson/osd: drop the OSDMap caching from PG 51675/head
Radoslaw Zarzynski [Mon, 29 Aug 2022 10:52:05 +0000 (10:52 +0000)]
crimson/osd: drop the OSDMap caching from PG

`PG` directly aggregates both `OSDMap` and `PeeringState` which
maintains its own `OSDMap` instance. This duplication leads to
issues as the `PG::osdmap` never gets updated.

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

2 years agocrimson/osd: implement watcher blocklisting
Radoslaw Zarzynski [Tue, 16 Aug 2022 14:34:23 +0000 (14:34 +0000)]
crimson/osd: implement watcher blocklisting

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

2 years agocrimson/osd: check for blocklisted clients
Radoslaw Zarzynski [Tue, 16 Aug 2022 12:23:58 +0000 (12:23 +0000)]
crimson/osd: check for blocklisted clients

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

2 years agocrimson/osd/pg: PG::on_active_actmap() clear PG_STATE_SNAPTRIM_ERROR 51674/head
Matan Breizman [Mon, 24 Apr 2023 12:56:18 +0000 (12:56 +0000)]
crimson/osd/pg: PG::on_active_actmap() clear PG_STATE_SNAPTRIM_ERROR

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit ad129f39e75ed9a128c5bc2bc52d575a01f1b0ea)

2 years agocrimson/osd/pg: PG::on_active_actmap() fix SnapTrimEvent stop condition
Matan Breizman [Mon, 24 Apr 2023 12:55:45 +0000 (12:55 +0000)]
crimson/osd/pg: PG::on_active_actmap() fix SnapTrimEvent stop condition

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 03ff8f206ab681eb1518e7e73d737bce40ab7a15)

2 years agocrimson/osd/osd_operations/snaptrim_event: Handle missing clone obc
Matan Breizman [Mon, 24 Apr 2023 12:55:08 +0000 (12:55 +0000)]
crimson/osd/osd_operations/snaptrim_event: Handle missing clone obc

The case where resolve_oid is not able to return the clone oid (in order
to load the clone obc) should result in an SNAPTRIM_ERROR and stop the loop
iteration. Without taking this case into account an infinite loop of snap
trim events will be created.
The ENOENT error is delegated upwards to be handled by PG::on_active_actmap().

Fixes: https://tracker.ceph.com/issues/59231
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 5f1f3625908331e164274621f2e0b092efda0452)

2 years agocrimson/osd/osd_operations/snaptrim_event: Add log lines and formatting
Matan Breizman [Mon, 24 Apr 2023 12:53:40 +0000 (12:53 +0000)]
crimson/osd/osd_operations/snaptrim_event: Add log lines and formatting

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 51c70dc95dd6a0ce2d9044a0907e7fa46fc02619)

2 years agomgr/prometheus: fix pool_objects_repaired and daemon_health_metrics format 51672/head
banuchka [Sat, 15 Apr 2023 20:56:05 +0000 (21:56 +0100)]
mgr/prometheus: fix pool_objects_repaired and daemon_health_metrics format

mgr/prometheus: fix pool_objects_repaired and daemon_health_metrics format

- fix "error reading metrics for http://****:***/metrics: reading text format failed: text format parsing error in line 2010: second HELP line for metric name "ceph_pool_objects_repaired" error

- rename label name "poolid" to "pool_id" like all other metrics
- change type for the "daemon_health_metrics" to gauge

Fixes: https://tracker.ceph.com/issues/59505
Signed-off-by: banuchka <tyrchenok@gmail.com>
(cherry picked from commit 95d5303e11d6cba5ec4e71716af8931bcc2b9767)

2 years agoMerge pull request #51645 from Matan-B/wip-51448-reef
Matan [Mon, 22 May 2023 15:36:06 +0000 (17:36 +0200)]
Merge pull request #51645 from Matan-B/wip-51448-reef

reef: crimson/osd/scheduler/mclock_scheduler: Fix OSD unable to start

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51643 from Matan-B/wip-50411-reef
Matan [Mon, 22 May 2023 15:35:21 +0000 (17:35 +0200)]
Merge pull request #51643 from Matan-B/wip-50411-reef

reef: crimson/osd: start operations asynchrously

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51642 from Matan-B/wip-51333-reef
Matan [Mon, 22 May 2023 15:34:23 +0000 (17:34 +0200)]
Merge pull request #51642 from Matan-B/wip-51333-reef

reef: crimson/osd/objclass: Fix compilation warning

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51640 from Matan-B/wip-50227-reef
Matan [Mon, 22 May 2023 15:33:08 +0000 (17:33 +0200)]
Merge pull request #51640 from Matan-B/wip-50227-reef

reef: crimson/osd/heartbeat: share osdmap to peers when necessary

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51639 from Matan-B/wip-51202-reef
Matan [Mon, 22 May 2023 15:31:38 +0000 (17:31 +0200)]
Merge pull request #51639 from Matan-B/wip-51202-reef

reef: crimson/osd/pg: make clone object's version consistent with pglog

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51638 from Matan-B/wip-51180-reef
Matan [Mon, 22 May 2023 15:30:39 +0000 (17:30 +0200)]
Merge pull request #51638 from Matan-B/wip-51180-reef

reef: crimson/osd/snaptrim_event: get SnapSetContext from head obc

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51637 from Matan-B/wip-50530-reef
Matan [Mon, 22 May 2023 15:29:23 +0000 (17:29 +0200)]
Merge pull request #51637 from Matan-B/wip-50530-reef

reef: crimson/osd: Handle rollback to head obejct

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51634 from Matan-B/wip-50840-reef
Matan [Mon, 22 May 2023 15:25:34 +0000 (17:25 +0200)]
Merge pull request #51634 from Matan-B/wip-50840-reef

reef: crimson/os/seastore: avoid segment nonce collision

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51633 from Matan-B/wip-50839-reef
Matan [Mon, 22 May 2023 15:24:56 +0000 (17:24 +0200)]
Merge pull request #51633 from Matan-B/wip-50839-reef

reef: crimson/os/seastore: ensure transaction commit order

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51632 from Matan-B/wip-50653-reef
Matan [Mon, 22 May 2023 15:23:53 +0000 (17:23 +0200)]
Merge pull request #51632 from Matan-B/wip-50653-reef

reef: crimson/os/seastore/cache: consider EXIST_CLEAN extents as pending ones

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51631 from Matan-B/wip-50555-reef
Matan [Mon, 22 May 2023 15:18:22 +0000 (17:18 +0200)]
Merge pull request #51631 from Matan-B/wip-50555-reef

reef: crimson/os/seastore: implement get_stat() for RBM

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51630 from Matan-B/wip-50492-reef
Matan [Mon, 22 May 2023 15:17:19 +0000 (17:17 +0200)]
Merge pull request #51630 from Matan-B/wip-50492-reef

reef: crimson/common/log: Fix debug logging macros

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51627 from Matan-B/wip-50602-reef
Matan [Mon, 22 May 2023 15:15:37 +0000 (17:15 +0200)]
Merge pull request #51627 from Matan-B/wip-50602-reef

reef: crimson/os/seastore: don't set INVALID extents to CLEAN when reading extents

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51626 from Matan-B/wip-50556-reef
Matan [Mon, 22 May 2023 15:14:04 +0000 (17:14 +0200)]
Merge pull request #51626 from Matan-B/wip-50556-reef

reef: crimson: fix build error

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #51624 from Matan-B/wip-49116-reef
Matan [Mon, 22 May 2023 15:11:02 +0000 (17:11 +0200)]
Merge pull request #51624 from Matan-B/wip-49116-reef

reef: crimson/osd: Support balance reads

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2 years agoMerge pull request #51652 from zdover23/wip-doc-2023-05-22-backport-51319-to-reef
Anthony D'Atri [Mon, 22 May 2023 08:55:31 +0000 (04:55 -0400)]
Merge pull request #51652 from zdover23/wip-doc-2023-05-22-backport-51319-to-reef

reef: doc: deprecate the cache tiering

2 years agodoc: deprecate the cache tiering 51652/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 agomgr/cephadm: verify mon spec exists before trying to grab from spec store 51612/head
Adam King [Tue, 2 May 2023 22:59:18 +0000 (18:59 -0400)]
mgr/cephadm: verify mon spec exists before trying to grab from spec store

In a normal deployment, we generally shouldn't have
to worry about this. This is more for teuthology
which does deployments in a weird way that can cause
there to be no mon spec in the cluster. Fixes an issue
seen when backporting the mon crush location work
to quincy where an upgrade test would fail with

```
[WRN] UPGRADE_REDEPLOY_DAEMON: Upgrading daemon mon.b on host smithi047 failed.
    Upgrade daemon: mon.b: Service mon not found.
```

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

2 years agocrimson/osd/scheduler/mclock_scheduler: Fix OSD unable to start 51645/head
Matan Breizman [Thu, 11 May 2023 14:18:46 +0000 (14:18 +0000)]
crimson/osd/scheduler/mclock_scheduler: Fix OSD unable to start

https://github.com/ceph/ceph/pull/49975 Introduced changes to
mclock conf value types which caused the osd to stall while booting.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 5cb12bb4af1f1c9cd3051429d8f6c0c01535ab04)

2 years agocrimson/qa: enable multicore for crimson in teuthology test 51644/head
chunmei [Thu, 20 Apr 2023 22:09:34 +0000 (22:09 +0000)]
crimson/qa: enable multicore for crimson in teuthology test

Signed-off-by: chunmei <chunmei.liu@intel.com>
(cherry picked from commit 179a3e01c5a70596bdecc58e28ef23dbe68b9871)

2 years agocrimson/osd/snaptrim_event: preserve interrupt condition when creating 51643/head
Xuehan Xu [Fri, 5 May 2023 05:22:11 +0000 (05:22 +0000)]
crimson/osd/snaptrim_event: preserve interrupt condition when creating
subops

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit 58f527893e0a5c051c91d6df0c8d3217c1811875)

2 years agocrimson/osd: start operations asynchrously
Xuehan Xu [Wed, 8 Mar 2023 05:52:00 +0000 (05:52 +0000)]
crimson/osd: start operations asynchrously

Fixes: https://tracker.ceph.com/issues/58928
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit a1963937e421bfdaf2e9735dc2faf750c9a9e08e)

2 years agocrimson/osd/objclass: Compilation warning 51642/head
Matan Breizman [Wed, 3 May 2023 09:39:14 +0000 (09:39 +0000)]
crimson/osd/objclass: Compilation warning

```
In copy constructor ‘ceph::buffer::v15_2_0::list::list(const ceph::buffer::v15_2_0::list&)’,
    inlined from ‘OSDOp::OSDOp(const OSDOp&)’ at ../src/osd/osd_types.h:4081:8,
    inlined from ‘int cls_cxx_snap_revert(cls_method_context_t, snapid_t)’ at ../src/crimson/osd/objclass.cc:279:37:
../src/include/buffer.h:945:20: warning: ‘op.OSDOp::indata.ceph::buffer::v15_2_0::list::_len’ is used uninitialized [-Wuninitialized]
  945 |         _len(other._len),
      |              ~~~~~~^~~~
../src/crimson/osd/objclass.cc: In function ‘int cls_cxx_snap_revert(cls_method_context_t, snapid_t)’:
../src/crimson/osd/objclass.cc:279:9: note: ‘op’ declared here
  279 |   OSDOp op{op = CEPH_OSD_OP_ROLLBACK};
      |
```

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 99a8d19b05c175777ec7877eb58bb87270602ba5)

2 years agotest/cls_rbd/test_cls_rbd: Skip mirror_image_status (Crimson) 51641/head
Matan Breizman [Tue, 25 Apr 2023 10:14:06 +0000 (10:14 +0000)]
test/cls_rbd/test_cls_rbd: Skip mirror_image_status (Crimson)

This commit is part of an initial attempt to establish a Crimson testing baseline.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 32fecf11cac9d3f32a79aa6a78a88f11053baca5)

2 years agoqa/suites/crimson-rados/rbd: Add new rbd image format api tests
Matan Breizman [Thu, 9 Mar 2023 11:15:18 +0000 (11:15 +0000)]
qa/suites/crimson-rados/rbd: Add new rbd image format api tests

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 27e309ef9668a17fec774ba29fa82654f4cd1785)

2 years agotest/librbd: Skip unsupported Crimson tests
Matan Breizman [Thu, 9 Mar 2023 10:59:18 +0000 (10:59 +0000)]
test/librbd: Skip unsupported Crimson tests

This commit is part of an initial attempt to establish a Crimson testing baseline.

test_librbd notes:

* Skip ListChildrenTiered (Crimson):
  Cache tiering is not supported.

test_internal notes:

* Skip SnapshotCopyup (Crimson):
  Clone overlap calculation is WIP: https://tracker.ceph.com/issues/58263

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 89d50e933d67dcda08f75968f9e403d9a0cd710f)

2 years agocrimson/osd/heartbeat: add latest epoch sent concept 51640/head
Matan Breizman [Wed, 29 Mar 2023 16:42:09 +0000 (16:42 +0000)]
crimson/osd/heartbeat: add latest epoch sent concept

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 12af68c24d2ea0cfd540f4da0a4f765b8212396d)

2 years agocrimson/osd/shard_services: Add logs to load_map_bls
Matan Breizman [Wed, 29 Mar 2023 09:21:12 +0000 (09:21 +0000)]
crimson/osd/shard_services: Add logs to load_map_bls

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 7550d423b1baf2a7bd701b0391a192dc30e9482f)

2 years agocrimson/osd/heartbeat: add a rename todo
Matan Breizman [Thu, 27 Apr 2023 16:07:01 +0000 (16:07 +0000)]
crimson/osd/heartbeat: add a rename todo

In continuation to: bfbbc311f1f

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 0075349661a838abc04f110630bc4f370116c391)

2 years agocrimson/osd/heartbeat: Rename Peer's created at epoch
Matan Breizman [Wed, 29 Mar 2023 09:19:29 +0000 (09:19 +0000)]
crimson/osd/heartbeat: Rename Peer's created at epoch

As these getter and setter represent the epoch at which the peer was added

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit bfbbc311f1fc029ef5df3415cada325fbfed4bde)

2 years agocrimson/osd/heartbeat: share osdmap to peers when necessary
Xuehan Xu [Thu, 23 Feb 2023 06:50:56 +0000 (06:50 +0000)]
crimson/osd/heartbeat: share osdmap to peers when necessary

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 670bbaa4d858de3dd50d857370f76bbd1a13c702)

2 years agocrimson/osd/pg: make clone object's version consistent with pglog 51639/head
Xuehan Xu [Tue, 25 Apr 2023 06:21:07 +0000 (06:21 +0000)]
crimson/osd/pg: make clone object's version consistent with pglog

Right now, the head object's version is 1 less than clone object's
version in the pg log; while it's exactly the other way around when
it comes to the versions recorded in the object info of head/clone
objects

Fixes: https://tracker.ceph.com/issues/59536
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit 1fd6324bb8baaee4d413f188c78b821f84e5d4ff)

2 years agocrimson/osd/snaptrim_event: avoid leaking txn ops for updating head obcs 51638/head
Xuehan Xu [Thu, 27 Apr 2023 03:32:04 +0000 (03:32 +0000)]
crimson/osd/snaptrim_event: avoid leaking txn ops for updating head obcs
when removing clones

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit 08625c27f9e158ffb46d0d5d008f500ee9677b42)

2 years agocrimson/osd/snaptrim_event: encode head oi with no oid
Xuehan Xu [Thu, 27 Apr 2023 03:31:20 +0000 (03:31 +0000)]
crimson/osd/snaptrim_event: encode head oi with no oid

This is required by PGBackend::load_metadata

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit ba8732d2a942b4faede4bd3d88764f1da0aa5ad8)

2 years agocrimson/osd/snaptrim_event: don't clear head obc's snaps
Xuehan Xu [Thu, 27 Apr 2023 03:29:58 +0000 (03:29 +0000)]
crimson/osd/snaptrim_event: don't clear head obc's snaps

There may be valid snaps for a head object, although some snap is
being removed

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit f5194e60a25d89f0b0673a96629ea7db42487ac0)

2 years agocrimson/osd: get SnapSetContext from head obc
Xuehan Xu [Sun, 23 Apr 2023 03:59:17 +0000 (03:59 +0000)]
crimson/osd: get SnapSetContext from head obc

clone obc doesn't have snapset context

Fixes: https://tracker.ceph.com/issues/59511
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit a41588532a0339bd647daaf52a6207b67c4459b5)

2 years agotest/librados/snapshots_cxx: Add WriteRollback test 51637/head
Matan Breizman [Tue, 21 Mar 2023 10:50:58 +0000 (10:50 +0000)]
test/librados/snapshots_cxx: Add WriteRollback test

This test is an example for https://tracker.ceph.com/issues/59114

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit b4f453d3a2d8bbdd3b48c7101ef91303c8b2b00b)

2 years agocrimson/osd/pg_backend: Add a note about unhandled rollback case
Matan Breizman [Sun, 19 Mar 2023 11:26:41 +0000 (11:26 +0000)]
crimson/osd/pg_backend: Add a note about unhandled rollback case

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit f616fafbd6e8beeb1cb0852407014227b3c34421)