]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agomgr/cephadm: fix extra container/entrypoint args with spaces 49925/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)

Conflicts:
doc/cephadm/services/index.rst

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/cephadm/cephadm
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/services/cephadmservice.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_services.py

2 years agopython-common: add extra_entrypoint_args to service specs
Adam King [Mon, 7 Nov 2022 21:15:09 +0000 (16:15 -0500)]
python-common: add extra_entrypoint_args to service specs

To allow users to set extra args to be passed to
the entrypoint in the podman/docker run command
built by cephadm

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

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

2 years agoMerge pull request #49931 from adk3798/wip-58199-pacific
Adam King [Mon, 27 Mar 2023 15:37:47 +0000 (11:37 -0400)]
Merge pull request #49931 from adk3798/wip-58199-pacific

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

Reviewed-by: Teoman ONAY <tonay@ibm.com>
2 years agoMerge pull request #50007 from adk3798/57060-pacific-backport
Adam King [Mon, 27 Mar 2023 15:34:46 +0000 (11:34 -0400)]
Merge pull request #50007 from adk3798/57060-pacific-backport

pacific: mgr/cephadm: Fix how we check if a host belongs to public network

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50371 from guits/wip-58909-pacific
Adam King [Mon, 27 Mar 2023 15:31:04 +0000 (11:31 -0400)]
Merge pull request #50371 from guits/wip-58909-pacific

pacific: drive_group: fix limit filter in drive_selection.selector

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #50511 from adk3798/wip-58775-pacific
Adam King [Mon, 27 Mar 2023 15:23:59 +0000 (11:23 -0400)]
Merge pull request #50511 from adk3798/wip-58775-pacific

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

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50512 from adk3798/wip-58882-pacific
Adam King [Mon, 27 Mar 2023 15:17:27 +0000 (11:17 -0400)]
Merge pull request #50512 from adk3798/wip-58882-pacific

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

Reviewed-by: Teoman ONAY <tonay@ibm.com>
2 years agoMerge pull request #50513 from adk3798/wip-58773-pacific
Adam King [Mon, 27 Mar 2023 15:14:23 +0000 (11:14 -0400)]
Merge pull request #50513 from adk3798/wip-58773-pacific

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

Reviewed-by: Michael Fritch <mfritch@suse.com>
2 years agoMerge pull request #49867 from vshankar/tr-58573
Yuri Weinstein [Mon, 27 Mar 2023 14:54:39 +0000 (07:54 -0700)]
Merge pull request #49867 from vshankar/tr-58573

pacific: mds: account for snapshot items when deciding to split or merge a directory

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #50514 from adk3798/wip-58777-pacific
Adam King [Mon, 27 Mar 2023 14:29:59 +0000 (10:29 -0400)]
Merge pull request #50514 from adk3798/wip-58777-pacific

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

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50515 from adk3798/wip-58988-pacific
Adam King [Mon, 27 Mar 2023 14:27:48 +0000 (10:27 -0400)]
Merge pull request #50515 from adk3798/wip-58988-pacific

pacific: mgr/cephadm: don't add mgr into iscsi trusted_ip_list if it's already there

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agoMerge pull request #50516 from adk3798/wip-58990-pacific
Adam King [Mon, 27 Mar 2023 14:24:57 +0000 (10:24 -0400)]
Merge pull request #50516 from adk3798/wip-58990-pacific

pacific: mgr/cephadm: be aware of host's shortname and FQDN

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50679 from zdover23/wip-doc-2023-03-27-backport-50675-to-pacific
Anthony D'Atri [Sun, 26 Mar 2023 19:32:47 +0000 (15:32 -0400)]
Merge pull request #50679 from zdover23/wip-doc-2023-03-27-backport-50675-to-pacific

pacific: doc/rados: clean up ops/bluestore-migration.rst

2 years agodoc/rados: clean up ops/bluestore-migration.rst 50679/head
Zac Dover [Sun, 26 Mar 2023 15:03:58 +0000 (01:03 +1000)]
doc/rados: clean up ops/bluestore-migration.rst

Clean up internal links, fix the numbering of a procedure, and implement
Anthony D'Atri's suggestions in
https://github.com/ceph/ceph/pull/50487 and
https://github.com/ceph/ceph/pull/50488.

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

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

2 years agoMerge pull request #50673 from zdover23/wip-doc-2023-03-26-backport-50654-to-pacific
colemitchell [Sat, 25 Mar 2023 19:56:06 +0000 (15:56 -0400)]
Merge pull request #50673 from zdover23/wip-doc-2023-03-26-backport-50654-to-pacific

pacific: doc/glossary: add "User"

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/glossary: add "User" 50673/head
Zac Dover [Fri, 24 Mar 2023 10:56:51 +0000 (20:56 +1000)]
doc/glossary: add "User"

Add "User" to glossary.rst.

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

2 years agoMerge pull request #50663 from zdover23/wip-doc-2023-03-25-backport-50660-to-pacific
Anthony D'Atri [Fri, 24 Mar 2023 18:51:14 +0000 (14:51 -0400)]
Merge pull request #50663 from zdover23/wip-doc-2023-03-25-backport-50660-to-pacific

pacific: doc/operations: fix prompt in bluestore-migration

2 years agodoc/operations: fix prompt in bluestore-migration 50663/head
Zac Dover [Fri, 24 Mar 2023 17:47:10 +0000 (03:47 +1000)]
doc/operations: fix prompt in bluestore-migration

Fix a single prompt in bluestore-migration.rst.

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

2 years agoMerge pull request #50642 from zdover23/wip-doc-2023-03-23-backport-50634-to-pacific
Anthony D'Atri [Thu, 23 Mar 2023 13:20:20 +0000 (09:20 -0400)]
Merge pull request #50642 from zdover23/wip-doc-2023-03-23-backport-50634-to-pacific

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

2 years agodoc/rados: edit user-management.rst (1 of x) 50642/head
Zac Dover [Thu, 23 Mar 2023 02:21:06 +0000 (12:21 +1000)]
doc/rados: edit user-management.rst (1 of x)

Edit doc/rados/operations/user-management.rst. (1 of x)

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

2 years agoMerge pull request #50620 from zdover23/wip-doc-2023-03-22-backport-50606-to-pacific
Anthony D'Atri [Wed, 22 Mar 2023 03:33:08 +0000 (23:33 -0400)]
Merge pull request #50620 from zdover23/wip-doc-2023-03-22-backport-50606-to-pacific

pacific: doc/rados: line-edit erasure-code.rst

2 years agodoc/rados: line-edit erasure-code.rst 50620/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 #50591 from zdover23/wip-doc-2023-03-20-backport-50488-to-pacific
Anthony D'Atri [Mon, 20 Mar 2023 04:48:36 +0000 (00:48 -0400)]
Merge pull request #50591 from zdover23/wip-doc-2023-03-20-backport-50488-to-pacific

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

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

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

2 years agodoc/rados: edit operations/bs-migration (2 of x) 50591/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) 50588/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 #50583 from zdover23/wip-doc-2023-03-19-backport-50579-to-pacific
Anthony D'Atri [Sun, 19 Mar 2023 12:35:22 +0000 (08:35 -0400)]
Merge pull request #50583 from zdover23/wip-doc-2023-03-19-backport-50579-to-pacific

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

2 years agodoc/rados: line edit mon-lookup-dns top matter 50583/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 #50567 from zdover23/wip-doc-2023-03-17-backport-50563-to-pacific
zdover23 [Fri, 17 Mar 2023 14:25:16 +0000 (00:25 +1000)]
Merge pull request #50567 from zdover23/wip-doc-2023-03-17-backport-50563-to-pacific

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

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/rados: line-edit upmap.rst 50567/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 #50527 from epuertat/wip-59052-pacific
Ernesto Puerta [Wed, 15 Mar 2023 10:05:09 +0000 (11:05 +0100)]
Merge pull request #50527 from epuertat/wip-59052-pacific

pacific: mgr/dashboard: force TLS 1.3

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
2 years agoMerge pull request #47726 from neesingh-rh/wip-57201-pacific
Yuri Weinstein [Tue, 14 Mar 2023 16:14:03 +0000 (09:14 -0700)]
Merge pull request #47726 from neesingh-rh/wip-57201-pacific

pacific: mgr/snap_schedule: replace .snap with the client configured snap dir name

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #49829 from ivancich/wip-58542-pacific
Yuri Weinstein [Tue, 14 Mar 2023 15:56:42 +0000 (08:56 -0700)]
Merge pull request #49829 from ivancich/wip-58542-pacific

pacific: rgw: fix the problem of duplicate idx when bi list

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49669 from vshankar/wip-58349
Yuri Weinstein [Tue, 14 Mar 2023 15:51:48 +0000 (08:51 -0700)]
Merge pull request #49669 from vshankar/wip-58349

pacific: mds: fix scan_stray_dir not reset next.frag on each run of stray inode

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #49656 from dparmar18/wip-58254-pacific
Yuri Weinstein [Tue, 14 Mar 2023 15:50:12 +0000 (08:50 -0700)]
Merge pull request #49656 from dparmar18/wip-58254-pacific

pacific: mds/PurgeQueue: don't consider filer_max_purge_ops when _calculate_ops

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #49538 from ifed01/wip-ifed-fix-xlock-pac
Yuri Weinstein [Tue, 14 Mar 2023 15:46:10 +0000 (08:46 -0700)]
Merge pull request #49538 from ifed01/wip-ifed-fix-xlock-pac

pacific: mds: do not acquire xlock in xlockdone state

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #49458 from mchangir/wip-57761-pacific
Yuri Weinstein [Tue, 14 Mar 2023 15:45:30 +0000 (08:45 -0700)]
Merge pull request #49458 from mchangir/wip-57761-pacific

pacific: qa: wait for scrub to finish

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #49440 from neesingh-rh/wip-58250-pacific
Yuri Weinstein [Tue, 14 Mar 2023 15:44:50 +0000 (08:44 -0700)]
Merge pull request #49440 from neesingh-rh/wip-58250-pacific

pacific: mds: avoid ~mdsdir's scrubbing and reporting damage health status

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #49303 from neesingh-rh/wip-57971-pacific
Yuri Weinstein [Tue, 14 Mar 2023 15:43:19 +0000 (08:43 -0700)]
Merge pull request #49303 from neesingh-rh/wip-57971-pacific

pacific: cephfs-top: addition of sort feature and limit option

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #50050 from mchangir/wip-58598-pacific
Yuri Weinstein [Tue, 14 Mar 2023 15:04:06 +0000 (08:04 -0700)]
Merge pull request #50050 from mchangir/wip-58598-pacific

pacific: mon: disable snap id allocation for fsmap pools

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #50029 from joscollin/wip-58668-pacific
Yuri Weinstein [Tue, 14 Mar 2023 14:59:31 +0000 (07:59 -0700)]
Merge pull request #50029 from joscollin/wip-58668-pacific

pacific: cephfs-top: drop curses.A_ITALIC

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #49966 from vshankar/tr-57728
Yuri Weinstein [Tue, 14 Mar 2023 14:58:41 +0000 (07:58 -0700)]
Merge pull request #49966 from vshankar/tr-57728

pacific: pybind/mgr: check for empty metadata mgr_module:get_metadata()

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #49956 from dparmar18/wip-58601-pacific
Yuri Weinstein [Tue, 14 Mar 2023 14:57:46 +0000 (07:57 -0700)]
Merge pull request #49956 from dparmar18/wip-58601-pacific

pacific: mds/Server: do not allow -ve reclaim flags to cause client eviction

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agoMerge pull request #49944 from lxbsz/wip-58603
Yuri Weinstein [Tue, 14 Mar 2023 14:56:55 +0000 (07:56 -0700)]
Merge pull request #49944 from lxbsz/wip-58603

pacific: ceph_fuse: retry the test_dentry_handling if fails

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
2 years agoMerge pull request #49941 from lxbsz/wip-58608
Yuri Weinstein [Tue, 14 Mar 2023 14:55:58 +0000 (07:55 -0700)]
Merge pull request #49941 from lxbsz/wip-58608

pacific: mds: fix and skip submitting invalid osd request

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
2 years agoMerge pull request #49671 from vshankar/wip-58346
Yuri Weinstein [Tue, 14 Mar 2023 14:53:36 +0000 (07:53 -0700)]
Merge pull request #49671 from vshankar/wip-58346

pacific: mds: md_log_replay thread blocks waiting to be woken up

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agomgr/dashboard: force TLS 1.3 50527/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 agomgr/cephadm: be aware of host's shortname and FQDN 50516/head
Adam King [Wed, 15 Feb 2023 22:07:09 +0000 (17:07 -0500)]
mgr/cephadm: be aware of host's shortname and FQDN

The idea is to gether the shortname and FQDN as part
of gather-facts, and then if we ever try to check if a certain
host is in our internal inventory by hostname, we can check
these other known names. This should avoid issues where
we think a hostname specified by FQDN is not in our
inventory because we know the host by the shortname
or vice versa.

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

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

2 years agomgr/cephadm: don't add mgr into iscsi trusted_ip_list if it's already there 50515/head
Mykola Golub [Thu, 16 Feb 2023 09:33:45 +0000 (11:33 +0200)]
mgr/cephadm: don't add mgr into iscsi trusted_ip_list if it's already there

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

2 years agocephadm: Adding poststop actions and setting TimeoutStartSec to 200s 50514/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)

Conflicts:
src/cephadm/cephadm

2 years agomgr/cephadm: try to avoid pull when getting container image info 50513/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)

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

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)

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

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)

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

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)

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

2 years agoqa/distros: pass --allowerasing --nobest when installing container-tools 50512/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)

Conflicts:
qa/distros/container-hosts/centos_8.stream_container_tools.yaml
qa/distros/container-hosts/centos_8.stream_container_tools.yaml~3011d954986 (qa_distros: pass --allowerasing --nobest when installing container-tools)
qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml
qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml
qa/distros/podman/rhel_8.6_container_tools_3.0.yaml

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)

Conflicts:
src/cephadm/cephadm

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 agomgr/cephadm: fix haproxy nfs backend server ip gathering 50511/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)

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 agoMerge pull request #50243 from cbodley/wip-58767
Yuri Weinstein [Mon, 13 Mar 2023 16:19:19 +0000 (09:19 -0700)]
Merge pull request #50243 from cbodley/wip-58767

pacific: cls/rgw: remove index entry after cancelling last racing delete op

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #50000 from smanjara/wip-57701-pacific
Yuri Weinstein [Mon, 13 Mar 2023 16:18:38 +0000 (09:18 -0700)]
Merge pull request #50000 from smanjara/wip-57701-pacific

pacific: qa/suites/rgw: fix and update tempest and barbican tests

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49841 from k0ste/wip-58553-pacific
Yuri Weinstein [Mon, 13 Mar 2023 16:17:26 +0000 (09:17 -0700)]
Merge pull request #49841 from k0ste/wip-58553-pacific

pacific: rgw/beast: fix interaction between keepalive and 100-continue

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49809 from votdev/issue_58470_empty_tags
Yuri Weinstein [Mon, 13 Mar 2023 16:15:54 +0000 (09:15 -0700)]
Merge pull request #49809 from votdev/issue_58470_empty_tags

pacific: rgw: an empty tagset is allowed by S3

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49682 from adamemerson/wip-58403-pacific
Yuri Weinstein [Mon, 13 Mar 2023 16:14:18 +0000 (09:14 -0700)]
Merge pull request #49682 from adamemerson/wip-58403-pacific

rgw: Backport of issue 57562 to Pacific

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49095 from cfsnyder/wip-55228-pacific
Yuri Weinstein [Mon, 13 Mar 2023 16:13:15 +0000 (09:13 -0700)]
Merge pull request #49095 from cfsnyder/wip-55228-pacific

pacific: rgw: adding BUCKET_REWRITE and OBJECT_REWRITE OPS to

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #50352 from ceph/wip-yuri-pacific-reef-pacific
Yuri Weinstein [Sun, 12 Mar 2023 18:39:03 +0000 (11:39 -0700)]
Merge pull request #50352 from ceph/wip-yuri-pacific-reef-pacific

qa/tests: added pacific client upgrade => reef

Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agoMerge pull request #50478 from zdover23/wip-doc-2023-03-11-backport-50470-to-pacific
Anthony D'Atri [Fri, 10 Mar 2023 21:33:52 +0000 (16:33 -0500)]
Merge pull request #50478 from zdover23/wip-doc-2023-03-11-backport-50470-to-pacific

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

2 years agodoc/index: remove "uniquely" from landing page 50478/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 #50454 from zdover23/wip-doc-2023-03-09-backport-50439-to-pacific
zdover23 [Fri, 10 Mar 2023 08:00:59 +0000 (18:00 +1000)]
Merge pull request #50454 from zdover23/wip-doc-2023-03-09-backport-50439-to-pacific

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

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/rados/operations: Improve wording, capitalization, formatting 50454/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 agoclient: switch to old method to invalidate dcache if euid != 0 49944/head
Xiubo Li [Thu, 20 Oct 2022 04:16:55 +0000 (12:16 +0800)]
client: switch to old method to invalidate dcache if euid != 0

Force to use the old and slow method to invalidate the dcache
if the euid is non-root, or the remount may fail with return
code 1 or 32.

https://tracker.ceph.com/issues/56532
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit b9b25a54414b60f5da841f3d16b2e267b670ec5b)

2 years agoceph_fuse: make it to force invalidating dentries when kernel >=3.18
Xiubo Li [Wed, 19 Oct 2022 08:44:04 +0000 (16:44 +0800)]
ceph_fuse: make it to force invalidating dentries when kernel >=3.18

The remount will fail randomly for unknown reasons. And in certain
circumstance we can reprodce this very easy, which will block our
testing. Make it posible to force to old method to invalidate the
dcache when the "client_try_dentry_invalidate" option is enabled
even kernel version >= 3.18.0

Fixes: https://tracker.ceph.com/issues/56532
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit f9c78fe72f3d7c02e927f71e0fbd841605c42708)

2 years agoceph_fuse: retry the test_dentry_handling if fails
Xiubo Li [Fri, 15 Jul 2022 09:41:43 +0000 (17:41 +0800)]
ceph_fuse: retry the test_dentry_handling if fails

For some unknown reason the remount will fail, we need to retry it
for the test_dentry_handling.

Fixes: https://tracker.ceph.com/issues/56532
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit f6a9bd6a69362527502eba4906e2605f3474007f)

2 years agoclient: rename mds_max_retries_on_remount_failure to client_
Xiubo Li [Fri, 10 Mar 2023 05:46:27 +0000 (13:46 +0800)]
client: rename mds_max_retries_on_remount_failure to client_

mds_max_retries_on_remount_failure option is used by Client.cc only.

Fixed: https://tracker.ceph.com/issues/56532
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit b9edab80f048fee09b82cdd4ec58fa37bd937ded)
Conflicts:
- The options are still old style in pacific

2 years agoMerge pull request #50389 from zdover23/wip-doc-2023-03-06-backport-50386-to-pacific
zdover23 [Thu, 9 Mar 2023 19:59:01 +0000 (05:59 +1000)]
Merge pull request #50389 from zdover23/wip-doc-2023-03-06-backport-50386-to-pacific

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

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #50122 from rhcs-dashboard/wip-57513-pacific
Nizamudeen A [Thu, 9 Mar 2023 05:29:20 +0000 (10:59 +0530)]
Merge pull request #50122 from rhcs-dashboard/wip-57513-pacific

pacific: mgr/dashboard: osd form preselect db/wal device filters

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agoMerge pull request #50436 from zdover23/wip-doc-2023-03-08-backport-49823-to-pacific
Anthony D'Atri [Wed, 8 Mar 2023 12:49:43 +0000 (07:49 -0500)]
Merge pull request #50436 from zdover23/wip-doc-2023-03-08-backport-49823-to-pacific

pacific: doc/install: refine index.rst

2 years agodoc/install: refine index.rst 50436/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 #50433 from zdover23/wip-doc-2023-03-08-backport-50430-to-pacific
zdover23 [Wed, 8 Mar 2023 04:01:15 +0000 (14:01 +1000)]
Merge pull request #50433 from zdover23/wip-doc-2023-03-08-backport-50430-to-pacific

pacific: doc/install: update index.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/install: update index.rst 50433/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 agoMerge pull request #50158 from idryomov/wip-57396-pacific
Ilya Dryomov [Tue, 7 Mar 2023 18:54:36 +0000 (19:54 +0100)]
Merge pull request #50158 from idryomov/wip-57396-pacific

pacific: librbd: Fix local rbd mirror journals growing forever

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agoMerge pull request #50265 from idryomov/wip-58755-pacific
Yuri Weinstein [Tue, 7 Mar 2023 17:06:15 +0000 (09:06 -0800)]
Merge pull request #50265 from idryomov/wip-58755-pacific

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

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
2 years agoMerge pull request #50181 from nbalacha/wip-58764-pacific
Yuri Weinstein [Tue, 7 Mar 2023 17:05:29 +0000 (09:05 -0800)]
Merge pull request #50181 from nbalacha/wip-58764-pacific

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

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #50129 from idryomov/wip-58060-pacific
Yuri Weinstein [Tue, 7 Mar 2023 17:03:57 +0000 (09:03 -0800)]
Merge pull request #50129 from idryomov/wip-58060-pacific

pacific: librbd: avoid EUCLEAN error after "rbd rm" is interrupted

Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #50112 from idryomov/wip-58688-pacific
Yuri Weinstein [Tue, 7 Mar 2023 17:03:25 +0000 (09:03 -0800)]
Merge pull request #50112 from idryomov/wip-58688-pacific

pacific: qa/suites/rbd: fix sporadic "rx-only direction" test failures

Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #49650 from ajarr/wip-58361-pacific
Yuri Weinstein [Tue, 7 Mar 2023 17:02:30 +0000 (09:02 -0800)]
Merge pull request #49650 from ajarr/wip-58361-pacific

pacific: mgr/rbd_support: remove localized schedule option during module startup

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #49413 from idryomov/wip-50461-pacific
Yuri Weinstein [Tue, 7 Mar 2023 17:01:45 +0000 (09:01 -0800)]
Merge pull request #49413 from idryomov/wip-50461-pacific

pacific: librbd/crypto: fix bad return checks from libcryptsetup

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agoMerge pull request #50401 from zdover23/wip-doc-2023-03-07-backport-50398-to-pacific
zdover23 [Mon, 6 Mar 2023 23:13:59 +0000 (09:13 +1000)]
Merge pull request #50401 from zdover23/wip-doc-2023-03-07-backport-50398-to-pacific

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

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/dev: add full stop to sentence in basic-wo 50401/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 #50396 from zdover23/wip-doc-2023-03-06-backport-50382-to-pacific
Anthony D'Atri [Mon, 6 Mar 2023 14:18:16 +0000 (09:18 -0500)]
Merge pull request #50396 from zdover23/wip-doc-2023-03-06-backport-50382-to-pacific

pacific: doc/rgw: fix caption

2 years agodoc/rgw: fix caption 50396/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 50389/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 #50379 from zdover23/wip-doc-2023-03-04-backport-50375-to-pacific
Anthony D'Atri [Fri, 3 Mar 2023 23:04:48 +0000 (18:04 -0500)]
Merge pull request #50379 from zdover23/wip-doc-2023-03-04-backport-50375-to-pacific

pacific: doc/rgw: refine keycloak.rst

2 years agodoc/rgw: refine keycloak.rst 50379/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 agoMerge pull request #50368 from zdover23/wip-doc-2023-03-03-backport-50364-to-pacific
Anthony D'Atri [Fri, 3 Mar 2023 15:55:50 +0000 (10:55 -0500)]
Merge pull request #50368 from zdover23/wip-doc-2023-03-03-backport-50364-to-pacific

pacific: doc/cephadm: Redd up compatibility.rst

2 years agodrive_group: fix limit filter in drive_selection.selector 50371/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 agodoc/cephadm: Redd up compatibility.rst 50368/head
Anthony D'Atri [Fri, 3 Mar 2023 07:44:26 +0000 (02:44 -0500)]
doc/cephadm: Redd up compatibility.rst

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