]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Zac Dover [Mon, 24 Jun 2024 10:32:30 +0000 (20:32 +1000)]
doc/rados: edit troubleshooting-osd.rst
Make minor changes to the "Debugging Slow Requests" section of
doc/rados/troubleshooting/troubleshooting-osd.rst in preparation
for an expansion of this section in response to a reqeust from Joel
Davidow.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
8b211b9c7f9b173bb12028eb7108d13867883d6e )
Zac Dover [Wed, 26 Jun 2024 05:52:22 +0000 (15:52 +1000)]
Merge pull request #58257 from zdover23/wip-doc-2024-06-25-backport-58243-to-squid
squid: doc/rados: credit Prashant for a procedure
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Tue, 25 Jun 2024 04:49:13 +0000 (14:49 +1000)]
doc/rados: credit Prashant for a procedure
Credit Prashant D for creating the stretch-mode workaround procedure for
retrieving the correct size of datacenters.
Follows: https://github.com/ceph/ceph/pull/58109
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
2e777cb4f8bd682b807b97074f930826aa902db9 )
Adam King [Mon, 24 Jun 2024 19:38:50 +0000 (15:38 -0400)]
Merge pull request #57970 from adk3798/squid-replace-pkg_resources-with-importlib
squid: cephadm: use importlib.metadata for querying ceph_iscsi's version
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Mon, 24 Jun 2024 19:37:35 +0000 (15:37 -0400)]
Merge pull request #57400 from adk3798/squid-cephadm-timeout-ignore-refresh-failed
squid: qa/cephadm: ignore CEPHADM_REFRESH_FAILED on timeout test
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Mon, 24 Jun 2024 19:30:56 +0000 (15:30 -0400)]
Merge pull request #57768 from adk3798/wip-65722-squid
squid: cephadm: have agent check for errors before json loading mgr response
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Mon, 24 Jun 2024 19:29:28 +0000 (15:29 -0400)]
Merge pull request #57398 from adk3798/squid-cephadm-ignore-orch-paused
squid: qa/cephadm: ignore CEPHADM_PAUSED on test_orch_cli test
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Mon, 24 Jun 2024 18:55:03 +0000 (14:55 -0400)]
Merge pull request #57187 from adk3798/squid-stray-laundry
squid: qa/cephadm: ignore stray daemon warning during rados_api_tests
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Mon, 24 Jun 2024 12:43:23 +0000 (08:43 -0400)]
Merge pull request #57770 from adk3798/wip-65948-squid
squid: mgr/pybind/object_format: fix json-pretty being marked invalid
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Mon, 24 Jun 2024 12:41:52 +0000 (08:41 -0400)]
Merge pull request #57516 from adk3798/wip-65958-squid
squid: mgr/cephadm: update default NVMEoF container image version
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Zac Dover [Mon, 24 Jun 2024 00:31:52 +0000 (10:31 +1000)]
Merge pull request #58202 from zdover23/wip-doc-2024-06-23-backport-58200-to-squid
squid: doc/start: add links to Beginner's Guide
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Sat, 22 Jun 2024 06:28:12 +0000 (16:28 +1000)]
doc/start: add links to Beginner's Guide
Add two links to Sage Weil's overview talks about Ceph.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
785020f212504cdbf374e0d3ca843fd92309de98 )
Zac Dover [Sat, 22 Jun 2024 06:23:55 +0000 (16:23 +1000)]
Merge pull request #57936 from zdover23/wip-doc-2024-06-08-backport-57923-to-squid
squid: doc/src: add inline literals (``) to variables
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Sat, 22 Jun 2024 06:22:14 +0000 (16:22 +1000)]
Merge pull request #58181 from zdover23/wip-doc-2024-06-21-backport-58109-to-squid
squid: doc/rados: add stretch_rule workaround
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Sat, 22 Jun 2024 06:20:19 +0000 (16:20 +1000)]
Merge pull request #58161 from zdover23/wip-doc-2024-06-20-backport-57156-to-squid
squid: doc/rados: followup to PR#58057
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Sat, 22 Jun 2024 06:13:22 +0000 (16:13 +1000)]
Merge pull request #58189 from zdover23/wip-doc-2024-06-21-backport-55675-to-squid
squid: doc/src: invadvisable is not a word
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Ilya Dryomov [Fri, 21 Jun 2024 21:11:24 +0000 (23:11 +0200)]
Merge pull request #58187 from zdover23/wip-doc-2024-06-21-backport-58112-to-squid
squid: doc/rbd: fix typos in NVMe-oF docs.
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Ilya Dryomov [Fri, 21 Jun 2024 16:00:27 +0000 (18:00 +0200)]
Merge pull request #58171 from idryomov/wip-qemu-task-version-squid
squid: qa/tasks/qemu: Fix OS version comparison
Reviewed-by: Ramana Raja <rraja@redhat.com>
Doug Whitfield [Tue, 20 Feb 2024 21:13:14 +0000 (15:13 -0600)]
doc/src: invadvisable is not a word
changed to inadvisable on line 4997
Signed-off-by: Doug Whitfield <douglasawh@gmail.com>
(cherry picked from commit
fb4a5d09e11b75a2f38c42c489af7e6f148916a7 )
N Balachandran [Tue, 18 Jun 2024 10:39:51 +0000 (16:09 +0530)]
doc/rbd: fix typos in NVMe-oF docs.
Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit
0cd415c53b49b2e9168df488340dab91d4c6badc )
Zac Dover [Tue, 18 Jun 2024 05:22:41 +0000 (15:22 +1000)]
doc/rados: add stretch_rule workaround
Add a method for defining a CRUSH rule that returns the actual value of
the total available size.
Fixes: https://tracker.ceph.com/issues/56650
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
007385a3ef05bd92e006fc7d6aba3fbb51792ef7 )
Ilya Dryomov [Thu, 20 Jun 2024 17:21:09 +0000 (19:21 +0200)]
Merge pull request #57990 from idryomov/wip-66359-squid
squid: pybind/rbd: parse access and modify timestamps in UTC
Reviewed-by: Ramana Raja <rraja@redhat.com>
Adam King [Thu, 20 Jun 2024 16:45:18 +0000 (12:45 -0400)]
Merge pull request #58098 from adk3798/wip-66452-squid
squid: cephadm: _extract_host_info_from_*() refactor
Reviewed-by: John Mulligan <jmulligan@redhat.com
Adam King [Thu, 20 Jun 2024 16:44:22 +0000 (12:44 -0400)]
Merge pull request #58096 from adk3798/wip-66429-squid
squid: mgr/cephadm: make SMB and NVMEoF upgrade last in staggered upgrade
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:43:08 +0000 (12:43 -0400)]
Merge pull request #58095 from adk3798/wip-66427-squid
squid: cephadm: CephExporter doesn't bind to IPv6 in dual stack
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:42:29 +0000 (12:42 -0400)]
Merge pull request #57972 from adk3798/squid-keepalive-security-context
squid: cephadm/services/ingress: configure security user in keepalived template
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:33:02 +0000 (12:33 -0400)]
Merge pull request #57773 from adk3798/wip-65968-squid
squid: mgr/cephadm: make setting --cgroups=split configurable for adopted daemons
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:31:35 +0000 (12:31 -0400)]
Merge pull request #57772 from adk3798/wip-65955-squid
squid: mgr/cephadm: Fix unfound progress events
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:18:05 +0000 (12:18 -0400)]
Merge pull request #57771 from adk3798/wip-65953-squid
squid: qa/tasks/cephadm: fix pulling containers from private registries
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:16:53 +0000 (12:16 -0400)]
Merge pull request #57769 from adk3798/wip-65724-squid
squid: python-common: handle "anonymous_access: false" in to_json of Grafana spec
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:15:28 +0000 (12:15 -0400)]
Merge pull request #57517 from adk3798/wip-65951-squid
squid: mgr/cephadm: cleanup iscsi and nvmeof keyrings upon daemon removal
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:13:58 +0000 (12:13 -0400)]
Merge pull request #57411 from adk3798/squid-cephadm-ignore-stray-on-upgrade
squid: qa/cephadm: ignore CEPHADM_STRAY_DAEMON in upgrade tests
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:11:54 +0000 (12:11 -0400)]
Merge pull request #57397 from adk3798/squid-no-stray-recent-removal
squid: mgr/cephadm: don't mark daemons created/removed in the last minute as stray
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:11:10 +0000 (12:11 -0400)]
Merge pull request #57396 from adk3798/squid-autotune-testing
squid: mgr/cephadm: additional debug logging for autotuner
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:10:19 +0000 (12:10 -0400)]
Merge pull request #57233 from adk3798/wip-65762-squid
squid: mgr/cephadm: set OSD cap for NVMEoF daemon to "profile rbd"
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:08:30 +0000 (12:08 -0400)]
Merge pull request #57186 from adk3798/squid-service-size-cleanup
squid: mgr/cephadm: cleanup service size logic block
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Thu, 20 Jun 2024 16:07:59 +0000 (12:07 -0400)]
Merge pull request #57185 from adk3798/squid-cephadm-apply-spec-file
squid: cephadm: check if file exists when passing `--apply_spec`
Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
Adam King [Thu, 20 Jun 2024 16:07:14 +0000 (12:07 -0400)]
Merge pull request #57184 from adk3798/squid-bootstrap-custom-alerts
squid: cephadm: allow passing custom prometheus alerts to bootstrap
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Zack Cerza [Fri, 14 Jun 2024 19:37:16 +0000 (13:37 -0600)]
qa/tasks/qemu: Fix OS version comparison
See: https://sentry.ceph.com/share/issue/
21ed88d705854238bdafbf6711e795ee /
They're strings, not floats.
This surfaced as a result of https://github.com/ceph/teuthology/pull/1953
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
260a45a03148ba4d2bbfcac9485bcf9a8743cade )
Zac Dover [Thu, 20 Jun 2024 13:48:42 +0000 (23:48 +1000)]
Merge pull request #58130 from zdover23/wip-doc-2024-06-19-backport-58123-to-squid
squid: doc: clarify availability vs integrity
Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Zac Dover [Thu, 20 Jun 2024 11:43:53 +0000 (21:43 +1000)]
doc/rados: followup to PR#58057
Incorporate Anthony D'Atri's suggestions in
https://github.com/ceph/ceph/pull/58057
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
2e999a26ef2d3c12d81bd54c187a6225a5fcd7a6 )
Ilya Dryomov [Wed, 5 Jun 2024 06:36:12 +0000 (08:36 +0200)]
pybind/rbd: parse access and modify timestamps in UTC
It appears that commits
08cee16d0a4b ("pybind/rbd: always parse
timestamps in UTC") and
809c5430c292 ("librbd: add image access/last
modified timestamps") raced with each other and we ended up with two
more timezone-dependent timestamps.
Fixes: https://tracker.ceph.com/issues/66359
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
fafa911b51199f61d0c97bc6dfc71d4f65134db4 )
Ilya Dryomov [Tue, 4 Jun 2024 19:37:49 +0000 (21:37 +0200)]
test/pybind/rbd: make timestamp tests meaningful
The existing asserts don't really test anything, with some of them
being for inequality against a literal of a mismatching type. As
a result, a bug in access_timestamp() and modify_timestamp() went
unnoticed for years.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
a1b6ca863a384fe32e750b9ee8f10688f88dd1e3 )
Ilya Dryomov [Tue, 4 Jun 2024 19:19:40 +0000 (21:19 +0200)]
test/pybind/rbd: fix tests that compare strings with b''
assert_not_equal(b'', self.image.id()) is bogus because Image::id()
returns a string (str), not bytes. If the types don't match, values
are guaranteed to not match.
The same goes for Image::block_name_prefix().
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
05f7e4f2025c435dca8ae0b34f65425afbc212b5 )
Ilya Dryomov [Thu, 20 Jun 2024 10:49:27 +0000 (12:49 +0200)]
Merge pull request #57571 from idryomov/wip-65813-squid
squid: librbd: don't crash on a zero-length read if buffer is NULL
Ilya Dryomov [Thu, 20 Jun 2024 10:48:34 +0000 (12:48 +0200)]
Merge pull request #57602 from ajarr/wip-66117-squid
squid: librbd: create rbd_trash object during pool initialization and namespace creation
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Ilya Dryomov [Thu, 20 Jun 2024 10:47:10 +0000 (12:47 +0200)]
Merge pull request #57766 from idryomov/wip-66232-squid
squid: qa/suites/rbd: override extra_system_packages directly on install task
Reviewed-by: Ramana Raja <rraja@redhat.com>
Ilya Dryomov [Thu, 20 Jun 2024 10:44:10 +0000 (12:44 +0200)]
Merge pull request #58044 from idryomov/wip-64662-squid
squid: librbd: allow cloning from non-user snapshots
Reviewed-by: Ramana Raja <rraja@redhat.com>
Guillaume Abrioux [Thu, 20 Jun 2024 07:26:12 +0000 (09:26 +0200)]
Merge pull request #56883 from guits/wip-65480-squid
squid: ceph-volume: osd objectstore refactor
Avan [Thu, 20 Jun 2024 06:15:00 +0000 (11:45 +0530)]
Merge pull request #56931 from adk3798/wip-65515-squid
squid: mgr/dashboard: fix duplicate grafana panels when on mgr failover
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Laura Flores [Wed, 19 Jun 2024 16:48:23 +0000 (11:48 -0500)]
Merge pull request #58122 from ljflores/wip-66554-squid
squid: qa/rados: don't pass --max_attr_len to ceph_test_rados unconditionally
Adam King [Tue, 30 Apr 2024 18:17:58 +0000 (14:17 -0400)]
python-common/service_spec: fix some mypy complaints
The python/mypy combination on the jenkins nodes the CI
is running on don't seem to care, but locally I get
mypy: commands[0]> mypy --config-file=../mypy.ini -p ceph
ceph/deployment/service_spec.py: note: In member "validate" of class "NvmeofServiceSpec":
ceph/deployment/service_spec.py:1497: error: Unsupported operand types for > ("float" and "None") [operator]
ceph/deployment/service_spec.py:1497: note: Left operand is of type "Optional[float]"
ceph/deployment/service_spec.py:1500: error: Unsupported operand types for > ("int" and "None") [operator]
ceph/deployment/service_spec.py:1500: note: Left operand is of type "Optional[int]"
ceph/deployment/service_spec.py:1503: error: Unsupported operand types for > ("int" and "None") [operator]
ceph/deployment/service_spec.py:1503: note: Left operand is of type "Optional[int]"
ceph/deployment/service_spec.py:1506: error: Unsupported operand types for > ("int" and "None") [operator]
ceph/deployment/service_spec.py:1506: note: Left operand is of type "Optional[int]"
ceph/deployment/service_spec.py:1509: error: Unsupported operand types for > ("int" and "None") [operator]
ceph/deployment/service_spec.py:1509: note: Left operand is of type "Optional[int]"
ceph/deployment/service_spec.py:1512: error: Unsupported operand types for > ("int" and "None") [operator]
ceph/deployment/service_spec.py:1512: note: Left operand is of type "Optional[int]"
ceph/deployment/service_spec.py:1515: error: Unsupported operand types for > ("float" and "None") [operator]
ceph/deployment/service_spec.py:1515: note: Left operand is of type "Optional[float]"
ceph/deployment/service_spec.py:1518: error: Unsupported operand types for > ("int" and "None") [operator]
ceph/deployment/service_spec.py:1518: note: Left operand is of type "Optional[int]"
ceph/deployment/service_spec.py:1521: error: Unsupported operand types for > ("int" and "None") [operator]
ceph/deployment/service_spec.py:1521: note: Left operand is of type "Optional[int]"
ceph/deployment/service_spec.py:1524: error: Unsupported operand types for > ("int" and "None") [operator]
ceph/deployment/service_spec.py:1524: note: Left operand is of type "Optional[int]"
ceph/deployment/service_spec.py:1527: error: Unsupported operand types for > ("int" and "None") [operator]
ceph/deployment/service_spec.py:1527: note: Left operand is of type "Optional[int]"
ceph/deployment/service_spec.py:1530: error: Unsupported operand types for > ("float" and "None") [operator]
ceph/deployment/service_spec.py:1530: note: Left operand is of type "Optional[float]"
Found 12 errors in 1 file (checked 27 source files)
The errors make sense to me, so I think we should fix them
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
7520f65f261c61d01dd75b9722c84147229d9e87 )
Adam King [Tue, 30 Apr 2024 18:08:09 +0000 (14:08 -0400)]
mgr/cephadm: update default NVMEoF container image version
Otherwise the nvmeof daemon fails to start up
i148-njpgei[69585]: Traceback (most recent call last):
i148-njpgei[69585]: File "/usr/lib64/python3.9/runpy.py", line 197, in _run_module_as_main
i148-njpgei[69585]: return _run_code(code, main_globals, None,
i148-njpgei[69585]: File "/usr/lib64/python3.9/runpy.py", line 87, in _run_code
i148-njpgei[69585]: exec(code, run_globals)
i148-njpgei[69585]: File "/src/control/__main__.py", line 43, in <module>
i148-njpgei[69585]: gateway.serve()
i148-njpgei[69585]: File "/src/control/server.py", line 177, in serve
i148-njpgei[69585]: omap_lock = OmapLock(omap_state, gateway_state)
i148-njpgei[69585]: File "/src/control/state.py", line 201, in __init__
i148-njpgei[69585]: self.omap_file_lock_retry_sleep_interval = self.omap_state.config.getint_with_default("gateway",
i148-njpgei[69585]: File "/src/control/config.py", line 47, in getint_with_default
i148-njpgei[69585]: return self.config.getint(section, param, fallback=value)
i148-njpgei[69585]: File "/usr/lib64/python3.9/configparser.py", line 818, in getint
i148-njpgei[69585]: return self._get_conv(section, option, int, raw=raw, vars=vars,
i148-njpgei[69585]: File "/usr/lib64/python3.9/configparser.py", line 808, in _get_conv
i148-njpgei[69585]: return self._get(section, conv, option, raw=raw, vars=vars,
i148-njpgei[69585]: File "/usr/lib64/python3.9/configparser.py", line 803, in _get
i148-njpgei[69585]: return conv(self.get(section, option, **kwargs))
i148-njpgei[69585]: ValueError: invalid literal for int() with base 10: '1.0'
I've been told 1.2.5 has a patch that allows this value to be a float
Fixes: https://tracker.ceph.com/issues/65718
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
0cebec2888d309e3c727ec2547692f680f3896af )
Ilya Dryomov [Wed, 19 Jun 2024 12:03:34 +0000 (14:03 +0200)]
Merge pull request #58127 from petrutlucian94/wip-66547-squid
squid: ceph_test_rados_api_misc: adjust LibRadosMiscConnectFailure.ConnectTimeout timeout
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Zac Dover [Wed, 19 Jun 2024 10:23:55 +0000 (20:23 +1000)]
Merge pull request #58116 from zdover23/wip-doc-2024-06-18-backport-57352-to-squid
squid: doc/dev/crimson: CPU cores allocation
Reviewed-by: Matan Breizman <mbreizma@redhat.com>
Zac Dover [Wed, 19 Jun 2024 10:21:52 +0000 (20:21 +1000)]
Merge pull request #58105 from zdover23/wip-doc-2024-06-18-backport-58901-to-squid
squid: doc/dev: link to ceph.io leads list
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Matan Breizman [Wed, 19 Jun 2024 10:15:04 +0000 (13:15 +0300)]
Merge pull request #58067 from Matan-B/wip-57788-squid
squid: crimson/os/seastore: implement disk and writer level stats reporting
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Wed, 19 Jun 2024 10:14:44 +0000 (13:14 +0300)]
Merge pull request #58066 from Matan-B/wip-57654-squid
squid: crimson/os/seastore: fix compile error in release build
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Wed, 19 Jun 2024 10:14:22 +0000 (13:14 +0300)]
Merge pull request #58032 from Matan-B/wip-57279-squid
squid: crimson/osd/pg: trigger wait_for_active_blocker on replica osds when the activate event is committed
Reviewed-by: Samuel Just <sjust@redhat.com>
Gregory O'Neill [Tue, 18 Jun 2024 21:17:00 +0000 (17:17 -0400)]
doc: clarify availability vs integrity
(cherry picked from commit
3888cf77075eceb079b1d5a8ce19092d12fd82bd )
Lucian Petrut [Mon, 17 Jun 2024 18:37:11 +0000 (18:37 +0000)]
ceph_test_rados_api_misc: adjust LibRadosMiscConnectFailure.ConnectTimeout timeout
The test sets a 2 second connection timeout and asserts that the
attempt takes less than 4 seconds.
Under load, the asserted timeout can be exceeded. In particular,
this affects the Windows CI job, which uses a VM with a reduced
amount of resources.
[ RUN ] LibRadosMiscConnectFailure.ConnectTimeout
/home/ubuntu/ceph/src/test/librados/misc.cc:87: Failure
Expected: (dur) < (utime_t(4, 0)), actual: 5.987712 vs 4.000000
We'll adjust the timeouts, using a 5s configured timeout, asserting
that the connection attempt doesn't take more than 15s.
Fixes: https://tracker.ceph.com/issues/66534
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit
3a2b4a58898477ae9f62b506bd5be56ff9abacf0 )
Radosław Zarzyński [Mon, 3 Jun 2024 22:00:38 +0000 (00:00 +0200)]
qa/rados: don't pass --max_attr_len to ceph_test_rados unconditionally
Fixes: https://tracker.ceph.com/issues/66321
Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit
8a6d56e62fc03062e60828a3bc9f37ed7232b3e7 )
Matan Breizman [Wed, 8 May 2024 08:23:30 +0000 (11:23 +0300)]
doc/dev/crimson: CPU cores allocation
CPU cores allocation and
add crimson-smp vstart flag
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit
35d257bfaa5ed7cf91c8a8b523ed4494fdd27667 )
Matan Breizman [Tue, 18 Jun 2024 10:53:44 +0000 (13:53 +0300)]
Merge pull request #58093 from Matan-B/wip-55831-squid
squid: crimson/os/seastore: lba pointer consolidation
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Tue, 18 Jun 2024 10:52:04 +0000 (13:52 +0300)]
Merge pull request #58065 from Matan-B/wip-57383-squid
squid: crimson: fix user_version handling
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Tue, 18 Jun 2024 10:49:38 +0000 (13:49 +0300)]
Merge pull request #58030 from Matan-B/wip-57561-squid
squid: crimson/osd/ops_executer: LIST_SNAPS only on CEPH_SNAPDIR
Reviewed-by: Samuel Just <sjust@redhat.com>
Pedro Gonzalez Gomez [Tue, 18 Jun 2024 10:16:28 +0000 (12:16 +0200)]
Merge pull request #57862 from rhcs-dashboard/wip-66345-squid
squid: mgr/dashboard: add smb service management support
Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Pedro Gonzalez Gomez [Tue, 18 Jun 2024 10:16:05 +0000 (12:16 +0200)]
Merge pull request #57861 from rhcs-dashboard/wip-66037-squid
squid: mgr/dashboard: add upgrade notification
Samuel Just [Thu, 9 May 2024 03:06:58 +0000 (20:06 -0700)]
crimson/osd: remove osd_op_params_t::user_at_version
osd_op_params_t::user_at_version was populated from
osd_op_params_t::at_version before the call to prepare_transaction,
which incremented osd_op_params_t::at_version.version. As a result,
the value stored in object_info_t::user_version ended up one version
behind object_info_t::version. The log entry, on the other hand,
ended up with the correct version as OpsExecutor::prepare_transaction
populates it directly from at_version. As a result, the primary could
return different versions to the client depending on whether the IO was
already in the log.
This commit eliminates osd_op_params_t::user_at_version and updates
PGBackend::mutate_object to behave like prepare_transaction. Because
the prior commit removes the prepare_transaction increment, this isn't
strictly necessary, but it is simpler.
Fixes: https://tracker.ceph.com/issues/65857
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
85fdadab2adcfbec83a82c6f1bae1f4f31a96f54 )
Samuel Just [Thu, 9 May 2024 03:39:18 +0000 (20:39 -0700)]
crimson/osd/ops_executor: only increment osd_op_params_t::at_version for clone
Previously, we incremented prior to usage in both prepare_transaction
and execute_clone. Because at_version is initialized from
PG::get_next_version(), this results in log entries skipping
values. Instead, only increment after populating clone
object_info.
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
7e0dde721d5203623b06351bb4b261b3c9fe2c33 )
Samuel Just [Thu, 9 May 2024 03:01:49 +0000 (20:01 -0700)]
crimson/osd/ops_executor: use clone oi values in log entry
The fields from the clone_obc oi are what we're actually
trying to fill in here -- we might as well use them
directly.
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
207e5a6e9ba54deb2fb18d5a5ad432d42072453d )
Samuel Just [Thu, 9 May 2024 02:45:45 +0000 (02:45 +0000)]
crimson/osd/ops_executor: update osd_op_params_t::at_version in execute_clone
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
1ecf3d64853c2fa92bf467692b98a58b4670b212 )
Samuel Just [Thu, 9 May 2024 02:31:35 +0000 (19:31 -0700)]
crimson/osd/pg: remove slightly confusing assert from PG::submit_transaction
This assert should always hold, so it's not wrong. However,
osd_op_p.at_version is chosen during transaction construction time
using the current epoch via PG::get_next_version. Asserting it here
is more confusing than helpful.
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
7a04f6230d9376d155ac92a6c3bf1ab5eeca644f )
Samuel Just [Thu, 9 May 2024 02:27:59 +0000 (19:27 -0700)]
crimson/osd/pg_backend: remove uninformative #if 0 block
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
2bd7c38381bc22bc73130e6d138e001096e66faf )
Matan Breizman [Tue, 18 Jun 2024 07:13:12 +0000 (10:13 +0300)]
Merge pull request #58064 from Matan-B/wip-57056-squid
squid: crimson/osd: make osd_op_params::at_version coherent with last log entry
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Tue, 18 Jun 2024 07:11:41 +0000 (10:11 +0300)]
Merge pull request #58063 from Matan-B/wip-57245-squid
squid: qa/config/crimson_qa_overrides: adjust mgr_stats_period
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Tue, 18 Jun 2024 07:10:38 +0000 (10:10 +0300)]
Merge pull request #58024 from Matan-B/wip-57251-squid
squid: crimson/osd/pg_backend: only create new onode when it doesn't exist
Reviewed-by: Samuel Just <sjust@redhat.com>
Guillaume Abrioux [Tue, 18 Jun 2024 06:40:27 +0000 (08:40 +0200)]
Merge pull request #57471 from guits/wip-66021-squid
squid: ceph-volume: use os.makedirs for mkdir_p
Guillaume Abrioux [Tue, 18 Jun 2024 06:39:55 +0000 (08:39 +0200)]
Merge pull request #57473 from guits/wip-66023-squid
squid: cephadm: change loki/promtail default image tags
Guillaume Abrioux [Tue, 18 Jun 2024 06:38:17 +0000 (08:38 +0200)]
Merge pull request #58004 from zdover23/wip-doc-2024-06-13-backport-57650-to-squid
squid: ceph-volume: use importlib from stdlib on Python 3.8 and up
Zac Dover [Mon, 17 Jun 2024 14:39:10 +0000 (00:39 +1000)]
doc/dev: link to ceph.io leads list
Remove the docs.ceph.com list of team leads, and link to the list of
leads on ceph.io.
Fixes: https://tracker.ceph.com/issues/66392
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
5134aeb78bb1d9d956442333ad372e1f397ff7b3 )
Guillaume Abrioux [Tue, 21 May 2024 09:08:29 +0000 (05:08 -0400)]
cephadm: _extract_host_info_from_*() refactor
The current implementation doesn't take into account the format is Yaml
This can lead to issue when oob details are passed to host service spec.
For instance, with the following host spec:
```
---
service_type: host
addr: 1.2.3.4
hostname: node1
oob:
username: root
password: passw0rd
addr: 127.0.0.1
```
it is converted to a list like the following:
```
['service_type: host', 'addr: 1.2.3.4', 'hostname: node1',
'oob:', 'username: root', 'password: passw0rd', 'addr: 127.0.0.1']
```
It was (probably) assumed that the pattern `addr:` would be present only
once. With the introduction of node-proxy, this isn't true anymore.
Now that the cephadm binary can embed some external libraries we can leverage pyyaml.
The idea is to use proper yaml format instead so it is easier to process the data.
Fixes: https://tracker.ceph.com/issues/66165
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit
f4ddb2750eb04d7563356a41c7433a3c5d6ded57 )
Adam King [Thu, 2 May 2024 17:35:41 +0000 (13:35 -0400)]
mgr/cephadm: make SMB and NVMEoF upgrade last in staggered upgrade
This needs to happen as some work on the NVMEoF side (still unmerged
as of writing this) will make the NVMEoF daemon dependent on the mon.
Prior to this patch, in a staggered upgrade, all daemons not using the
ceph image were upgraded after the mgr since we typically only care
about the default image changing or potential changes to how we handle
our systemd units which only needs the mgr to be upgraded to be applied.
This NVMEoF dependency on the mon changes this and we can no longer
upgrade it directly after the mgr. This patch changes it so the NVMEoF
daemon is instead upgraded after all ceph image daemons have been
upgraded in a staggered upgrade scenario. Non-staggered upgrades
are unaffected as the NVMEoF daemon was already upgraded near the
end in that scenario. The SMB dameon has no reason it needs to be
upgraded later, but it's in the (small) pool of daemons that don't
use the ceph image and aren't for monitoring, so it's been affected
by this as well.
NOTE: This is a bit of an ugly patch imo and shows that a refactoring
of the upgrade code is likely required. Hopefully this patch is more
of a stopgap until that larger effort can be made
Fixes: https://tracker.ceph.com/issues/65809
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
5e7a3c2147d87c1fc5be71acbadedefb70e024bf )
Mouratidis Theofilos [Fri, 10 May 2024 10:17:12 +0000 (12:17 +0200)]
Fix CephExporter protocol bind logic
In a dual stack configuration ceph-exporter binds to ipv4 only and the metrics fail in ipv6
Signed-off-by: Mouratidis Theofilos <mtheofilos@gmail.com>
(cherry picked from commit
110bc665078fe19c31e3680c4197587e69e4e751 )
Xuehan Xu [Thu, 16 May 2024 01:21:45 +0000 (09:21 +0800)]
crimson/os/seastore/btree: drop FixedKVNode::child_pos_for_key()
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit
bfc2abae90dc0cd2a3a0ef7b62006435b305f51d )
Xuehan Xu [Wed, 15 May 2024 08:15:01 +0000 (16:15 +0800)]
crimson/os/seastore/btree: better UT checks
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit
dca239f84ca1cd0607be337b452673418036d0bc )
Xuehan Xu [Wed, 15 May 2024 07:46:01 +0000 (15:46 +0800)]
crimson/os/seastore/btree: correct lba pointer comments
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit
9bb054b30f66d1b03f0ea6937b08806c4b64f5b6 )
Xuehan Xu [Thu, 29 Feb 2024 06:35:31 +0000 (14:35 +0800)]
crimson/os/seastore/cached_extent: EXIST_MUTATION_PENDING also
considered as mutatione_pending
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit
211ca3792e80c4319a23596a5f439bab886c200f )
Xuehan Xu [Thu, 29 Feb 2024 06:16:37 +0000 (14:16 +0800)]
crimson/os/seastore/cached_extent: adjust
CachedExtent::on_replace_prior()
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit
d4c78f1524bebfa3f370f5a4a019800dfeaf04f1 )
Xuehan Xu [Thu, 29 Feb 2024 06:06:35 +0000 (14:06 +0800)]
crimson/os/seastore/btree: misc consolidations
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit
72d721ad72d15296b069752985f12e173f9690da )
Xuehan Xu [Wed, 28 Feb 2024 10:26:24 +0000 (18:26 +0800)]
crimson/os/seastore/cache: drop unnecessary friend declarations
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit
fecf501c41471e132427f2a40f26298a38ba4003 )
Xuehan Xu [Wed, 28 Feb 2024 09:59:41 +0000 (17:59 +0800)]
crimson/os/seastore/btree: add CachedExtent::on_rewrite() and
CachedExtent::is_rewrite()
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit
1b8a781f665df06b056511debec46deac604a79c )
Xuehan Xu [Wed, 28 Feb 2024 08:00:23 +0000 (16:00 +0800)]
crimson/os/seastore/lba_manager: extents pass to LBALeafNode::update()
must either has a null parent tracker or point to the current leaf node
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit
4b155f3ee5ab4fbd212e117d2cd40dd78d846d3a )
Matan Breizman [Mon, 17 Jun 2024 15:25:09 +0000 (18:25 +0300)]
Merge pull request #58034 from Matan-B/wip-57593-squid
squid: Crimson: Support basic deployments
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Mon, 17 Jun 2024 15:24:18 +0000 (18:24 +0300)]
Merge pull request #58027 from Matan-B/wip-57455-squid
squid: crimson/osd/replicated_backend: no need to set_rollback_to for repops
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Mon, 17 Jun 2024 15:19:33 +0000 (18:19 +0300)]
Merge pull request #58022 from Matan-B/wip-57069-squid
squid: crimson/common/operation: detach blockers from blocking events when they are destroyed
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Mon, 17 Jun 2024 15:18:34 +0000 (18:18 +0300)]
Merge pull request #58015 from Matan-B/wip-57474-squid
squid: crimson/os/seastore/transaction_manager: correct the offset of the data copied from the original extents
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Mon, 17 Jun 2024 15:18:11 +0000 (18:18 +0300)]
Merge pull request #58013 from Matan-B/wip-57432-squid
squid: crimson/os/seastore/object_data_handler: cleanup read()
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Mon, 17 Jun 2024 15:17:24 +0000 (18:17 +0300)]
Merge pull request #58011 from Matan-B/wip-57368-squid
squid: crimson/os/seastore: add is_data_stable() to allow delta-overwrite on EXIST_CLEAN
Reviewed-by: Samuel Just <sjust@redhat.com>
Matan Breizman [Mon, 17 Jun 2024 13:30:13 +0000 (16:30 +0300)]
Merge pull request #58029 from Matan-B/wip-57692-squid
squid: crimson/osd/pg_shard_manager: remove the unnecessary "std::move" call
Reviewed-by: Samuel Just <sjust@redhat.com>