]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agomgr/cephadm: fix custom config unit test 48093/head
Adam King [Thu, 8 Sep 2022 20:13:08 +0000 (16:13 -0400)]
mgr/cephadm: fix custom config unit test

this test needs to be updated to account for the
new keyring information being introduced

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

3 years agomgr/cephadm: execute conf update when rotating secret
Radoslaw Zarzynski [Thu, 18 Aug 2022 11:02:41 +0000 (11:02 +0000)]
mgr/cephadm: execute conf update when rotating secret

This is a fixup for: mgr/cephadm: add daemon 'rotate-key' action

The way we rotate mgr's secret require:

1) writing the new pending-key to mgr's file,
2) restarting the mgr via the `mgr fail` mon command.

Unfortunately, we might be doing the first step wrongly.
`_create_daemoan()` is a coroutine (Python's `async def`)
while we don't `wait` for it. IIUC the underlying doc
correctly, this has no effect, and thus the mgr is restarted
with old key.

  "Note that simply calling a coroutine will not schedule
  it to be executed"

See: https://docs.python.org/3/library/asyncio-task.html#id1

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

3 years agomon/AuthMonitor: don't forget about caps on "auth get".
Radosław Zarzyński [Thu, 24 Mar 2022 14:13:01 +0000 (15:13 +0100)]
mon/AuthMonitor: don't forget about caps on "auth get".

The issue came in 98b89120321059397798170f7ae2bf7c64e4f4b2.

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

3 years agomgr/cephadm: add crash keyring to unit test
Adam King [Tue, 8 Mar 2022 18:05:29 +0000 (13:05 -0500)]
mgr/cephadm: add crash keyring to unit test

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

3 years agoauth: refactor KeyServer::get_used_pending_keys().
Radoslaw Zarzynski [Fri, 4 Mar 2022 15:57:30 +0000 (15:57 +0000)]
auth: refactor KeyServer::get_used_pending_keys().

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

3 years agoceph-crash: ping cluster with key on startup
Sage Weil [Tue, 2 Nov 2021 14:26:49 +0000 (10:26 -0400)]
ceph-crash: ping cluster with key on startup

This is mostly pointless, *except* that after a key rotation it ensures
that the new key is used immediately (and the pending_key is committed by
the mon).

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 84c4562f7bff9ca1018fd1975657144e62d6b93d)

3 years agodoc/cephadm/operations: document 'ceph orch daemon rotate-key'
Sage Weil [Tue, 2 Nov 2021 14:24:06 +0000 (10:24 -0400)]
doc/cephadm/operations: document 'ceph orch daemon rotate-key'

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 772e4265bda8668fe24b9aabb9ad29d3d0baf7bd)

3 years agodoc/cephadm/operations: document daemon commands
Sage Weil [Tue, 2 Nov 2021 14:23:56 +0000 (10:23 -0400)]
doc/cephadm/operations: document daemon commands

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit ae45f1ec37f2f31e289428b4ed0762de0462ecf3)

3 years agoqa/suites/orch/cephadm/with-work: add key rotation test
Sage Weil [Wed, 27 Oct 2021 15:57:46 +0000 (11:57 -0400)]
qa/suites/orch/cephadm/with-work: add key rotation test

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 48f8c8a1c5ca9c70e553db5cb7b3125bc277122b)

3 years agomgr/cephadm: add rotate support for rgw, crash, nfs, rbd-mirror, iscsi
Sage Weil [Mon, 1 Nov 2021 22:03:00 +0000 (18:03 -0400)]
mgr/cephadm: add rotate support for rgw, crash, nfs, rbd-mirror, iscsi

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 4916fd2a31bd136f62c698c693995c7ea25352b5)

3 years agomgr/cephadm: add daemon 'rotate-key' action
Sage Weil [Tue, 26 Oct 2021 17:30:36 +0000 (13:30 -0400)]
mgr/cephadm: add daemon 'rotate-key' action

Caveats:
- only works with osd, mds, mgr so far
- sometimes we have to restart the daemon

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 8ca919f3cf3c0a172e44b90f3c52baae67f021f7)

3 years agomgr/cephadm/service: factor out get_auth_entity()
Sage Weil [Mon, 1 Nov 2021 21:42:42 +0000 (17:42 -0400)]
mgr/cephadm/service: factor out get_auth_entity()

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 2eedae9b3f80cdf6299cb9eac54e05d9895f2ba0)

3 years agomgr/cephadm: log exceptions in daemon actions
Sage Weil [Thu, 28 Oct 2021 21:36:53 +0000 (17:36 -0400)]
mgr/cephadm: log exceptions in daemon actions

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 68abdc21477f876e35fccb18a10956cd891a1e30)

3 years agomon/AuthMonitor: no stderr output on success
Sage Weil [Tue, 26 Oct 2021 16:28:17 +0000 (12:28 -0400)]
mon/AuthMonitor: no stderr output on success

These messages are distracting.

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit b723bd03b6009d9a90e1123f5a8f1bd7cc14a69e)

3 years agoosd: add 'rotate-stored-key' asok command
Sage Weil [Mon, 25 Oct 2021 20:08:31 +0000 (16:08 -0400)]
osd: add 'rotate-stored-key' asok command

This writes the key to the osd_key in the block device label.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 0bf78de1d54adfed5694d98381679000bb07f25a)

3 years agomgr/cephadm: deploy pending_key when possible
Sage Weil [Mon, 25 Oct 2021 20:00:42 +0000 (16:00 -0400)]
mgr/cephadm: deploy pending_key when possible

Also, leave out the caps.

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 34ba1a58bb19fcb5202ac6c36d083de85d339099)

3 years agomgr/cephadm: fix keyring when updating caps
Sage Weil [Mon, 25 Oct 2021 20:00:24 +0000 (16:00 -0400)]
mgr/cephadm: fix keyring when updating caps

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit be9020a9e0155412a909fe1b52c2bdb0b60878a6)

3 years agomon/AuthMonitor: include pending_key in 'auth get-or-create' result
Sage Weil [Mon, 25 Oct 2021 19:59:25 +0000 (15:59 -0400)]
mon/AuthMonitor: include pending_key in 'auth get-or-create' result

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 9fc4dc1f4f7989aedfee3469d54f7a56d77bb637)

3 years agomon/MonClient: add 'rotate-key' asok command
Sage Weil [Mon, 25 Oct 2021 18:26:05 +0000 (14:26 -0400)]
mon/MonClient: add 'rotate-key' asok command

Rotate the live auth key for a running daemon without restarting.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 5cf7944d36190a45ab27aec779593bf47a71be1b)

3 years agocommon/admin_socket: pass inbl to sync call() method
Sage Weil [Sat, 23 Oct 2021 22:32:11 +0000 (17:32 -0500)]
common/admin_socket: pass inbl to sync call() method

Only the async_call got this before.

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 07ad8df2dd74f2fb4bbde6332a04cc5453bff435)

3 years agoqa/workunits/mon/auth_key_rotation.sh: exercise pending key / rotation
Sage Weil [Fri, 22 Oct 2021 20:13:53 +0000 (15:13 -0500)]
qa/workunits/mon/auth_key_rotation.sh: exercise pending key / rotation

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 39da18b31b47db10ee1deae3372699035e8197b1)

3 years agomon: automatically commit used pending_keys
Sage Weil [Fri, 22 Oct 2021 17:22:29 +0000 (12:22 -0500)]
mon: automatically commit used pending_keys

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit c3562e9436cb9ed57186629d16503bb0ba71e9d6)

3 years agoauth: keep track of used pending_keys
Sage Weil [Fri, 22 Oct 2021 17:06:17 +0000 (12:06 -0500)]
auth: keep track of used pending_keys

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit cb8c7f6ef8c605fbb84d04d2be50b0f8c9c98a51)

3 years agomon/AuthMonitor: 'auth {get-or-create,clear,commit}-pending'
Sage Weil [Fri, 22 Oct 2021 16:52:36 +0000 (11:52 -0500)]
mon/AuthMonitor: 'auth {get-or-create,clear,commit}-pending'

Add commands to create, clear, or commit pending_key.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 9ed2162c804a27a04078a08b8385aff77bae5af8)

3 years agoauth/cephx: authenticate with either key or pending_key
Sage Weil [Fri, 22 Oct 2021 16:38:36 +0000 (11:38 -0500)]
auth/cephx: authenticate with either key or pending_key

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d54c49d561fb4f6d14db91887c276e37880752de)

3 years agoauth: add PendingKey to EntityAuth
Sage Weil [Fri, 22 Oct 2021 16:38:20 +0000 (11:38 -0500)]
auth: add PendingKey to EntityAuth

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

3 years agoauth/Crypto: add clear()
Sage Weil [Fri, 22 Oct 2021 19:52:18 +0000 (14:52 -0500)]
auth/Crypto: add clear()

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit fa8ad5568ccfded73d2d6a51f56f27c1bd314d9a)

3 years agoMerge pull request #48061 from zdover23/wip-doc-2022-09-13-backport-47575-to-quincy
zdover23 [Wed, 14 Sep 2022 07:47:22 +0000 (17:47 +1000)]
Merge pull request #48061 from zdover23/wip-doc-2022-09-13-backport-47575-to-quincy

quincy: doc/rados: add prompts to pools.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #48063 from zdover23/wip-doc-2022-09-13-backport-47305-to-quincy
zdover23 [Wed, 14 Sep 2022 03:28:09 +0000 (13:28 +1000)]
Merge pull request #48063 from zdover23/wip-doc-2022-09-13-backport-47305-to-quincy

quincy: doc/monitoring: add min vers of apps in mon stack

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #48047 from aaSharma14/wip-57499-quincy
Nizamudeen A [Tue, 13 Sep 2022 17:10:20 +0000 (22:40 +0530)]
Merge pull request #48047 from aaSharma14/wip-57499-quincy

quincy: mgr/dashboard: fix snapshot creation with duplicate name

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #47660 from adk3798/wip-57098-quincy
Adam King [Tue, 13 Sep 2022 13:38:31 +0000 (09:38 -0400)]
Merge pull request #47660 from adk3798/wip-57098-quincy

quincy: cephadm: support quotes around public/cluster network in config passed to bootstrap

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47949 from adk3798/wip-57397-quincy
Adam King [Tue, 13 Sep 2022 13:37:11 +0000 (09:37 -0400)]
Merge pull request #47949 from adk3798/wip-57397-quincy

quincy: qa/cephadm: remove fsid dir before bootstrap in test_cephadm.sh

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agodoc/monitoring: add min vers of apps in mon stack 48063/head
Zac Dover [Wed, 27 Jul 2022 14:27:42 +0000 (00:27 +1000)]
doc/monitoring: add min vers of apps in mon stack

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

This PR adds recommended versions of grafana and
prometheus and alert manager.

This PR is a second attempt at getting the information
in the following PR into the docs:
https://github.com/ceph/ceph/pull/46000/files

Himadri Maheshwari deserves the credit for the work
in this commit.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
Signed-off-by: Himadri Maheshwari <himadri.maheshwari7915@gmail.com>
(cherry picked from commit 367695f5b09f75ee723d53116e2f4a6e45dd795d)

3 years agodoc/rados: add prompts to pools.rst 48061/head
Zac Dover [Fri, 12 Aug 2022 21:53:21 +0000 (07:53 +1000)]
doc/rados: add prompts to pools.rst

This commit adds ".. prompt:: bash $"-style prompts to pools.rst.
This brings this file up to the standard established in 2020 when
Kefu added support for the ".. prompt::" directive.

This commit is a part of an initiative to modernize the presentation
of all BASH commands in the RADOS documentation.

The progress of this project can be tracked here:
https://tracker.ceph.com/issues/57108

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

3 years agoMerge pull request #47954 from adk3798/quincy-tp-no-overwrite-doc2
Adam King [Mon, 12 Sep 2022 19:40:29 +0000 (15:40 -0400)]
Merge pull request #47954 from adk3798/quincy-tp-no-overwrite-doc2

quincy: doc/cephadm: add info about --no-overwrite to note about tuned-profiles

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agoMerge pull request #47324 from zdover23/wip-doc-2022-07-28-backport-46024-to-quincy
zdover23 [Mon, 12 Sep 2022 16:29:40 +0000 (02:29 +1000)]
Merge pull request #47324 from zdover23/wip-doc-2022-07-28-backport-46024-to-quincy

quincy: doc/radosgw/STS: sts_key and user capabilities

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agomgr/dashboard: fix snapshot creation with duplicate name 48047/head
Aashish Sharma [Mon, 5 Sep 2022 11:59:11 +0000 (17:29 +0530)]
mgr/dashboard: fix snapshot creation with duplicate name

Snapshot creation with same name on UI throwing 500 Internal Error, This PR intends to fix this issue.

Fixes: https://tracker.ceph.com/issues/57456
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 2ae1bca1d9c7a771be0fa9481bef2622ffd7cc45)

3 years agoMerge pull request #47945 from adk3798/wip-57425-quincy
Adam King [Sun, 11 Sep 2022 21:55:52 +0000 (17:55 -0400)]
Merge pull request #47945 from adk3798/wip-57425-quincy

quincy: cephadm: Fix disk size calculation

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #48019 from rzarzynski/wip-doc-dups-trimming-relnotes-quincy
Neha Ojha [Fri, 9 Sep 2022 22:43:38 +0000 (15:43 -0700)]
Merge pull request #48019 from rzarzynski/wip-doc-dups-trimming-relnotes-quincy

quincy: PendingReleaseNotes: document online and offline trimming of PG Log's…

Reviewed-By: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #47930 from rzarzynski/wip-56723-quincy
Laura Flores [Fri, 9 Sep 2022 21:26:50 +0000 (16:26 -0500)]
Merge pull request #47930 from rzarzynski/wip-56723-quincy

quincy: msg: fix deadlock when handling existing but closed v2 connection

3 years agoMerge pull request #47929 from rzarzynski/wip-56655-quincy
Laura Flores [Fri, 9 Sep 2022 21:18:11 +0000 (16:18 -0500)]
Merge pull request #47929 from rzarzynski/wip-56655-quincy

quincy: osd: return ENOENT if pool information is invalid during tier-flush

3 years agoMerge pull request #48013 from mchangir/wip-56541-quincy
Yuri Weinstein [Fri, 9 Sep 2022 20:46:25 +0000 (13:46 -0700)]
Merge pull request #48013 from mchangir/wip-56541-quincy

quincy: mgr/snap_schedule: Use rados.Ioctx.remove_object() instead of remove().

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #47971 from vshankar/tr-55930
Yuri Weinstein [Fri, 9 Sep 2022 20:45:38 +0000 (13:45 -0700)]
Merge pull request #47971 from vshankar/tr-55930

quincy: client: allow overwrites to file with size greater than the max_file_size

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #48016 from idryomov/wip-ntstatus-quincy
Yuri Weinstein [Fri, 9 Sep 2022 18:53:28 +0000 (11:53 -0700)]
Merge pull request #48016 from idryomov/wip-ntstatus-quincy

quincy: common/win32,dokan: include bcrypt.h for NTSTATUS

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
3 years agoMerge pull request #47931 from rzarzynski/wip-57257-quincy
Yuri Weinstein [Fri, 9 Sep 2022 18:50:40 +0000 (11:50 -0700)]
Merge pull request #47931 from rzarzynski/wip-57257-quincy

quincy:  msg: reset ProtocolV2's frame assembler in appropriate thread

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #47977 from neesingh-rh/wip-57440-quincy
Yuri Weinstein [Fri, 9 Sep 2022 13:33:45 +0000 (06:33 -0700)]
Merge pull request #47977 from neesingh-rh/wip-57440-quincy

quincy: cephfs-top: display average read/write/metadata latency

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #47658 from adk3798/wip-57149-quincy
Adam King [Fri, 9 Sep 2022 13:28:26 +0000 (09:28 -0400)]
Merge pull request #47658 from adk3798/wip-57149-quincy

quincy: mgr/cephadm: set dashboard grafana-api-password when user provides one

Reviewed-by: John Mulligan <jmulligan@redhat.com>
3 years agoMerge pull request #48025 from rhcs-dashboard/wip-57484-quincy
Nizamudeen A [Fri, 9 Sep 2022 11:26:55 +0000 (16:56 +0530)]
Merge pull request #48025 from rhcs-dashboard/wip-57484-quincy

quincy: mgr/dashboard: fix unmanaged service creation

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
3 years agoMerge pull request #48023 from idryomov/wip-57116-cont-quincy
Ilya Dryomov [Fri, 9 Sep 2022 06:37:55 +0000 (08:37 +0200)]
Merge pull request #48023 from idryomov/wip-57116-cont-quincy

quincy: test/{librbd, rgw}: increase delay between and number of bind attempts

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agomgr/dashboard: fix unmanaged snmp service creation 48025/head
Nizamudeen A [Wed, 24 Aug 2022 10:16:54 +0000 (15:46 +0530)]
mgr/dashboard: fix unmanaged snmp service creation

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

3 years agomgr/dashboard: fix unmanged iscsi service creation
Nizamudeen A [Wed, 24 Aug 2022 10:16:10 +0000 (15:46 +0530)]
mgr/dashboard: fix unmanged iscsi service creation

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

3 years agomgr/dashboard: fix unable to create ingress unmanaged
Nizamudeen A [Wed, 24 Aug 2022 07:47:50 +0000 (13:17 +0530)]
mgr/dashboard: fix unable to create ingress unmanaged

the following snipped is the error from backend

```
 File "/lib/python3.6/site-packages/ceph/deployment/service_spec.py", line 698, in _from_json_impl
                                                  _cls.validate()
                                                File "/lib/python3.6/site-packages/ceph/deployment/service_spec.py", line 1058, in validate
                                                  'Cannot add ingress: No frontend_port specified')
                                              ceph.deployment.hostspec.SpecValidationError: Cannot add ingress: No frontend_port specified
```

It looks like even if we set unmanaged flag, we need to input the
backend_service, frontend_port, monitor_port and virtual_ip, because there is a
validation going for that in the backend.

https://github.com/ceph/ceph/blob/main/src/python-common/ceph/deployment/service_spec.py#L1050

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

3 years agoMerge pull request #47961 from rhcs-dashboard/wip-57436-quincy
Nizamudeen A [Fri, 9 Sep 2022 04:41:23 +0000 (10:11 +0530)]
Merge pull request #47961 from rhcs-dashboard/wip-57436-quincy

quincy: mgr/dashboard: fix nfs exports form issues with squash field

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
3 years agotest/{librbd, rgw}: increase delay between and number of bind attempts 48023/head
Ilya Dryomov [Thu, 8 Sep 2022 09:36:34 +0000 (11:36 +0200)]
test/{librbd, rgw}: increase delay between and number of bind attempts

Commit aa7885f7cc41 ("test/{librbd, rgw}: retry when bind fail with
port 0") reduced the frequency of sporadic unit test failures caused
by EADDRINUSE a lot, but not entirely.

Currently, it yields a cumulative sleep of ~9 seconds.  Let's increase
that to 1 minute.

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

3 years agoinclude: fix IS_ERR on Windows 48016/head
Lucian Petrut [Fri, 26 Aug 2022 12:54:10 +0000 (12:54 +0000)]
include: fix IS_ERR on Windows

The "long" type uses 32b on x64 Windows platforms, which means
it's not large enough to store a pointer. intptr_t or uintptr_t
should be used instead.

This change fixes include/err.h, using the right types. There was
a previous patch on this topic but unfortunately it didn't address
all the type casts.

This issue was brought up by the unittest_crush test, which recently
started to fail as the CrushWrapper methods use IS_ERR.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit c95b6b6c774da05e989cd09e23eee1eeaa9e6ec2)

3 years agoMerge pull request #47942 from adk3798/wip-57375-quincy
Adam King [Thu, 8 Sep 2022 17:02:47 +0000 (13:02 -0400)]
Merge pull request #47942 from adk3798/wip-57375-quincy

quincy: mgr/dashboard: enable addition of custom Prometheus alerts

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agoMerge pull request #47932 from rzarzynski/wip-57209-quincy
Yuri Weinstein [Thu, 8 Sep 2022 16:38:00 +0000 (09:38 -0700)]
Merge pull request #47932 from rzarzynski/wip-57209-quincy

quincy: test/lazy-omap-stats: Various enhancements

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
3 years agoMerge pull request #47536 from guits/wip-57089-quincy
Adam King [Thu, 8 Sep 2022 16:24:43 +0000 (12:24 -0400)]
Merge pull request #47536 from guits/wip-57089-quincy

quincy: ceph-volume: system.get_mounts() refactor

Reviewed-by: Adam King <adking@redhat.com>
3 years agoMerge pull request #47608 from adk3798/quincy-incorrect-warning
Adam King [Thu, 8 Sep 2022 16:24:03 +0000 (12:24 -0400)]
Merge pull request #47608 from adk3798/quincy-incorrect-warning

quincy: cephadm: fix incorrect warning

Reviewed-by: John Mulligan <jmulligan@redhat.com>
3 years agoMerge pull request #47610 from adk3798/quincy-multiple-vips
Adam King [Thu, 8 Sep 2022 16:23:27 +0000 (12:23 -0400)]
Merge pull request #47610 from adk3798/quincy-multiple-vips

quincy: Cephadm: Allow multiple virtual IP addresses for keepalived and haproxy

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agoMerge pull request #47626 from guits/wip-57132-quincy
Adam King [Thu, 8 Sep 2022 16:22:16 +0000 (12:22 -0400)]
Merge pull request #47626 from guits/wip-57132-quincy

quincy: cephadm/ceph-volume: fix rm-cluster --zap

Reviewed-by: Adam King <adking@redhat.com>
3 years agoMerge pull request #47654 from adk3798/quincy-dup-args-loki-promtail
Adam King [Thu, 8 Sep 2022 16:21:26 +0000 (12:21 -0400)]
Merge pull request #47654 from adk3798/quincy-dup-args-loki-promtail

quincy: cephadm: Remove duplicated process args in promtail and loki

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47656 from adk3798/wip-57168-quincy
Adam King [Thu, 8 Sep 2022 16:20:22 +0000 (12:20 -0400)]
Merge pull request #47656 from adk3798/wip-57168-quincy

quincy: cephadm: support for Oracle Linux 8

Reviewed-by: John Mulligan <jmulligan@redhat.com>
3 years agoMerge pull request #47657 from adk3798/wip-57151-quincy
Adam King [Thu, 8 Sep 2022 16:19:43 +0000 (12:19 -0400)]
Merge pull request #47657 from adk3798/wip-57151-quincy

quincy: mgr/cephadm: fix handling of draining hosts with explicit placement specs

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47659 from adk3798/wip-57102-quincy
Adam King [Thu, 8 Sep 2022 16:18:14 +0000 (12:18 -0400)]
Merge pull request #47659 from adk3798/wip-57102-quincy

quincy: mgr/cephadm: recreate osd config when redeploy/reconfiguring

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47944 from adk3798/wip-57426-quincy
Adam King [Thu, 8 Sep 2022 16:16:21 +0000 (12:16 -0400)]
Merge pull request #47944 from adk3798/wip-57426-quincy

quincy: cephadm/mgr: adding logic to handle --no-overwrite for tuned profiles

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47946 from adk3798/wip-57423-quincy
Adam King [Thu, 8 Sep 2022 16:14:20 +0000 (12:14 -0400)]
Merge pull request #47946 from adk3798/wip-57423-quincy

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

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47950 from adk3798/wip-57383-quincy
Adam King [Thu, 8 Sep 2022 16:13:04 +0000 (12:13 -0400)]
Merge pull request #47950 from adk3798/wip-57383-quincy

quincy: mgr/cephadm: Adding logic to store grafana cert/key per node

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47951 from adk3798/wip-57382-quincy
Adam King [Thu, 8 Sep 2022 16:12:21 +0000 (12:12 -0400)]
Merge pull request #47951 from adk3798/wip-57382-quincy

quincy: mgr/cephadm: allow binding to loopback for rgw daemons

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47952 from adk3798/wip-57378-quincy
Adam King [Thu, 8 Sep 2022 16:11:40 +0000 (12:11 -0400)]
Merge pull request #47952 from adk3798/wip-57378-quincy

quincy: cephadm: return nonzero exit code when applying spec fails in bootstrap

Reviewed-by: John Mulligan <jmulligan@redhat.com>
3 years agoMerge pull request #47953 from adk3798/wip-57377-quincy
Adam King [Thu, 8 Sep 2022 16:11:02 +0000 (12:11 -0400)]
Merge pull request #47953 from adk3798/wip-57377-quincy

quincy: mgr/cephadm: don't try to write client/os tuning profiles to known offline hosts

Reviewed-by: John Mulligan <jmulligan@redhat.com>
3 years agodokan: cast variable to the expected type before comparison
Kefu Chai [Fri, 5 Aug 2022 00:17:45 +0000 (08:17 +0800)]
dokan: cast variable to the expected type before comparison

to fix the FTBFS due to following warning:

```
/home/jenkins-build/build/workspace/ceph-windows-pull-requests/ceph/build.deps/src/dokany/dokan/dokan.h:723:22: error: narrowing conversion of '-1' from 'int' to 'long unsigned int' [-Wnarrowing]
  723 | #define DOKAN_ERROR -1
      |                      ^
```

also, clean up the following warning:

```
/home/jenkins-build/build/workspace/ceph-windows-pull-requests/ceph/src/dokan/dbg.cc:142:62: warning: NULL used in arithmetic [-Wpointer-arith]
  142 |   o << "\n\tIsDirectory: " << (DokanFileInfo->IsDirectory != NULL);
      |
```

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit f27e16ff9494e1d1f36324b64fb24a16fcf929b3)

3 years agoPendingReleaseNotes: document online and offline trimming of PG Log's dups 48019/head
Radoslaw Zarzynski [Tue, 23 Aug 2022 19:50:48 +0000 (19:50 +0000)]
PendingReleaseNotes: document online and offline trimming of PG Log's dups

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

Conflicts:
    PendingReleaseNotes
- Moved the note under ">=17.2.4" section

3 years agoMerge pull request #48004 from sseshasa/wip-57461-quincy
Neha Ojha [Thu, 8 Sep 2022 15:26:21 +0000 (08:26 -0700)]
Merge pull request #48004 from sseshasa/wip-57461-quincy

quincy: PendingReleaseNotes: Note the fix for high CPU utilization during recovery

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agowin32_deps_build.sh: bump curl to curl-7_84_0
Kefu Chai [Thu, 4 Aug 2022 15:06:04 +0000 (23:06 +0800)]
win32_deps_build.sh: bump curl to curl-7_84_0

to silence warnings like:

```
configure.ac:3671: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3671: You should run autoupdate.
```

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 6b43df3c58fd15501988b7cfbe411fb42f223689)

3 years agoMerge pull request #47894 from kotreshhr/wip-57242-quincy
Yuri Weinstein [Thu, 8 Sep 2022 14:25:26 +0000 (07:25 -0700)]
Merge pull request #47894 from kotreshhr/wip-57242-quincy

quincy: mgr/volumes: Few mgr volumes backports

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #47996 from idryomov/wip-52810-quincy
Yuri Weinstein [Thu, 8 Sep 2022 13:53:08 +0000 (06:53 -0700)]
Merge pull request #47996 from idryomov/wip-52810-quincy

quincy: librbd: retry ENOENT in V2_REFRESH_PARENT as well

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
3 years agotest/encoding: refactor EncodingException::Macros
Kefu Chai [Fri, 22 Jul 2022 13:08:41 +0000 (21:08 +0800)]
test/encoding: refactor EncodingException::Macros

so it is more compacted

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit b3151a9c373b472c7e88080205fc256a1304fe9d)

3 years agotest/encoding: verify that e.what() starts with expected str
Kefu Chai [Fri, 22 Jul 2022 12:54:43 +0000 (20:54 +0800)]
test/encoding: verify that e.what() starts with expected str

boost changes the way how it prints boost::system::system_error in
boost 1.79 -- it appends the stringified error_category at end of
exception::what(), and our buffer::malformed_input is a subclass
of boost::system::system_error.

so we cannot just compare the return value of what() with the
expected string, to be more future proof, let's check if i
starts with the expected string instead.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 0d9eec3c4feff30ab55601533bccf9ba6e568b9f)

3 years agocommon/win32,dokan: include bcrypt.h for NTSTATUS
Kefu Chai [Thu, 21 Jul 2022 23:28:37 +0000 (07:28 +0800)]
common/win32,dokan: include bcrypt.h for NTSTATUS

to avoid the conflicting declaration of NTSTATUS from bcrypt.h and our
own typedef. as after switching to boost 1.79, we would have following compiling
failure:

In file included from ../src/dokan/options.cc:14:
../src/dokan/ceph_dokan.h:16:15: error: conflicting declaration 'typedef DWORD NTSTATUS'
   16 | typedef DWORD NTSTATUS;
      |               ^~~~~~~~
In file included from ../build.deps/mingw/boost/include/boost/asio/impl/connect_pipe.ipp:29,
                 from ../build.deps/mingw/boost/include/boost/asio/connect_pipe.hpp:79,
                 from ../build.deps/mingw/boost/include/boost/asio.hpp:64,
                 from ../src/include/win32/winsock_wrapper.h:20,
                 from <command-line>:
/usr/share/mingw-w64/include/bcrypt.h:27:16: note: previous declaration as 'typedef LONG NTSTATUS'
   27 |   typedef LONG NTSTATUS,*PNTSTATUS;
      |                ^~~~~~~~

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 1a09e520bf26f61cb048d9d3d3876f284af64b04)

3 years agomgr/snap_schedule: Use rados.Ioctx.remove_object() instead of remove(). 48013/head
Andreas Teuchert [Thu, 7 Jul 2022 12:55:59 +0000 (12:55 +0000)]
mgr/snap_schedule: Use rados.Ioctx.remove_object() instead of remove().

This fixes the "AttributeError: 'rados.Ioctx' object has no attribute
'remove'" error.

Signed-off-by: Andreas Teuchert <a.teuchert@syseleven.de>
(cherry picked from commit bb958f18af615377852d1579da936ea6c62d6056)

3 years agoPendingReleaseNotes: Note the fix for high CPU utilization during recovery 48004/head
Sridhar Seshasayee [Tue, 16 Aug 2022 11:45:29 +0000 (17:15 +0530)]
PendingReleaseNotes: Note the fix for high CPU utilization during recovery

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit d6982022325a17dbe91e760530ab21832459a817)

Conflicts:
    PendingReleaseNotes
- Moved the note under ">=17.2.4" section

3 years agoMerge pull request #47993 from soumyakoduri/wip-skoduri-quincy
Yuri Weinstein [Wed, 7 Sep 2022 21:01:26 +0000 (14:01 -0700)]
Merge pull request #47993 from soumyakoduri/wip-skoduri-quincy

rgw/backport/quincy: Fix crashes with Sync policy APIs

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #46005 from rzarzynski/wip-common-no-cpp17-second_round-quincy
Yuri Weinstein [Wed, 7 Sep 2022 15:00:54 +0000 (08:00 -0700)]
Merge pull request #46005 from rzarzynski/wip-common-no-cpp17-second_round-quincy

quincy: common/bl: fix FTBFS on C++11 due to C++17's if-with-initializer

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoMerge pull request #47901 from amathuria/wip-56736-quincy
Yuri Weinstein [Wed, 7 Sep 2022 14:57:41 +0000 (07:57 -0700)]
Merge pull request #47901 from amathuria/wip-56736-quincy

quincy: osd/PeeringState: fix missed recheck_readable from laggy

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45892 from nkshirsagar/wip-55297-quincy
Yuri Weinstein [Wed, 7 Sep 2022 14:55:32 +0000 (07:55 -0700)]
Merge pull request #45892 from nkshirsagar/wip-55297-quincy

quincy: Catch exception if thrown by __generate_command_map()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
3 years agoMerge pull request #46559 from pdvian/wip-55305-quincy
Yuri Weinstein [Tue, 6 Sep 2022 20:41:58 +0000 (13:41 -0700)]
Merge pull request #46559 from pdvian/wip-55305-quincy

quincy: mgr, mon: Keep upto date metadata with mgr for MONs

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agolibrbd: make RefreshRequest tests compatible with clone v1 47996/head
Ilya Dryomov [Sun, 4 Sep 2022 17:14:04 +0000 (19:14 +0200)]
librbd: make RefreshRequest tests compatible with clone v1

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

3 years agolibrbd: retry ENOENT in V2_REFRESH_PARENT as well
Ilya Dryomov [Sun, 4 Sep 2022 15:52:51 +0000 (17:52 +0200)]
librbd: retry ENOENT in V2_REFRESH_PARENT as well

With auto-deletion of trashed snapshots, it is relatively easy to lose
a race to "rbd flatten" as follows:

- when V2_GET_PARENT runs, the image is technically still a clone
- when V2_REFRESH_PARENT runs, the image is fully flattened and the
  snapshot in the parent image is deleted

This results in a spurious ENOENT error, mainly when trying to open the
image (e.g. for "rbd info").  This race condition has always been there
but auto-deletion of trashed snapshots makes it much worse.

Retry ENOENT in V2_REFRESH_PARENT the same way as in V2_GET_SNAPSHOTS.

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

3 years agolibrbd: limit the number of ENOENT retries in RefreshRequest
Ilya Dryomov [Sun, 4 Sep 2022 10:40:36 +0000 (12:40 +0200)]
librbd: limit the number of ENOENT retries in RefreshRequest

If the image header is corrupt, ENOENT error may be persistent.  Avoid
an infinite loop in that case.

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

3 years agolibrbd: fix a bunch of issues with restarting RefreshRequest
Ilya Dryomov [Fri, 2 Sep 2022 14:58:36 +0000 (16:58 +0200)]
librbd: fix a bunch of issues with restarting RefreshRequest

Make RefreshRequest properly restartable, at least up until and including
V2_REFRESH_PARENT step:

- clear m_migration_spec when skipping GET_MIGRATION_HEADER
- don't rely on potentially stale m_incomplete_update on retry
- reset m_legacy_parent when retrying more than just V2_GET_PARENT
- don't rely on potentially stale m_parent_md.overlap and
  m_head_parent_overlap on retry
- clear m_metadata before fetching image metadata (but not before
  fetching pool metadata)
- clear m_op_features when skipping V2_GET_OP_FEATURES
- clear m_group_spec on EOPNOTSUPP error in V2_GET_GROUP
- reset m_legacy_snapshot when retrying more than just V2_GET_SNAPSHOTS
- don't rely on potentially stale m_snap_parents on retry

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

3 years agolibrbd: check *result consistently in RefreshRequest
Ilya Dryomov [Tue, 30 Aug 2022 19:33:04 +0000 (21:33 +0200)]
librbd: check *result consistently in RefreshRequest

Stick to *result >= 0 checks everywhere and add missing checks for
op_features_get_finish() and image_group_get_finish() errors.

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

3 years agolibrbd: reflect V2_GET_SNAPSHOTS ENOENT retry in state diagram
Ilya Dryomov [Tue, 30 Aug 2022 18:38:10 +0000 (20:38 +0200)]
librbd: reflect V2_GET_SNAPSHOTS ENOENT retry in state diagram

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

3 years agoradosgw-admin: fix crash with 'sync flow create/remove' cmd 47993/head
Soumya Koduri [Wed, 24 Aug 2022 05:38:38 +0000 (11:08 +0530)]
radosgw-admin: fix crash with 'sync flow create/remove' cmd

Avoid dereferencing an empty optional "flow-type" (if not specified).

Fixes: https://tracker.ceph.com/issues/57275
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
(cherry picked from commit 539c5b87a2965ce43002430790abd586b98f620d)

3 years agorgw: Avoid dereferencing nullptr while configuring bucket sync policy
Soumya Koduri [Thu, 26 May 2022 16:55:06 +0000 (22:25 +0530)]
rgw: Avoid dereferencing nullptr while configuring bucket sync policy

While configuring bucket sync policy, in "rgw_sync_bucket_entities::set_bucket()",
there could be a case where in bucket doesnt contain any value but is still being
dereferenced. This commit fixes the same.

Signed-off-by: Soumya Koduri <skoduri@redhat.com>
(cherry picked from commit 86cf8275224536a7ca77eaf8a6e59951b3f25261)

3 years agoMerge pull request #47940 from idryomov/wip-56703-quincy
Yuri Weinstein [Tue, 6 Sep 2022 16:07:09 +0000 (09:07 -0700)]
Merge pull request #47940 from idryomov/wip-56703-quincy

quincy: librbd/cache/pwl: narrow the scope of m_lock in write_image_cache_state()

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #47235 from cfsnyder/wip-55714-quincy
Yuri Weinstein [Tue, 6 Sep 2022 15:09:10 +0000 (08:09 -0700)]
Merge pull request #47235 from cfsnyder/wip-55714-quincy

quincy: rgw_rest_user_policy: Fix GetUserPolicy & ListUserPolicies responses

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #46107 from BenoitKnecht/wip-55499-quincy
Yuri Weinstein [Tue, 6 Sep 2022 15:08:36 +0000 (08:08 -0700)]
Merge pull request #46107 from BenoitKnecht/wip-55499-quincy

quincy: rgw: Avoid segfault when OPA authz is enabled

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45714 from cbodley/wip-55136
Yuri Weinstein [Tue, 6 Sep 2022 15:07:45 +0000 (08:07 -0700)]
Merge pull request #45714 from cbodley/wip-55136

quincy: rgw: data sync uses yield_spawn_window()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #47980 from tchaikov/quincy-pr-47962
Ilya Dryomov [Tue, 6 Sep 2022 09:21:54 +0000 (11:21 +0200)]
Merge pull request #47980 from tchaikov/quincy-pr-47962

quincy: test/{librbd, rgw}: retry when bind fail with port 0

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>