]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agodoc/rados: line-edit erasure-code.rst 50619/head
Zac Dover [Tue, 21 Mar 2023 12:27:15 +0000 (22:27 +1000)]
doc/rados: line-edit erasure-code.rst

Line-edit doc/rados/operations/erasure-code.rst.

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

2 years agoMerge pull request #50590 from zdover23/wip-doc-2023-03-20-backport-50488-to-quincy
Anthony D'Atri [Mon, 20 Mar 2023 04:47:53 +0000 (00:47 -0400)]
Merge pull request #50590 from zdover23/wip-doc-2023-03-20-backport-50488-to-quincy

quincy: doc/rados: edit operations/bs-migration (2 of x)

2 years agoMerge pull request #50587 from zdover23/wip-doc-2023-03-20-backport-50487-to-quincy
Anthony D'Atri [Mon, 20 Mar 2023 04:45:51 +0000 (00:45 -0400)]
Merge pull request #50587 from zdover23/wip-doc-2023-03-20-backport-50487-to-quincy

quincy: doc/rados: edit operations/bs-migration (1 of x)

2 years agodoc/rados: edit operations/bs-migration (2 of x) 50590/head
Zac Dover [Sun, 12 Mar 2023 01:17:03 +0000 (11:17 +1000)]
doc/rados: edit operations/bs-migration (2 of x)

Disambiguate and improve the English language in
doc/rados/operations/bluestore-migration.rst up to but not including the
section called "Whole Host Replacement".

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

2 years agodoc/rados: edit operations/bs-migration (1 of x) 50587/head
Zac Dover [Sun, 12 Mar 2023 01:17:03 +0000 (11:17 +1000)]
doc/rados: edit operations/bs-migration (1 of x)

Disambiguate and improve the English language in
doc/rados/operations/bluestore-migration.rst up to but not including the
section called "Whole Host Replacement".

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

2 years agoMerge pull request #50582 from zdover23/wip-doc-2023-03-19-backport-50579-to-quincy
Anthony D'Atri [Sun, 19 Mar 2023 12:35:50 +0000 (08:35 -0400)]
Merge pull request #50582 from zdover23/wip-doc-2023-03-19-backport-50579-to-quincy

quincy: doc/rados: line edit mon-lookup-dns top matter

2 years agodoc/rados: line edit mon-lookup-dns top matter 50582/head
Zac Dover [Sat, 18 Mar 2023 05:27:54 +0000 (15:27 +1000)]
doc/rados: line edit mon-lookup-dns top matter

Improve the syntax of the top matter of
doc/rados/operations/mon-lookup-dns.rst.

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

2 years agoMerge pull request #50505 from ifed01/wip-ifed-report-min-alloc-size-qui
Yuri Weinstein [Fri, 17 Mar 2023 16:08:01 +0000 (09:08 -0700)]
Merge pull request #50505 from ifed01/wip-ifed-report-min-alloc-size-qui

quincy: os/bluestore: report min_alloc_size through "ceph osd metadata"

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 years agoMerge pull request #50319 from ifed01/wip-ifed-log-before-assert-in-avl-qui
Yuri Weinstein [Fri, 17 Mar 2023 16:06:44 +0000 (09:06 -0700)]
Merge pull request #50319 from ifed01/wip-ifed-log-before-assert-in-avl-qui

quincy: os/bluestore: log before assert in AvlAllocator

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
2 years agoMerge pull request #50566 from zdover23/wip-doc-2023-03-17-backport-50563-to-quincy
zdover23 [Fri, 17 Mar 2023 14:25:04 +0000 (00:25 +1000)]
Merge pull request #50566 from zdover23/wip-doc-2023-03-17-backport-50563-to-quincy

quincy: doc/rados: line-edit upmap.rst

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/rados: line-edit upmap.rst 50566/head
Zac Dover [Thu, 16 Mar 2023 17:41:08 +0000 (03:41 +1000)]
doc/rados: line-edit upmap.rst

Edit all of doc/rados/upmap.rst.

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

2 years agoMerge pull request #50485 from cbodley/wip-58955
Yuri Weinstein [Thu, 16 Mar 2023 22:24:27 +0000 (15:24 -0700)]
Merge pull request #50485 from cbodley/wip-58955

quincy: rgw/admin: 'bucket stats' displays non-empty time

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #50526 from epuertat/wip-59051-quincy
Ernesto Puerta [Tue, 14 Mar 2023 20:17:27 +0000 (21:17 +0100)]
Merge pull request #50526 from epuertat/wip-59051-quincy

quincy: mgr/dashboard: force TLS 1.3

Reviewed-by: Pegonzal <NOT@FOUND>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #50474 from rzarzynski/wip-aclamk-harmonize-bluefs-log-quincy
Yuri Weinstein [Tue, 14 Mar 2023 16:33:56 +0000 (09:33 -0700)]
Merge pull request #50474 from rzarzynski/wip-aclamk-harmonize-bluefs-log-quincy

quincy: os/bluestore: BlueFS: harmonize log read and writes modes

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
2 years agomgr/dashboard: force TLS 1.3 50526/head
Ernesto Puerta [Mon, 13 Mar 2023 10:03:37 +0000 (11:03 +0100)]
mgr/dashboard: force TLS 1.3

Fixes: https://tracker.ceph.com/issues/58942
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit cd8946631b222dfff1727083d75dfe2dd825d1a4)

2 years agoos/bluestore: report min_alloc_size through "ceph osd metadata" 50505/head
Igor Fedotov [Wed, 1 Feb 2023 10:18:29 +0000 (13:18 +0300)]
os/bluestore: report min_alloc_size through "ceph osd metadata"

Fixes: https://tracker.ceph.com/issues/58421
Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit b0df6945d0f4371849026ddcce0537ca4a33bb6f)

2 years agoMerge pull request #50444 from adk3798/wip-58709-quincy
Adam King [Mon, 13 Mar 2023 14:29:44 +0000 (10:29 -0400)]
Merge pull request #50444 from adk3798/wip-58709-quincy

quincy: Add per OSD crush_device_class definition
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50448 from adk3798/wip-58883-quincy
Adam King [Mon, 13 Mar 2023 14:14:30 +0000 (10:14 -0400)]
Merge pull request #50448 from adk3798/wip-58883-quincy

quincy: cephadm: set pids-limit unlimited for all ceph daemons

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #49930 from adk3798/wip-58198-quincy
Adam King [Mon, 13 Mar 2023 11:14:48 +0000 (07:14 -0400)]
Merge pull request #49930 from adk3798/wip-58198-quincy

quincy: mgr/prometheus: fix module crash when trying to collect OSDs metrics

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50170 from trociny/wip-58774-quincy
Adam King [Mon, 13 Mar 2023 11:12:34 +0000 (07:12 -0400)]
Merge pull request #50170 from trociny/wip-58774-quincy

quincy: mgr/cephadm: try to avoid pull when getting container image info

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #50370 from guits/wip-58910-quincy
Adam King [Mon, 13 Mar 2023 11:09:50 +0000 (07:09 -0400)]
Merge pull request #50370 from guits/wip-58910-quincy

quincy: drive_group: fix limit filter in drive_selection.selector

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #50445 from adk3798/wip-58761-quincy
Adam King [Mon, 13 Mar 2023 11:06:46 +0000 (07:06 -0400)]
Merge pull request #50445 from adk3798/wip-58761-quincy

quincy: cephadm: using short hostname to create the initial mon and mgr

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50451 from rhcs-dashboard/wip-58720-quincy
Nizamudeen A [Mon, 13 Mar 2023 05:14:37 +0000 (10:44 +0530)]
Merge pull request #50451 from rhcs-dashboard/wip-58720-quincy

quincy: mgr/dashboard: move service_instances logic to backend

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agoMerge pull request #50353 from ceph/wip-yuri-quincy-reef-quincy
Yuri Weinstein [Sun, 12 Mar 2023 18:39:14 +0000 (11:39 -0700)]
Merge pull request #50353 from ceph/wip-yuri-quincy-reef-quincy

qa/tests: added quincy client upgrade => reef

Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agorgw/admin: 'bucket stats' displays non-empty mtime 50485/head
Casey Bodley [Tue, 7 Mar 2023 22:49:44 +0000 (17:49 -0500)]
rgw/admin: 'bucket stats' displays non-empty mtime

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

Conflicts:
src/rgw/driver/rados/rgw_bucket.cc -> src/rgw/rgw_bucket.cc

2 years agoMerge pull request #50453 from zdover23/wip-doc-2023-03-09-backport-50439-to-quincy
zdover23 [Sat, 11 Mar 2023 04:22:17 +0000 (14:22 +1000)]
Merge pull request #50453 from zdover23/wip-doc-2023-03-09-backport-50439-to-quincy

quincy: doc/rados/operations: Improve wording, capitalization, formatting

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #50477 from zdover23/wip-doc-2023-03-11-backport-50470-to-quincy
Anthony D'Atri [Fri, 10 Mar 2023 21:35:32 +0000 (16:35 -0500)]
Merge pull request #50477 from zdover23/wip-doc-2023-03-11-backport-50470-to-quincy

quincy: doc/index: remove "uniquely" from landing page

2 years agodoc/index: remove "uniquely" from landing page 50477/head
Zac Dover [Fri, 10 Mar 2023 10:35:18 +0000 (20:35 +1000)]
doc/index: remove "uniquely" from landing page

Change "Ceph uniquely delivers[...]" to "Ceph delivers[...]"

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

2 years agoMerge pull request #50446 from adk3798/wip-58776-quincy
Adam King [Fri, 10 Mar 2023 19:07:13 +0000 (14:07 -0500)]
Merge pull request #50446 from adk3798/wip-58776-quincy

quincy: mgr/cephadm: fix backends service in haproxy config with multiple nfs of same rank

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50447 from adk3798/wip-58778-quincy
Adam King [Fri, 10 Mar 2023 19:04:02 +0000 (14:04 -0500)]
Merge pull request #50447 from adk3798/wip-58778-quincy

quincy: cephadm: Adding poststop actions and setting TimeoutStartSec to 200s

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50327 from Matan-B/wip-matanb-quincy-check-pg-num
Laura Flores [Fri, 10 Mar 2023 16:39:33 +0000 (10:39 -0600)]
Merge pull request #50327 from Matan-B/wip-matanb-quincy-check-pg-num

quincy: mon/OSDMointor: Simplify check_pg_num()

2 years agoos/bluestore: BlueFS: harmonize log read and writes modes 50474/head
Adam Kupczyk [Fri, 10 Mar 2023 07:53:27 +0000 (08:53 +0100)]
os/bluestore: BlueFS: harmonize log read and writes modes

BlueFS log has always been written in non-buffered mode.
Reading of it depends on bluefs_buffered_io option.
It is strongly suspected that this causes some wierd problems.

Possibly fixes: https://tracker.ceph.com/issues/54019

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

2 years agomgr/cephadm: fix haproxy nfs backend server ip gathering 50446/head
Adam King [Sun, 15 Jan 2023 22:18:47 +0000 (17:18 -0500)]
mgr/cephadm: fix haproxy nfs backend server ip gathering

Fixes: https://tracker.ceph.com/issues/58465
Previously, if there were 2 nfs daemons of the same
rank, we could not check the rank generation, which
is intended to mark which one is the "real" on of that
rank in cases where we cannot remove the other one due
to its host being offline. The nfs of a given rank with
the highest rank_generation is the one we want haproxy
to use for its backend IP. Since we didn't actually
check this, it was random, depending on what order we
happened to iterate over the nfs daemons of the same
rank, which IP we actually got. If the nfs with the
lower rank_generation on an offline host happened
to come later in the iterations, we'd use that one
for the IP, which is incorrect.

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

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

2 years agomgr/cephadm: don't attempt daemon actions for daemons on offline hosts
Adam King [Sun, 15 Jan 2023 21:30:53 +0000 (16:30 -0500)]
mgr/cephadm: don't attempt daemon actions for daemons on offline hosts

They'll just fail anyway, and it will waste time waiting
for the connection to timeout. We have other places in
the serve loop that will check if the host is back
online.

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

2 years agodoc/rados/operations: Improve wording, capitalization, formatting 50453/head
Anthony D'Atri [Wed, 8 Mar 2023 12:29:55 +0000 (07:29 -0500)]
doc/rados/operations: Improve wording, capitalization, formatting

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

2 years agoMerge pull request #50407 from rzarzynski/wip-57696-quincy
Yuri Weinstein [Thu, 9 Mar 2023 23:11:43 +0000 (15:11 -0800)]
Merge pull request #50407 from rzarzynski/wip-57696-quincy

quincy: mon/LogMonitor: Fix log last

Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #50406 from rzarzynski/wip-58169-quincy
Yuri Weinstein [Thu, 9 Mar 2023 22:49:04 +0000 (14:49 -0800)]
Merge pull request #50406 from rzarzynski/wip-58169-quincy

quincy: src/crush: extra logging to debug CPU burn in test_with_fork()

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
2 years agoMerge pull request #50405 from rzarzynski/wip-58334-quincy
Yuri Weinstein [Thu, 9 Mar 2023 22:47:41 +0000 (14:47 -0800)]
Merge pull request #50405 from rzarzynski/wip-58334-quincy

quincy: osd: mds: suggest clock skew when failing to obtain rotating service keys

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2 years agoMerge pull request #49989 from pdvian/wip-58639-quincy
Yuri Weinstein [Thu, 9 Mar 2023 22:46:07 +0000 (14:46 -0800)]
Merge pull request #49989 from pdvian/wip-58639-quincy

quincy: mon: Fix condition to check for ceph version mismatch

Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #47927 from rzarzynski/wip-55543-quincy
Yuri Weinstein [Thu, 9 Mar 2023 22:44:38 +0000 (14:44 -0800)]
Merge pull request #47927 from rzarzynski/wip-55543-quincy

quincy: cmake: re-enable TCMalloc and allocator related cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
2 years agoMerge pull request #50388 from zdover23/wip-doc-2023-03-06-backport-50386-to-quincy
zdover23 [Thu, 9 Mar 2023 19:58:19 +0000 (05:58 +1000)]
Merge pull request #50388 from zdover23/wip-doc-2023-03-06-backport-50386-to-quincy

quincy: doc/rgw - fix grammar in table in s3.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #50125 from rhcs-dashboard/wip-58729-quincy
Nizamudeen A [Thu, 9 Mar 2023 16:59:02 +0000 (22:29 +0530)]
Merge pull request #50125 from rhcs-dashboard/wip-58729-quincy

quincy: mgr/dashboard: fix rbd mirroring daemon health status

Reviewed-by: Pegonzal <NOT@FOUND>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: siddharthchanana9 <NOT@FOUND>
2 years agoMerge pull request #50450 from rhcs-dashboard/wip-57483-quincy
Nizamudeen A [Thu, 9 Mar 2023 16:53:56 +0000 (22:23 +0530)]
Merge pull request #50450 from rhcs-dashboard/wip-57483-quincy

quincy: mgr/dashboard: cephadm dashboard e2e fixes

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agoMerge pull request #50459 from rhcs-dashboard/custom-image-kcli-bootstrap-quincy
Nizamudeen A [Thu, 9 Mar 2023 15:42:45 +0000 (21:12 +0530)]
Merge pull request #50459 from rhcs-dashboard/custom-image-kcli-bootstrap-quincy

quincy: mgr/dashboard: custom image for kcli bootstrap script

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agomgr/dashboard: custom image for kcli bootstrap script 50459/head
Nizamudeen A [Thu, 9 Mar 2023 11:51:44 +0000 (17:21 +0530)]
mgr/dashboard: custom image for kcli bootstrap script

the stable branches like quincy pulls from the quay.io/ceph/ceph:v17 to
bootstrap the ceph cluster in test environments. This will cause issues
because the branches are changing constantly but the image is not. So
using the quay.ceph.io repo to bring the cluster in test environment.

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit be8f1e7f4a81dbf04692446edcc429d93d59e09d)

 Conflicts:
src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
  - Reject the incoming changes and change the image tag to quincy

2 years agoosd/OSDMapping: Remove get_num_acting_pgs 50327/head
Matan Breizman [Tue, 20 Dec 2022 15:36:51 +0000 (15:36 +0000)]
osd/OSDMapping: Remove get_num_acting_pgs

Introduced here: bd9813f5e1a3addca1a57360d58b50b120e0e5f3
As check_pg_num() is changed, this method is no longer needed.

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

2 years agomon/OSDMonitor: Skip check_pg_num on pool size decrease
Matan Breizman [Thu, 15 Dec 2022 17:05:15 +0000 (17:05 +0000)]
mon/OSDMonitor: Skip check_pg_num on pool size decrease

When changing the pool size we use check_pg_num to not exceed
`mon_max_pg_per_osd` value. This check should only be applied
when increasing the size to avoid underflows.
(Same already applied when changing pg_num)

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

2 years agomon/OSDMointor: Simplify check_pg_num()
Matan Breizman [Mon, 19 Dec 2022 09:58:06 +0000 (09:58 +0000)]
mon/OSDMointor: Simplify check_pg_num()

* See: https://tracker.ceph.com/issues/47062.
  Originally check_pg_num did not take into account the root
  osds by the crash rule.
  This behavior resulted in an inaccurate pg num per osd count.

* Avoid summing all of the projecetd pg num and only later
  on subtracting the pg num if the pool did exist.

* With this change, we only count the projected pg num which
  are part the pools affected by the crush rule.
  Same for osd number, instead of dividing the projected
  pg number by all of the osdmap osds, divide only by
  the osds used by the crush rule.

* Avoid differentiating between whether the mapping epoch
  is later than the osdmap epoch or not. Always check the pg
  num according to crush rule.

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

*****
Note: The following commit has been squashed to comply with Q:
*****
mon/OSDMonitor: Replace set::contains with set::count

std::set::contains is available since C++20 and is replaced by
std::set::count instead (unlike the original commit).

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
2 years agosrc/mon: clarify pool creation failure due to max_pgs_per_osd error message
Anthony D'Atri [Thu, 1 Dec 2022 19:04:30 +0000 (14:04 -0500)]
src/mon: clarify pool creation failure due to max_pgs_per_osd error message

Signed-off-by: Anthony D'Atri <anthony.datri@gmail.com>
Note: This commit is cherry-picked as a dependency
      for later commits in this backport.
(cherry picked from commit 88e8eeca7571fc314bc30a52cd17218fa9fac500)

2 years agomon/OSDMonitor: fix integer underflow of check_pg_num
Tongliang Deng [Fri, 31 Dec 2021 06:02:25 +0000 (14:02 +0800)]
mon/OSDMonitor: fix integer underflow of check_pg_num

Underflow of the `uint64_t projected` variable occurs when
the sum of current acting pg num and new pg num we specified
is less than the pg num calculated from pg info.

Signed-off-by: Tongliang Deng <dengtongliang@gmail.com>
Note: This commit is cherry-picked as a dependency
      for later commits in this backport.
(cherry picked from commit bd9813f5e1a3addca1a57360d58b50b120e0e5f3)

2 years agomon/OSDMonitor: Make the pg_num check more accurate
jerryluo [Mon, 25 Jan 2021 16:10:57 +0000 (00:10 +0800)]
mon/OSDMonitor: Make the pg_num check more accurate

In check_pg_num function, finding the corresponding osd according to the
current pool's crush rule, and calculating whether the average value of
pg_num on these osd will exceed the value of 'mon_max_pg_per_osd'. Make
the pg_num check more accurate by counting all the pgs on the osd used
by the new pool.

Fixes: https://tracker.ceph.com/issues/47062
Signed-off-by: Jerry Luo <luojierui@chinatelecom.cn>
Note: This commit has been reverted and is cherry-picked as
      dependency for other commits in this backport.
(cherry picked from commit c726ce9e5088b30d29e0db5c0ecc8c03fe41da1d)

2 years agomgr/dashboard: move service_instances logic to backend 50451/head
Nizamudeen A [Fri, 20 Jan 2023 10:28:12 +0000 (15:58 +0530)]
mgr/dashboard: move service_instances logic to backend

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html
  - Accept the incoming changes

2 years agomgr/dashboard: ignore the rules 400 error in dashboard kcli e2e 50450/head
Nizamudeen A [Tue, 14 Feb 2023 15:34:26 +0000 (21:04 +0530)]
mgr/dashboard: ignore the rules 400 error in dashboard kcli e2e

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

2 years agomgr/dashboard: cephadm dashboard e2e fixes
Nizamudeen A [Thu, 12 Jan 2023 05:54:56 +0000 (11:24 +0530)]
mgr/dashboard: cephadm dashboard e2e fixes

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

2 years agomgr/dashboard: fix Cannot read properties of undefined (reading 'filter')
Nizamudeen A [Sun, 4 Sep 2022 05:52:45 +0000 (11:22 +0530)]
mgr/dashboard: fix Cannot read properties of undefined (reading 'filter')

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

2 years agoqa/distros: pass --allowerasing --nobest when installing container-tools 50448/head
Adam King [Thu, 16 Feb 2023 17:34:06 +0000 (12:34 -0500)]
qa/distros: pass --allowerasing --nobest when installing container-tools

One of the tests in the orch suite is running distro install
commands from multiple distros, causing it to first install
container-tools 3.0 and then later install container-tools,
which fails, causing the test to fail. This is sort of a bandaid
fix to getthe test to work. It will cause whatever the last
version of the package to be installed to end up being installed
(and will do so without error) which is what we want in the tests.

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

2 years agocephadm: set pids-limit unlimited for all ceph daemons
Adam King [Sun, 12 Feb 2023 20:28:10 +0000 (15:28 -0500)]
cephadm: set pids-limit unlimited for all ceph daemons

We actually had this setup before, but ran into issues.
Some teuthology test had failed in the fs suite, so it was
modified to only affect iscsi and rgw daemons (https://github.com/ceph/ceph/pull/45798)
and then the changes were reverted entirely (so no pids-limit
modifying code at all) in quincy and pacific because
the LRC ran into issues with the change related to the podman
version (https://github.com/ceph/ceph/pull/45932). This new patch
now addresses the podman versions, specifically that the patch
that makes -1 work for a pids-limit seems to have landed in
podman 3.4.1 based on https://github.com/containers/podman/pull/12040.
We'll need to make sure that this doesn't break anything in the
fs suites again as I don't remember the details of the first
issue, or why having it only set the pids-limit for iscsi and rgw fixes it.
Assuming that isn't a problem we should hopefully be able to unify
at least how reef and quincy handle this now that the podman version
issue is being addressed in this patch.

See the linked tracker issue for a discussion on why we're going at
this again and why I'm trying to do this for all ceph daemon types.

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

2 years agocephadm: only apply pids-limit to iscsi and rgw
Adam King [Wed, 6 Apr 2022 15:24:24 +0000 (11:24 -0400)]
cephadm: only apply pids-limit to iscsi and rgw

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

2 years agocephadm: remove containers pids-limit
Teoman ONAY [Thu, 11 Nov 2021 15:05:49 +0000 (15:05 +0000)]
cephadm: remove containers pids-limit

The default pids-limit (docker 4096/podman 2048) prevent some
customization from working (http threads on RGW) or limits the number
of luns per iscsi target.

Fixes: https://tracker.ceph.com/issues/52898
Signed-off-by: Teoman ONAY <tonay@redhat.com>
(cherry picked from commit de8b3c2676e65eb61df54c65cfd3b3af1e68da56)

2 years agocephadm: Adding poststop actions and setting TimeoutStartSec to 200s 50447/head
Redouane Kachach [Thu, 12 Jan 2023 10:29:31 +0000 (11:29 +0100)]
cephadm: Adding poststop actions and setting TimeoutStartSec to 200s
Fixes: https://tracker.ceph.com/issues/58241
Fixes: https://tracker.ceph.com/issues/58242
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 5824b0131f6c1959116b3de6b2f2322d95a86bc6)

2 years agocephadm: using short hostname to create the initial mon and mgr 50445/head
Redouane Kachach [Wed, 25 Jan 2023 09:14:59 +0000 (10:14 +0100)]
cephadm: using short hostname to create the initial mon and mgr
Fixes: https://tracker.ceph.com/issues/58466
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 0b807eefb8dbccf1e25c846f8177ddb74c6f333d)

2 years agoAdd per OSD crush_device_class definition 50444/head
Francesco Pantano [Fri, 23 Dec 2022 13:45:40 +0000 (14:45 +0100)]
Add per OSD crush_device_class definition

This patch introduces a per osd crush_device_class definition in the
DriveGroup spec. The Device object is extended to support a
crush_device_class parameter which is processed by ceph-volume when
drives are prepared in batch mode. According to the per osd defined
crush device classes, drives are collected and grouped in a dict that is
used to produce a set of ceph-volume commands that eventually apply (if
defined) the right device class. The test_drive_group unit tests are
also extended to make sure we're not breaking compatibility with the
default definition and the new syntax is validated, raising an exception
if it's violated.

Fixes: https://tracker.ceph.com/issues/58184
Signed-off-by: Francesco Pantano <fpantano@redhat.com>
(cherry picked from commit 6c6cb2f5130dbcf8e42cf03666173948411fc92b)

Conflicts:
src/python-common/ceph/deployment/drive_group.py

2 years agoMerge pull request #50435 from zdover23/wip-doc-2023-03-08-backport-49823-to-quincy
zdover23 [Wed, 8 Mar 2023 16:24:48 +0000 (02:24 +1000)]
Merge pull request #50435 from zdover23/wip-doc-2023-03-08-backport-49823-to-quincy

quincy: doc/install: refine index.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #50286 from batrick/i58261
Yuri Weinstein [Wed, 8 Mar 2023 15:39:39 +0000 (07:39 -0800)]
Merge pull request #50286 from batrick/i58261

quincy: pybind/mgr: use memory temp_store for sqlite3 db

Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agoMerge pull request #50124 from rhcs-dashboard/wip-58026-quincy
Nizamudeen A [Wed, 8 Mar 2023 09:48:05 +0000 (15:18 +0530)]
Merge pull request #50124 from rhcs-dashboard/wip-58026-quincy

quincy: mgr/dashboard: upgrade to angular 13, bootstrap 5 and jest 28

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agodoc/install: refine index.rst 50435/head
Zac Dover [Sat, 21 Jan 2023 16:32:59 +0000 (02:32 +1000)]
doc/install: refine index.rst

Refine English sentences in doc/install/index.rst. Remove adverbial
phrases of time that refer to Nautilus-era features as "new", since that
was four years ago.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit e7669539aceffc0f6f5d61bd140f1c7936d21cf9)

2 years agoMerge pull request #50432 from zdover23/wip-doc-2023-03-08-backport-50430-to-quincy
zdover23 [Wed, 8 Mar 2023 04:01:08 +0000 (14:01 +1000)]
Merge pull request #50432 from zdover23/wip-doc-2023-03-08-backport-50430-to-quincy

quincy: doc/install: update index.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/install: update index.rst 50432/head
Zac Dover [Wed, 8 Mar 2023 01:52:12 +0000 (11:52 +1000)]
doc/install: update index.rst

Update index.rst by making minor grammar improvements. This file was
long overdue for a backport to Reef, Quincy, and Pacific, so this commit
was a good way to pass a human eyeball over the text before making those
backports.

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

2 years agomgr/cephadm: try to avoid pull when getting container image info 50170/head
Mykola Golub [Tue, 28 Feb 2023 17:27:39 +0000 (19:27 +0200)]
mgr/cephadm: try to avoid pull when getting container image info

only if use_repo_digest is not set.

The commit ac88200 introduced this possibility to skip pulling, but
doing this unconditionally broke a use case when one was able to have
a ceph image on a floating tag, and was able to upgrade to a new image
pushed to that tag. As using a floating tag is possible only when
use_repo_digest is enabled (the default), now skipping the pull
if use_repo_digest is disabled will not break it anymore.

Signed-off-by: Mykola Golub <mykola.golub@clyso.com>
(cherry picked from commit 4d049880a0effa78b69179694430d8a274829342)

2 years agomgr/cephadm: fix error_ok not being passed in unit tests
Adam King [Sun, 22 Jan 2023 16:52:10 +0000 (11:52 -0500)]
mgr/cephadm: fix error_ok not being passed in unit tests

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

2 years agomgr/cephadm: try to avoid pull when getting container image info
Mykola Golub [Sun, 20 Nov 2022 13:11:11 +0000 (13:11 +0000)]
mgr/cephadm: try to avoid pull when getting container image info

Fixes: https://tracker.ceph.com/issues/58051
Signed-off-by: Mykola Golub <mykola.golub@clyso.com>
(cherry picked from commit ac882006e8bca484ad5dfe93e7374ffec07ef919)

2 years agomgr/cephadm: allow _run_cephadm_json to be silent on error
Mykola Golub [Sat, 26 Nov 2022 08:39:54 +0000 (08:39 +0000)]
mgr/cephadm: allow _run_cephadm_json to be silent on error

Signed-off-by: Mykola Golub <mykola.golub@clyso.com>
(cherry picked from commit ad3f576dde1fdc64a94d50f648052f42f5338fef)

2 years agoMerge pull request #50306 from idryomov/wip-58647-quincy
Yuri Weinstein [Mon, 6 Mar 2023 23:23:47 +0000 (15:23 -0800)]
Merge pull request #50306 from idryomov/wip-58647-quincy

quincy: 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 #50153 from rzarzynski/wip-osd-mon-public_bind_in_bindv-quincy
Yuri Weinstein [Mon, 6 Mar 2023 23:22:16 +0000 (15:22 -0800)]
Merge pull request #50153 from rzarzynski/wip-osd-mon-public_bind_in_bindv-quincy

quincy:  mon, osd: rework the public_bind_addr support. Bring it to OSD

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #50048 from ifed01/wip-ifed-no-statfs-qui
Yuri Weinstein [Mon, 6 Mar 2023 23:21:01 +0000 (15:21 -0800)]
Merge pull request #50048 from ifed01/wip-ifed-no-statfs-qui

quincy: os/bluesore: cumulative backport for Onode stuff and more

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
2 years agoMerge pull request #50400 from zdover23/wip-doc-2023-03-07-backport-50398-to-quincy
zdover23 [Mon, 6 Mar 2023 23:13:53 +0000 (09:13 +1000)]
Merge pull request #50400 from zdover23/wip-doc-2023-03-07-backport-50398-to-quincy

quincy: doc/dev: add full stop to sentence in basic-wo

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agomon/LogMonitor: Fix log last 50407/head
Prashant D [Tue, 30 Aug 2022 07:29:24 +0000 (03:29 -0400)]
mon/LogMonitor: Fix log last

The ceph log last command outputs all the cluster
logs generated from logm entries at DBG level,
irrespective of their log level. We must output
cluster logs generated from logm according
to the log level specified in the log last command.

Fixes: https://tracker.ceph.com/issues/57340
Signed-off-by: Prashant D <pdhange@redhat.com>
(cherry picked from commit 32e40328fbdece9f6c573c11305ee525823e53c6)

2 years agosrc/crush: extra logging to debug CPU burn in test_with_fork() 50406/head
Deepika Upadhyay [Wed, 12 Oct 2022 16:43:01 +0000 (22:13 +0530)]
src/crush: extra logging to debug CPU burn in test_with_fork()

related: https://tracker.ceph.com/issues/57782

Signed-off-by: Deepika Upadhyay <deepika@koor.tech>
(cherry picked from commit 79e2902acdcf1c529f73e80449ac067e4bba2675)

2 years agoosd: mds: suggest clock skew when failing to obtain rotating service keys 50405/head
Greg Farnum [Fri, 30 Sep 2022 19:10:04 +0000 (19:10 +0000)]
osd: mds: suggest clock skew when failing to obtain rotating service keys

Fixes: https://tracker.ceph.com/issues/17170
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 05fd05020b2b15c674af8891f6e8f10c381e6832)

2 years agomgr/dashboard: tslint to eslint migration 50124/head
Nizamudeen A [Fri, 21 Oct 2022 08:08:16 +0000 (13:38 +0530)]
mgr/dashboard: tslint to eslint migration

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/package-lock.json
 - Generate a new one
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html
 - Accept the current changes

2 years agodoc/dev: add full stop to sentence in basic-wo 50400/head
Zac Dover [Mon, 6 Mar 2023 16:15:27 +0000 (02:15 +1000)]
doc/dev: add full stop to sentence in basic-wo

Add a full stop to a sentence in basic-workflow.rst. I looked at this
document and noticed that it wasn't there, and it was just bugging me.

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

2 years agoMerge pull request #50180 from nbalacha/wip-58763-quincy
Yuri Weinstein [Mon, 6 Mar 2023 15:43:21 +0000 (07:43 -0800)]
Merge pull request #50180 from nbalacha/wip-58763-quincy

quincy: rbd-mirror: fix syncing_percent calculation logic in get_replay_status()

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #50159 from idryomov/wip-57396-quincy
Yuri Weinstein [Mon, 6 Mar 2023 15:41:47 +0000 (07:41 -0800)]
Merge pull request #50159 from idryomov/wip-57396-quincy

quincy: librbd: Fix local rbd mirror journals growing forever

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agoMerge pull request #50395 from zdover23/wip-doc-2023-03-06-backport-50382-to-quincy
Anthony D'Atri [Mon, 6 Mar 2023 14:22:18 +0000 (09:22 -0500)]
Merge pull request #50395 from zdover23/wip-doc-2023-03-06-backport-50382-to-quincy

quincy: doc/rgw: fix caption

2 years agodoc/rgw: fix caption 50395/head
Zac Dover [Sun, 5 Mar 2023 06:43:38 +0000 (16:43 +1000)]
doc/rgw: fix caption

Rewrite the third paragraph of the caption to the figure depicting how a
zonegroup works.

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

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

2 years agodoc/rgw - fix grammar in table in s3.rst 50388/head
Zac Dover [Mon, 6 Mar 2023 00:09:24 +0000 (10:09 +1000)]
doc/rgw - fix grammar in table in s3.rst

Put an "only" in the correct place. Also, this is a very small change
that will allow me to see if Jenkins is working (it probably isn't).

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

2 years agoMerge pull request #49851 from adk3798/wip-58540-quincy
Adam King [Sat, 4 Mar 2023 23:42:13 +0000 (18:42 -0500)]
Merge pull request #49851 from adk3798/wip-58540-quincy

quincy: mgr/cephadm: support for extra entrypoint args

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
2 years agoMerge pull request #50378 from zdover23/wip-doc-2023-03-04-backport-50375-to-quincy
Anthony D'Atri [Fri, 3 Mar 2023 23:05:15 +0000 (18:05 -0500)]
Merge pull request #50378 from zdover23/wip-doc-2023-03-04-backport-50375-to-quincy

quincy: doc/rgw: refine keycloak.rst

2 years agoMerge pull request #49522 from NitzanMordhai/wip-58315-quincy
Yuri Weinstein [Fri, 3 Mar 2023 22:31:16 +0000 (14:31 -0800)]
Merge pull request #49522 from NitzanMordhai/wip-58315-quincy

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

Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agodoc/rgw: refine keycloak.rst 50378/head
Zac Dover [Fri, 3 Mar 2023 19:36:35 +0000 (05:36 +1000)]
doc/rgw: refine keycloak.rst

Full line-edit of doc/radosgw/keycloak.rst. Corrected syntax, grammar,
RST, and broken links.

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

2 years agoqa/workunits/rbd-nbd: work around "rbd feature disable" hang 50159/head
Ilya Dryomov [Thu, 16 Feb 2023 11:53:02 +0000 (12:53 +0100)]
qa/workunits/rbd-nbd: work around "rbd feature disable" hang

"rbd feature disable" appears to reliably hang if the corresponding
remote request is proxied to rbd-nbd (because rbd-nbd happens to own
the exclusive lock after a series of blkdiscard calls) [1].  Work
around it here by enabling journaling before the image is mapped
and disabling it after the image is unmapped.

Also, don't assert on the output of "rbd journal inspect --verbose"
having a certain number of entries.  This is racy: if the script gets
delayed after the last blkdiscard call for some reason, there may be
fewer entries present in the journal or none at all.

[1] https://tracker.ceph.com/issues/58740

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

2 years agotest/librbd: add LengthModifiedDiscardJournalAppendEnabled test
Ilya Dryomov [Thu, 16 Feb 2023 11:51:04 +0000 (12:51 +0100)]
test/librbd: add LengthModifiedDiscardJournalAppendEnabled test

Currently nothing triggers the length_modified case in
ImageDiscardRequest::prune_object_extents() in isolation. It's only
triggered in DiscardGranularityJournalAppendEnabled test together with
the prune_required case and a bad refactoring could easily break the
length_modified logic again.

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

Conflicts:
src/test/librbd/io/test_mock_ImageRequest.cc [ commit
  b9a2384cdc43 ("librbd: propagate area down to
  file_to_extents()") not in quincy ]

2 years agolibrbd: Fix local rbd mirror journals growing forever
Josef Johansson [Mon, 2 Jan 2023 13:12:53 +0000 (14:12 +0100)]
librbd: Fix local rbd mirror journals growing forever

This commit fixes commit 7ca1bab90f3 by pushing properly aligned
discards back to m_image_extents, if corrected.

If discards are misaligned (off 0, len 4608, gran=4096), they are
corrected properly, but only in object_extents and not in
m_image_extents.

When journal_append_event is triggered it will only append from
m_image_extents and does not now about the alignment fixes. In
commit_io_events_extent it will log a message and return without
completing the io since the larger misaligned area was sent to the journal.
This will in turn break rbd journal mirroring since the local client will wait
indefinately on the commit to be completed, which it never does.

This does not effect rbd-mirror in any way, which may be confusing and
dangerous since it's only rbd-mirror that updates ceph health, and not
the local client.

Setting `rbd_skip_partial_discard = false` under client will restore the
pre 7ca1bab behaviour and thus not trigger the bug with journals growing.
This will set `rbd_discard_granularity_bytes = 0` internally. This
setting is only changed during startup of a client.

Fixes: 7ca1bab90f3db3aaaa4cdbfc1f18e9f5cfbf5568
Fixes: https://tracker.ceph.com/issues/57396
Signed-off-by: Josef Johansson <josef@oderland.se>
(cherry picked from commit 21a26a752843295ff946d1543c2f5f9fac764593)

Conflicts:
src/librbd/io/ImageRequest.cc [ commit b2c88820923e ("librbd:
  return area from extents_to_file()") not in quincy ]
src/test/librbd/io/test_mock_ImageRequest.cc [ commit
  b9a2384cdc43 ("librbd: propagate area down to
  file_to_extents()") not in quincy ]

2 years agoMerge pull request #50292 from idryomov/wip-58833-quincy
Yuri Weinstein [Fri, 3 Mar 2023 16:26:07 +0000 (08:26 -0800)]
Merge pull request #50292 from idryomov/wip-58833-quincy

quincy: librbd: call apply_changes() after setting librados_thread_count

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #50266 from idryomov/wip-58755-quincy
Yuri Weinstein [Fri, 3 Mar 2023 16:24:31 +0000 (08:24 -0800)]
Merge pull request #50266 from idryomov/wip-58755-quincy

quincy: rbd-mirror: add information about the last snapshot sync to image status

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
2 years agoMerge pull request #50367 from zdover23/wip-doc-2023-03-03-backport-50364-to-quincy
Anthony D'Atri [Fri, 3 Mar 2023 15:56:20 +0000 (10:56 -0500)]
Merge pull request #50367 from zdover23/wip-doc-2023-03-03-backport-50364-to-quincy

quincy: doc/cephadm: Redd up compatibility.rst

2 years agodrive_group: fix limit filter in drive_selection.selector 50370/head
Guillaume Abrioux [Wed, 1 Feb 2023 16:51:18 +0000 (17:51 +0100)]
drive_group: fix limit filter in drive_selection.selector

When multiple osd service specs with 'limit' filter are applied,
the current logic makes the second service speec
try to pick devices that are already used by the first service spec.

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

2 years agomgr/cephadm: fix extra container/entrypoint args with spaces 49851/head
Adam King [Mon, 9 Jan 2023 19:50:12 +0000 (14:50 -0500)]
mgr/cephadm: fix extra container/entrypoint args with spaces

Fixes: https://tracker.ceph.com/issues/57338
Prior, doing extra container args like

- "--cpus"
- "2"

would work fine as the two args would be passed separately and
eventually placed in the final podman/docker run command
with a space between them. However, trying to do something like

- "--cpus 2"

instead would fail, as it would be translated to

--extra-container-args=--cpus 2

causing "2" to be considered its own arg, which cephadm
wouldn't know how to handle. Another way this can cause problems
is listed in the linked tracker. Either way, leaving the spaces
in the args was causing problems, and the simplest way to handle
it seems to be to just split on the original arg on the spaces
into multiple args

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

2 years agodoc/cephadm: docs for extra entrypoint args
Adam King [Tue, 8 Nov 2022 19:25:13 +0000 (14:25 -0500)]
doc/cephadm: docs for extra entrypoint args

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

2 years agomgr/cephadm: support for extra entrypoint args
Adam King [Tue, 8 Nov 2022 19:09:05 +0000 (14:09 -0500)]
mgr/cephadm: support for extra entrypoint args

Args specified in the service spec to be added as
args for the entrypoint when we deploy the daemon

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

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