]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
21 months agomds: remove calculating caps after adding revokes back 52852/head
Xiubo Li [Fri, 23 Jun 2023 14:44:23 +0000 (22:44 +0800)]
mds: remove calculating caps after adding revokes back

The calc_issued() makes no sense and will blindly set the 'issued'
to the 'pending', which is incorrect.

For the cap update msg it will pass the client's 'implemented' caps
to MDS, and MDS will use the 'implemented' to calculate the 'issued'
and 'pending' members and also will adjust the revoke list.

The confirm_receipt() has already correctly calculating the 'issued'
and 'pending' members. And after add the cap back to the revoke list
we should mark it notable, which will move the cap object to the
front of session list.

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

21 months agotest/libcephfs: add test case for revoking caps
Xiubo Li [Tue, 11 Oct 2022 04:53:17 +0000 (12:53 +0800)]
test/libcephfs: add test case for revoking caps

When writing to a file and the max_size is approaching the client
will try to trigger to call check_caps() and flush the caps to MDS.
But just in case the MDS is revoking Fsxrw caps, since the client
keeps writing and holding the Fw caps it may only release part of
the caps but the Fw.

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

21 months agoclient: issue a cap release immediately if no cap exists
Xiubo Li [Tue, 16 May 2023 01:18:15 +0000 (09:18 +0800)]
client: issue a cap release immediately if no cap exists

In case:

           mds                             client
                                - Releases cap and put Inode
  - Increase cap->seq and sends
    revokes req to the client
  - Receives release req and    - Receives & drops the revoke req
    skip removing the cap and
    then eval the CInode and
    issue or revoke caps again.
                                - Receives & drops the caps update
                                  or revoke req
  - Health warning for client
    isn't responding to
    mclientcaps(revoke)

All the IMPORT/REVOKE/GRANT cap ops will increase the session seq
in MDS side and then the client need to issue a cap release to
unblock MDS to remove the corresponding cap to unblock possible
waiters.

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

21 months agomds: add the revoking caps back to _revokes list
Xiubo Li [Thu, 2 Mar 2023 14:01:08 +0000 (22:01 +0800)]
mds: add the revoking caps back to _revokes list

When revoking caps from clients and if the clients could release
some of the caps references and the clients still could send cap
update request back to MDS, while the confirm_receipt() will clear
the _revokes list anyway.

But this cap will still be kept in revoking_caps list.

At the same time add one debug log when revocation is not totally
finished.

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

21 months agomds: move confirm_receipt() to Capability.cc
Xiubo Li [Thu, 2 Mar 2023 13:58:56 +0000 (21:58 +0800)]
mds: move confirm_receipt() to Capability.cc

Will add the debug logs later in confirm_receipt().

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

21 months agoMerge pull request #49478 from aaSharma14/wip-58301-pacific
Pedro Gonzalez Gomez [Tue, 10 Oct 2023 08:23:59 +0000 (10:23 +0200)]
Merge pull request #49478 from aaSharma14/wip-58301-pacific

pacific: mgr/dashboard: fix CephPGImbalance alert

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
21 months agoMerge pull request #48524 from k0ste/wip-57887-pacific
Avan [Thu, 5 Oct 2023 09:35:07 +0000 (15:05 +0530)]
Merge pull request #48524 from k0ste/wip-57887-pacific

pacific: mgr/prometheus: avoid duplicates and deleted entries for rbd_stats_pools

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
21 months agoMerge pull request #53781 from rhcs-dashboard/wip-63070-pacific
Nizamudeen A [Tue, 3 Oct 2023 11:12:36 +0000 (16:42 +0530)]
Merge pull request #53781 from rhcs-dashboard/wip-63070-pacific

pacific: mgr/dashboard: allow tls 1.2 with a config option

Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
21 months agomgr/dashboard: allow tls 1.2 with a config option 53781/head
Nizamudeen A [Wed, 27 Sep 2023 11:27:32 +0000 (16:57 +0530)]
mgr/dashboard: allow tls 1.2 with a config option

Provide the option to allow tls1.2

`ceph dashboard set-enable-unsafe-tls-v1-2 True` followed with a mgr
restart will enable tls 1.2.

With tls1.2 enabled
```
╰─$ nmap -sV --script ssl-enum-ciphers -p 11000 127.0.0.1
Starting Nmap 7.93 ( https://nmap.org ) at 2023-09-27 16:56 IST
Nmap scan report for localhost (127.0.0.1)
Host is up (0.00018s latency).

PORT      STATE SERVICE  VERSION
11000/tcp open  ssl/http CherryPy wsgiserver
|_http-server-header: Ceph-Dashboard
| ssl-enum-ciphers:
|   TLSv1.2:
|     ciphers:
|       TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (ecdh_x25519) - A
|       TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 (ecdh_x25519) - A
|       TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (ecdh_x25519) - A
|       TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 (ecdh_x25519) - A
|       TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA (ecdh_x25519) - A
|       TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA (ecdh_x25519) - A
|       TLS_RSA_WITH_AES_256_GCM_SHA384 (rsa 2048) - A
|       TLS_RSA_WITH_AES_256_CCM (rsa 2048) - A
|       TLS_RSA_WITH_AES_128_GCM_SHA256 (rsa 2048) - A
|       TLS_RSA_WITH_AES_128_CCM (rsa 2048) - A
|       TLS_RSA_WITH_AES_256_CBC_SHA256 (rsa 2048) - A
|       TLS_RSA_WITH_AES_128_CBC_SHA256 (rsa 2048) - A
|       TLS_RSA_WITH_AES_256_CBC_SHA (rsa 2048) - A
|       TLS_RSA_WITH_AES_128_CBC_SHA (rsa 2048) - A
|     compressors:
|       NULL
|     cipher preference: server
|   TLSv1.3:
|     ciphers:
|       TLS_AKE_WITH_AES_256_GCM_SHA384 (ecdh_x25519) - A
|       TLS_AKE_WITH_CHACHA20_POLY1305_SHA256 (ecdh_x25519) - A
|       TLS_AKE_WITH_AES_128_GCM_SHA256 (ecdh_x25519) - A
|       TLS_AKE_WITH_AES_128_CCM_SHA256 (ecdh_x25519) - A
|     cipher preference: server
|_  least strength: A

Service detection performed. Please report any incorrect results at https://nmap.org/submit/ .
Nmap done: 1 IP address (1 host up) scanned in 16.55 seconds
```

Without tls1.2 enabled (which defaults to tls 1.3)
```
╰─$ nmap -sV --script ssl-enum-ciphers -p 11000 127.0.0.1
Starting Nmap 7.93 ( https://nmap.org ) at 2023-09-27 16:54 IST
Nmap scan report for localhost (127.0.0.1)
Host is up (0.000075s latency).

PORT      STATE SERVICE  VERSION
11000/tcp open  ssl/http CherryPy wsgiserver
| ssl-enum-ciphers:
|   TLSv1.3:
|     ciphers:
|       TLS_AKE_WITH_AES_256_GCM_SHA384 (ecdh_x25519) - A
|       TLS_AKE_WITH_CHACHA20_POLY1305_SHA256 (ecdh_x25519) - A
|       TLS_AKE_WITH_AES_128_GCM_SHA256 (ecdh_x25519) - A
|       TLS_AKE_WITH_AES_128_CCM_SHA256 (ecdh_x25519) - A
|     cipher preference: server
|_  least strength: A
|_http-server-header: Ceph-Dashboard
```

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

21 months agoMerge pull request #52750 from mchangir/wip-61989-pacific
Venky Shankar [Mon, 25 Sep 2023 07:49:08 +0000 (13:19 +0530)]
Merge pull request #52750 from mchangir/wip-61989-pacific

pacific: mgr/snap_schedule: allow retention spec 'n' to be user defined

Reviewed-by: Venky Shankar <vshankar@redhat.com>
21 months agoMerge pull request #53560 from batrick/wip-57776-pacific
zdover23 [Thu, 21 Sep 2023 05:01:51 +0000 (15:01 +1000)]
Merge pull request #53560 from batrick/wip-57776-pacific

pacific: doc: discuss the standard multi-tenant CephFS security model

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
22 months agodoc: discuss the standard multi-tenant CephFS security model 53560/head
Greg Farnum [Fri, 30 Sep 2022 19:34:27 +0000 (19:34 +0000)]
doc: discuss the standard multi-tenant CephFS security model

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

22 months agoMerge pull request #52949 from k0ste/wip-61723-pacific
Adam Kupczyk [Tue, 19 Sep 2023 13:29:44 +0000 (15:29 +0200)]
Merge pull request #52949 from k0ste/wip-61723-pacific

pacific: Bluestore: fix bluestore collection_list latency perf counter

22 months agoMerge pull request #52821 from rishabh-d-dave/wip-62337-pacific
Laura Flores [Sun, 17 Sep 2023 22:34:33 +0000 (18:34 -0400)]
Merge pull request #52821 from rishabh-d-dave/wip-62337-pacific

pacific: mds: use variable g_ceph_context directly in MDSAuthCaps

22 months agoMerge pull request #53416 from trociny/wip-62505-pacific
Casey Bodley [Fri, 15 Sep 2023 15:03:48 +0000 (16:03 +0100)]
Merge pull request #53416 from trociny/wip-62505-pacific

pacific: rgw: handle http options CORS with v4 auth

Reviewed-by: Casey Bodley <cbodley@redhat.com>
22 months agoMerge PR #53447 into pacific
Patrick Donnelly [Wed, 13 Sep 2023 18:17:10 +0000 (14:17 -0400)]
Merge PR #53447 into pacific

* refs/pull/53447/head:
qa: remove duplicate import

Reviewed-by: Casey Bodley <cbodley@redhat.com>
22 months agoqa: remove duplicate import 53447/head
Patrick Donnelly [Wed, 13 Sep 2023 16:36:04 +0000 (12:36 -0400)]
qa: remove duplicate import

To fix tox error.

Fixes: c09558d8de0defb2695bb345c30387843e65cd93
Fixes: 469f3502d48d6ccfeba4d2ac2446ef4e47665f53
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
22 months agoMerge pull request #53403 from rishabh-d-dave/wip-62807-pacific
zdover23 [Tue, 12 Sep 2023 10:39:13 +0000 (20:39 +1000)]
Merge pull request #53403 from rishabh-d-dave/wip-62807-pacific

pacific: doc/cephfs: write cephfs commands fully in docs

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
22 months agorgw/auth: move http options v4 logic to get_v4_canonical_method() 53416/head
Tobias Urdin [Thu, 17 Aug 2023 11:45:06 +0000 (11:45 +0000)]
rgw/auth: move http options v4 logic to get_v4_canonical_method()

Signed-off-by: Tobias Urdin <tobias.urdin@binero.com>
(cherry picked from commit dbc0a4ed2dd6a92d06e585dda25b1325464efefb)

Conflicts:
src/rgw/rgw_auth_s3.cc (trivial)
src/rgw/rgw_auth_s3.h (trivial)

22 months agorgw/auth: handle HTTP OPTIONS with v4 auth
Tobias Urdin [Mon, 7 Aug 2023 20:34:43 +0000 (20:34 +0000)]
rgw/auth: handle HTTP OPTIONS with v4 auth

This adds code to properly verify the signature
for HTTP OPTIONS calls that is preflight CORS
requests passing the expected method in the
access-control-request-method header.

Fixes: https://tracker.ceph.com/issues/62033
Signed-off-by: Tobias Urdin <tobias.urdin@binero.com>
(cherry picked from commit 814cae52baf04d9c3f0f3bd04b8e2daf16eb3874)

Conflicts:
src/rgw/rgw_cors.h (trivial)
src/rgw/rgw_op.cc (different signature for validate_cors_rule_method)
src/rgw/rgw_rest_s3.cc (trivial)

22 months agorgw/auth: check auth for http options requests
Tobias Urdin [Thu, 27 Jul 2023 14:59:45 +0000 (14:59 +0000)]
rgw/auth: check auth for http options requests

If we get a HTTP OPTIONS request we previously always
allowed the anonymous engine to handle the request even
if other auth was given in the request.

Fixes: https://tracker.ceph.com/issues/62033
Signed-off-by: Tobias Urdin <tobias.urdin@binero.com>
(cherry picked from commit 135b6fc20e8ad094ed94e05bfb1975578abbbdab)

22 months agodoc/cephfs: write cephfs commands fully in docs 53403/head
Rishabh Dave [Mon, 11 Sep 2023 09:55:46 +0000 (15:25 +0530)]
doc/cephfs: write cephfs commands fully in docs

We write CephFS commands incompletely in docs. For example, "ceph tell
mds.a help" is simply written as "tell mds.a help". This might confuse
the reader and it won't harm to write the command in full.

Fixes: https://tracker.ceph.com/issues/62791
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit e63b573d3edc272d83ee1b5eb3dace037f762d87)

22 months agoMerge pull request #53204 from idryomov/wip-62586-pacific
Ilya Dryomov [Fri, 8 Sep 2023 10:12:50 +0000 (12:12 +0200)]
Merge pull request #53204 from idryomov/wip-62586-pacific

pacific: qa/suites/upgrade/pacific-p2p: skip TestClsRbd.mirror_snapshot test

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
22 months agoMerge PR #51045 into pacific
Patrick Donnelly [Wed, 6 Sep 2023 00:45:57 +0000 (20:45 -0400)]
Merge PR #51045 into pacific

* refs/pull/51045/head:
qa: Add test for per-module finisher thread
qa: allow check_counter to look at nested keys
qa: allow specifying min for check-counter
mgr: Add one finisher thread per module

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
22 months agoMerge PR #52744 into pacific
Patrick Donnelly [Tue, 5 Sep 2023 19:42:17 +0000 (15:42 -0400)]
Merge PR #52744 into pacific

* refs/pull/52744/head:
qa: wait for file to have correct size

Reviewed-by: Venky Shankar <vshankar@redhat.com>
22 months agoMerge PR #53185 into pacific
Patrick Donnelly [Tue, 5 Sep 2023 19:41:42 +0000 (15:41 -0400)]
Merge PR #53185 into pacific

* refs/pull/53185/head:
mds: acquire inode snaplock in open

Reviewed-by: Venky Shankar <vshankar@redhat.com>
22 months agoMerge PR #53243 into pacific
Patrick Donnelly [Tue, 5 Sep 2023 19:40:57 +0000 (15:40 -0400)]
Merge PR #53243 into pacific

* refs/pull/53243/head:
mds: drop locks and retry when lock set changes

Reviewed-by: Venky Shankar <vshankar@redhat.com>
22 months agoMerge PR #53189 into pacific
Patrick Donnelly [Fri, 1 Sep 2023 19:06:27 +0000 (15:06 -0400)]
Merge PR #53189 into pacific

* refs/pull/53189/head:
mgr: register OSDs in ms_handle_accept
msg: indicate ms_handle_authentication is fast

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
22 months agomds: drop locks and retry when lock set changes 53243/head
Patrick Donnelly [Mon, 17 Jul 2023 20:10:59 +0000 (16:10 -0400)]
mds: drop locks and retry when lock set changes

An optimization was added to avoid an unnecessary gather on the inode
filelock when the client can safely get the file size without also
getting issued the requested caps. However, if a retry of getattr
is necessary, this conditional inclusion of the inode filelock
can cause lock-order violations resulting in deadlock.

So, if we've already acquired some of the inode's locks then we must
drop locks and retry.

Fixes: https://tracker.ceph.com/issues/62052
Fixes: c822b3e2573578c288d170d1031672b74e02dced
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b5719ac32fe6431131842d62ffaf7101c03e9bac)

22 months agoqa: Add test for per-module finisher thread 51045/head
Kotresh HR [Fri, 4 Nov 2022 10:36:20 +0000 (16:06 +0530)]
qa: Add test for per-module finisher thread

Fixes: https://tracker.ceph.com/issues/51177
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 2c2ef6d56b583a7a27fd7e99359cdabb2fd37fb5)

Conflicts:
  Removed 'telemetry diff' command used for testing
as it's not present in pacific.

22 months agoMerge pull request #53210 from ceph/pacific-release
Laura Flores [Wed, 30 Aug 2023 22:25:45 +0000 (17:25 -0500)]
Merge pull request #53210 from ceph/pacific-release

v16.2.14

22 months agoMerge pull request #53215 from rhcs-dashboard/wip-62632-pacific
Nizamudeen A [Wed, 30 Aug 2023 11:05:11 +0000 (16:35 +0530)]
Merge pull request #53215 from rhcs-dashboard/wip-62632-pacific

pacific: mgr/dashboard: fix rgw page issues when hostname not resolvable

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
22 months agomgr/dashboard: fix rgw page issues when hostname not resolvable 53215/head
Nizamudeen A [Thu, 24 Aug 2023 11:47:29 +0000 (17:17 +0530)]
mgr/dashboard: fix rgw page issues when hostname not resolvable

Part of the fix is copied from https://github.com/ceph/ceph/pull/47495/files#diff-ba538532bb5450d415ab80916916bd68fe51d195e57c9aa34effaa8789d7a392R705

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

 Conflicts:
src/pybind/mgr/dashboard/services/rgw_client.py
  - only keep the CephService import

22 months ago16.2.14 53210/head v16.2.14
Ceph Release Team [Tue, 29 Aug 2023 15:43:59 +0000 (15:43 +0000)]
16.2.14

Signed-off-by: Ceph Release Team <ceph-maintainers@ceph.io>
22 months agoMerge pull request #53202 from rhcs-dashboard/wip-62618-pacific
Nizamudeen A [Tue, 29 Aug 2023 13:45:00 +0000 (19:15 +0530)]
Merge pull request #53202 from rhcs-dashboard/wip-62618-pacific

pacific: mgr/dashboard: set CORS header for unauthorized access

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
22 months agoqa/suites/upgrade/pacific-p2p: skip TestClsRbd.mirror_snapshot test 53204/head
Ilya Dryomov [Sun, 27 Aug 2023 17:09:15 +0000 (19:09 +0200)]
qa/suites/upgrade/pacific-p2p: skip TestClsRbd.mirror_snapshot test

The behavior of the class method changed in reef; the change was
backported to pacific and quincy.  An older pacific binary used against
newer pacific OSDs produces an expected failure:

    [ RUN      ] TestClsRbd.mirror_snapshot
    .../ceph-16.2.7/src/test/cls_rbd/test_cls_rbd.cc:2278: Failure
    Expected equality of these values:
      -85
      mirror_image_snapshot_unlink_peer(&ioctx, oid, 1, "peer2")
        Which is: 0
    [  FAILED  ] TestClsRbd.mirror_snapshot (30 ms)

TestClsRbd.snapshots_namespaces test was removed in commit 4ad9d565a15c
("librbd: simplified retrieving snapshots from image header") many years
ago.

Fixes: https://tracker.ceph.com/issues/62586
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
22 months agomgr/dashboard: allow CORS for unauthorized access 53202/head
Nizamudeen A [Mon, 28 Aug 2023 05:15:28 +0000 (10:45 +0530)]
mgr/dashboard: allow CORS for unauthorized access

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

22 months agoMerge pull request #53197 from ljflores/wip-liburing-pacific
Yuri Weinstein [Tue, 29 Aug 2023 00:03:19 +0000 (17:03 -0700)]
Merge pull request #53197 from ljflores/wip-liburing-pacific

pacific: make-dist: download liburing from kernel.io instead of github

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
22 months agomake-dist: download liburing from kernel.io instead of github 53197/head
Laura Flores [Mon, 28 Aug 2023 22:13:09 +0000 (17:13 -0500)]
make-dist: download liburing from kernel.io instead of github

Due to a bug with github.com, wget does not reliably download
packages. See https://github.com/orgs/community/discussions/65227

This change is motivated by this error that occurs when trying
to download liburing from github.com on an ubuntu jammy machine:
```
$ wget https://github.com/axboe/liburing/archive/liburing-0.7.tar.gz
--2023-08-28 21:26:02--  https://github.com/axboe/liburing/archive/liburing-0.7.tar.gz
Resolving github.com (github.com)... 140.82.113.3
Connecting to github.com (github.com)|140.82.113.3|:443... connected.
HTTP request sent, awaiting response... 302 Found
Location: https://codeload.github.com/axboe/liburing/tar.gz/refs/tags/liburing-0.7 [following]
--2023-08-28 21:26:02--  https://codeload.github.com/axboe/liburing/tar.gz/refs/tags/liburing-0.7
Resolving codeload.github.com (codeload.github.com)... 140.82.112.10
Connecting to codeload.github.com (codeload.github.com)|140.82.112.10|:443... connected.
HTTP request sent, awaiting response... 403 Forbidden
2023-08-28 21:26:02 ERROR 403: Forbidden.
```

The same does not happen on centos 8 or fedora.

Downloading from kernel.io works on every distro.

Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit 7f109dc612d9590f84a8fe7a047a78c7d621fcab)

22 months agoMerge pull request #53157 from ljflores/wip-62591-pacific
Laura Flores [Mon, 28 Aug 2023 16:37:58 +0000 (11:37 -0500)]
Merge pull request #53157 from ljflores/wip-62591-pacific

pacific: python-common: drive_selection: fix KeyError when osdspec_affinity is not set

22 months agomgr: register OSDs in ms_handle_accept 53189/head
Patrick Donnelly [Mon, 3 Jul 2023 00:48:44 +0000 (20:48 -0400)]
mgr: register OSDs in ms_handle_accept

It's a no-no to acquire locks in these "fast" messenger methods. This
can lead to messenger slow downs in the best case as it's blocking reads
on the wire. In the worse case, the messenger may deadlock with other
threads, preventing any further message reads off the wire.

It's not obvious this method is "fast" so I've added a comment regarding
this.

Fixes: https://tracker.ceph.com/issues/61874
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 69980823e62f67d502c4045e15c41c5c44cd5127)

22 months agomsg: indicate ms_handle_authentication is fast
Patrick Donnelly [Mon, 10 Jul 2023 20:56:43 +0000 (16:56 -0400)]
msg: indicate ms_handle_authentication is fast

Like other fast Dispatcher methods, it must not acquire locks or do
anything that might take a long time.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 3e2075103a0ab6b7ced5800db1d44d13b1c8b7e6)

22 months agomds: acquire inode snaplock in open 53185/head
Patrick Donnelly [Tue, 18 Jul 2023 00:52:13 +0000 (20:52 -0400)]
mds: acquire inode snaplock in open

It doesn't make sense that

   open("file", O_CREAT|...)

will acquire a readlock on the file's snaplock when the file already
exists, but:

   open("file", ...)

will not.

Fixes: https://tracker.ceph.com/issues/62058
Fixes: c1d7f93d7bd06d773b8035359548c0c9216398e3
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit c04ab6f0868a7385e695c85486cf3e7bbdfa9ab5)

22 months agopython-common: drive_selection: fix KeyError when osdspec_affinity is not set 53157/head
Guillaume Abrioux [Wed, 19 Jul 2023 09:27:19 +0000 (09:27 +0000)]
python-common: drive_selection: fix KeyError when osdspec_affinity is not set

When osdspec_affinity is not set, the drive selection code will fail.
This can happen when a device has multiple LVs where some of are used
by Ceph and at least one LV isn't used by Ceph.

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

22 months agoMerge pull request #51509 from mchangir/wip-59202-pacific
Venky Shankar [Tue, 22 Aug 2023 04:20:51 +0000 (09:50 +0530)]
Merge pull request #51509 from mchangir/wip-59202-pacific

pacific: qa: add subvolume option flavors

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
22 months agoMerge pull request #52979 from k0ste/wip-50915-pacific
Yuri Weinstein [Mon, 21 Aug 2023 16:08:10 +0000 (09:08 -0700)]
Merge pull request #52979 from k0ste/wip-50915-pacific

pacific: mds: fix cpu_profiler asok crash

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
22 months agoMerge pull request #52974 from batrick/wip-62421-pacific
Yuri Weinstein [Mon, 21 Aug 2023 16:07:37 +0000 (09:07 -0700)]
Merge pull request #52974 from batrick/wip-62421-pacific

pacific: mds: adjust cap acquisition throttles

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
22 months agoMerge pull request #52270 from dparmar18/wip-61841-pacific
Yuri Weinstein [Mon, 21 Aug 2023 16:06:30 +0000 (09:06 -0700)]
Merge pull request #52270 from dparmar18/wip-61841-pacific

pacific: do not evict clients if OSDs are laggy

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
22 months agomgr/snap_schedule: rephrase log message when pruning 52750/head
Milind Changire [Fri, 9 Jun 2023 11:40:19 +0000 (17:10 +0530)]
mgr/snap_schedule: rephrase log message when pruning

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit af9dbaf318a9b11e6b5c89ad23b6af91cfb5fdfa)

22 months agodoc: add note about snap-schedule snapshot retention
Milind Changire [Tue, 16 May 2023 07:55:59 +0000 (13:25 +0530)]
doc: add note about snap-schedule snapshot retention

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 414ad9619b42d3cdf7e1ceab9a05d1830b63d82d)

22 months agoqa: test user defined number of snaps retention spec
Milind Changire [Mon, 22 May 2023 06:04:31 +0000 (11:34 +0530)]
qa: test user defined number of snaps retention spec

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit a63ffd40799dd520c934881abea4e805d8dff7fa)

22 months agomgr/snap_schedule: adapt test to new argument list
Jakob Haufe [Mon, 8 May 2023 21:07:33 +0000 (23:07 +0200)]
mgr/snap_schedule: adapt test to new argument list

ca0889635f5f23153b648c77b80223939696f17c introduced a new argument to
get_prune_set, the maximum number of snapshots to ratin.

Adapt test accordingly by providing the default value.

Signed-off-by: Jakob Haufe <sur5r@sur5r.net>
(cherry picked from commit 7c5ad8d2c463f672f6b83a40c12c5110216257b9)

22 months agodoc/cephfs: Add note how mds_max_snaps_per_dir affects snapshot retention
Jakob Haufe [Tue, 16 May 2023 03:10:54 +0000 (08:40 +0530)]
doc/cephfs: Add note how mds_max_snaps_per_dir affects snapshot retention

Signed-off-by: Jakob Haufe <sur5r@sur5r.net>
(cherry picked from commit 2e8af66ed4678775a3f686738c12ac04abfd770e)

22 months agomgr/snap_schedule: Use mds_max_snaps_per_dir as snapshot count limit
Jakob Haufe [Thu, 11 May 2023 07:52:11 +0000 (13:22 +0530)]
mgr/snap_schedule: Use mds_max_snaps_per_dir as snapshot count limit

The module currently hardcodes a limit of 50 snapshots. Use
mds_max_snaps_per_dir instead to make this configurable.

Fixes: https://tracker.ceph.com/issues/59582
Signed-off-by: Jakob Haufe <sur5r@sur5r.net>
(cherry picked from commit dabac4c8dff527ffa5a2c2141e4a6e1896f00f71)

Conflicts:
src/pybind/mgr/snap_schedule/fs/schedule_client.py
- mostly type hinting additions

22 months agoMerge pull request #52753 from mchangir/wip-61793-pacific
Yuri Weinstein [Mon, 21 Aug 2023 15:36:16 +0000 (08:36 -0700)]
Merge pull request #52753 from mchangir/wip-61793-pacific

pacific: mgr/snap_schedule: catch all exceptions for cli

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
22 months agoMerge pull request #52552 from cfsnyder/wip-62064-pacific
Yuri Weinstein [Mon, 21 Aug 2023 14:30:53 +0000 (07:30 -0700)]
Merge pull request #52552 from cfsnyder/wip-62064-pacific

pacific: rgw: fix consistency bug with OLH objects

Reviewed-by: Casey Bodley <cbodley@redhat.com>
22 months agoMerge pull request #52878 from idryomov/wip-52913-pacific
Yuri Weinstein [Mon, 21 Aug 2023 14:28:40 +0000 (07:28 -0700)]
Merge pull request #52878 from idryomov/wip-52913-pacific

pacific: rbd-mirror: fix image replayer shut down description on force promote

Reviewed-by: Ramana Raja <rraja@redhat.com>
22 months agoMerge pull request #52625 from nbalacha/wip-62111-pacific
Yuri Weinstein [Mon, 21 Aug 2023 14:27:23 +0000 (07:27 -0700)]
Merge pull request #52625 from nbalacha/wip-62111-pacific

pacific: rbd-mirror: fix race preventing local image deletion

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
22 months agoMerge pull request #52883 from ajarr/wip-59737-pacific
Yuri Weinstein [Mon, 21 Aug 2023 14:26:14 +0000 (07:26 -0700)]
Merge pull request #52883 from ajarr/wip-59737-pacific

pacific: mgr: store names of modules that register RADOS clients in the MgrMap

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
22 months agoMerge pull request #51464 from ajarr/wip-59712-pacific
Yuri Weinstein [Mon, 21 Aug 2023 14:25:47 +0000 (07:25 -0700)]
Merge pull request #51464 from ajarr/wip-59712-pacific

pacific:  mgr/rbd_support: fixes related to recover from rados client blocklisting

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
23 months agorgw: fix/improve test_rgw_versioning.py tests 52552/head
Cory Snyder [Wed, 12 Jul 2023 14:08:07 +0000 (14:08 +0000)]
rgw: fix/improve test_rgw_versioning.py tests

Signed-off-by: Cory Snyder <csnyder@1111systems.com>
(cherry picked from commit aa1f40e80d78ce08a2f51dad6fadf620866d17a3)

23 months agoMerge pull request #52943 from YiteGu/fix-duplicate-onode-miss-statistics
Yuri Weinstein [Thu, 17 Aug 2023 21:15:37 +0000 (14:15 -0700)]
Merge pull request #52943 from YiteGu/fix-duplicate-onode-miss-statistics

pacific: os/bluestore: don't need separate variable to mark hits when lookup oid.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
23 months agoMerge pull request #51487 from vshankar/tr-59720
Yuri Weinstein [Thu, 17 Aug 2023 16:17:48 +0000 (09:17 -0700)]
Merge pull request #51487 from vshankar/tr-59720

pacific: client: use deep-copy when setting permission during make_request

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
23 months agoMerge pull request #52953 from k0ste/wip-62116-pacific
Yuri Weinstein [Thu, 17 Aug 2023 15:36:55 +0000 (08:36 -0700)]
Merge pull request #52953 from k0ste/wip-62116-pacific

pacific: qa: use parallel gzip for compressing logs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
23 months agoMerge pull request #52900 from leonid-s-usov/backport/bulk-data-pool/pacific
Yuri Weinstein [Thu, 17 Aug 2023 15:36:13 +0000 (08:36 -0700)]
Merge pull request #52900 from leonid-s-usov/backport/bulk-data-pool/pacific

pacific: Consider setting "bulk" autoscale pool flag when automatically creating a data pool for CephFS

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
23 months agoMerge pull request #52848 from lxbsz/wip-62193
Yuri Weinstein [Thu, 17 Aug 2023 15:35:48 +0000 (08:35 -0700)]
Merge pull request #52848 from lxbsz/wip-62193

pacific: mds: do not send split_realms for CEPH_SNAP_OP_UPDATE msg

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
23 months agoMerge pull request #52844 from lxbsz/wip-62202
Yuri Weinstein [Thu, 17 Aug 2023 15:35:22 +0000 (08:35 -0700)]
Merge pull request #52844 from lxbsz/wip-62202

pacific: mds: skip forwarding request if the session were removed

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
23 months agoMerge pull request #52726 from kotreshhr/wip-62242-pacific
Yuri Weinstein [Thu, 17 Aug 2023 15:34:57 +0000 (08:34 -0700)]
Merge pull request #52726 from kotreshhr/wip-62242-pacific

pacific: mds: Fix the linkmerge assert check

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
23 months agoMerge pull request #52682 from batrick/wip-62190-pacific
Yuri Weinstein [Thu, 17 Aug 2023 15:34:11 +0000 (08:34 -0700)]
Merge pull request #52682 from batrick/wip-62190-pacific

pacific: mds: update mdlog perf counters during replay

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
23 months agoMerge pull request #53002 from idryomov/wip-62437-pacific
Ilya Dryomov [Thu, 17 Aug 2023 10:22:11 +0000 (12:22 +0200)]
Merge pull request #53002 from idryomov/wip-62437-pacific

pacific: qa/suites/upgrade/octopus-x: skip TestClsRbd.mirror_snapshot test

Reviewed-by: Mykola Golub <mgolub@suse.com>
23 months agoMerge pull request #51039 from vshankar/tr-59003
Yuri Weinstein [Wed, 16 Aug 2023 16:22:15 +0000 (09:22 -0700)]
Merge pull request #51039 from vshankar/tr-59003

pacific: mgr/volumes: avoid returning -ESHUTDOWN back to cli

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
23 months agoqa/tasks: set defer_client_eviction_on_laggy_osds=false in api tests 52270/head
Laura Flores [Thu, 6 Jul 2023 15:20:46 +0000 (10:20 -0500)]
qa/tasks: set defer_client_eviction_on_laggy_osds=false in api tests

We expect laggy OSDs in this testing environment,
so it makes sense to disable this warning.

Fixes: https://tracker.ceph.com/issues/61907
Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit 2322d2c8e0f4902aba49f7441d8dd00bdb675b85)
(cherry picked from commit 2032e8b41efb665db46ad0584058b08bd1aaf561)

23 months agoMerge pull request #52873 from ifed01/wip-ifed-encrypted-ceph-volume-pac
Yuri Weinstein [Tue, 15 Aug 2023 20:59:37 +0000 (13:59 -0700)]
Merge pull request #52873 from ifed01/wip-ifed-encrypted-ceph-volume-pac

pacific: ceph_volume: support encrypted volumes for lvm new-db/new-wal/migrate commands

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
23 months agoMerge pull request #52212 from ifed01/wip-ifed-bluefs-cumulative-backports-pac
Yuri Weinstein [Tue, 15 Aug 2023 20:58:24 +0000 (13:58 -0700)]
Merge pull request #52212 from ifed01/wip-ifed-bluefs-cumulative-backports-pac

pacific: os/bluestore: cumulative bluefs backport

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
23 months agoMerge pull request #51773 from ifed01/wip-ifed-fix-bluefs-prealloc-pac
Yuri Weinstein [Tue, 15 Aug 2023 20:56:56 +0000 (13:56 -0700)]
Merge pull request #51773 from ifed01/wip-ifed-fix-bluefs-prealloc-pac

pacific: os/bluestore: proper override rocksdb::WritableFile::Allocate

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
23 months agoMerge pull request #51418 from ifed01/wip-ifed-fix-fit-to-fast-pac
Yuri Weinstein [Tue, 15 Aug 2023 20:55:52 +0000 (13:55 -0700)]
Merge pull request #51418 from ifed01/wip-ifed-fix-fit-to-fast-pac

pacific: os/bluestore: allow 'fit_to_fast' selector for single-volume osd

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
23 months agoqa/suites/upgrade/octopus-x: skip TestClsRbd.mirror_snapshot test 53002/head
Ilya Dryomov [Mon, 14 Aug 2023 11:16:59 +0000 (13:16 +0200)]
qa/suites/upgrade/octopus-x: skip TestClsRbd.mirror_snapshot test

The behavior of the class method changed in reef; the change was
backported to pacific and quincy.  An octopus test binary used against
pacific OSDs produces an expected failure:

    [ RUN      ] TestClsRbd.mirror_snapshot
    .../ceph-15.2.17/src/test/cls_rbd/test_cls_rbd.cc:2279: Failure
    Expected equality of these values:
      -85
      mirror_image_snapshot_unlink_peer(&ioctx, oid, 1, "peer2")
        Which is: 0
    [  FAILED  ] TestClsRbd.mirror_snapshot (6 ms)

Fixes: https://tracker.ceph.com/issues/62437
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
23 months agomon/MDSMonitor: print a note when adding data pool to a file system that doesn't... 52900/head
Leonid Usov [Thu, 3 Aug 2023 16:47:31 +0000 (19:47 +0300)]
mon/MDSMonitor: print a note when adding data pool to a file system that doesn't have 'bulk' flag set

The note will only be printed if the pool has pg_autoscale_mode set to ON and the bulk flag is missing

Signed-off-by: Leonid Usov <leonid.usov@ibm.com>
(cherry picked from commit 7d09154ce87d24993f605c8bbf829d6415b89562)

23 months agomgr/volumes: set the 'bulk' flag for data pools created automatically for a new volume
Leonid Usov [Thu, 3 Aug 2023 16:41:12 +0000 (19:41 +0300)]
mgr/volumes: set the 'bulk' flag for data pools created automatically for a new volume

Signed-off-by: Leonid Usov <leonid.usov@ibm.com>
Fixes: https://tracker.ceph.com/issues/61595
(cherry picked from commit 9a8219cc2bab2b5d4c0cc26783eac0ae87a8b24b)

23 months agomds: reset code after cpu_profiler 52979/head
liu shi [Fri, 14 May 2021 07:52:27 +0000 (03:52 -0400)]
mds: reset code after cpu_profiler

Signed-off-by: liu shi <liu.shi@navercorp.com>
(cherry picked from commit f1afb7b1b8d1b4873730e1b88a552213e4c51977)

23 months agocpu_profiler: fix asok command crash
liu shi [Fri, 14 May 2021 07:51:01 +0000 (03:51 -0400)]
cpu_profiler: fix asok command crash

fixes: https://tracker.ceph.com/issues/50814
Signed-off-by: liu shi <liu.shi@navercorp.com>
(cherry picked from commit be7303aafe34ae470d2fd74440c3a8d51fcfa3ff)

23 months agomds: adjust cap acquisition throttles 52974/head
Patrick Donnelly [Fri, 21 Jul 2023 15:56:49 +0000 (11:56 -0400)]
mds: adjust cap acquisition throttles

For production workloads, these defaults rarely help. Adjust
accordingly. For a steady state "find" workload, these new throttles
will prevent acquiring more than ~2300 caps/second which is quite
manageable with typical recall rates.

    -ln(0.5) / 30 * 100k = 2310

Fixes: https://tracker.ceph.com/issues/62114
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit f290ef9d0d2d09fb978d56c46be704c6efd45c43)

Conflicts:
src/common/options/mds.yaml.in: trivial

23 months agoMerge pull request #52468 from k0ste/wip-62031-pacific
Yuri Weinstein [Fri, 11 Aug 2023 15:28:26 +0000 (08:28 -0700)]
Merge pull request #52468 from k0ste/wip-62031-pacific

pacific: mon/ConfigMonitor: update crush_location from osd entity

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
23 months agoMerge pull request #51812 from NitzanMordhai/wip-61488-pacific
Yuri Weinstein [Fri, 11 Aug 2023 15:27:46 +0000 (08:27 -0700)]
Merge pull request #51812 from NitzanMordhai/wip-61488-pacific

pacific: pybind/argparse: blocklist ip validation

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
23 months agoqa: time log compression 52953/head
Patrick Donnelly [Wed, 22 Mar 2023 14:20:21 +0000 (10:20 -0400)]
qa: time log compression

For debugging and ad-hoc analytics.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 6739e1156350be7032f8832c04cf28da79e9c4d9)

23 months agoqa/tasks: give verbose gzip output
Patrick Donnelly [Tue, 21 Mar 2023 20:42:24 +0000 (16:42 -0400)]
qa/tasks: give verbose gzip output

For future analysis.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 0a03a47103e465dbd546e0495f8e7720402fbe6f)

23 months agoqa/tasks: use medium compression
Patrick Donnelly [Tue, 21 Mar 2023 20:41:17 +0000 (16:41 -0400)]
qa/tasks: use medium compression

To speed up compression.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 3c76cc3c5172591cdfd88b3d0f29298aba6fde9c)

23 months agoqa/ceph: parallelize gzip
Patrick Donnelly [Tue, 21 Mar 2023 20:39:05 +0000 (16:39 -0400)]
qa/ceph: parallelize gzip

Our machines have lots of cores, use them!

Fixes: https://tracker.ceph.com/issues/59120
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 23a29d4abe54d987a99434ad0d733e0b44a213f9)

23 months agoBluestore: fix bluestore collection_list latency perf counter 52949/head
wangwenjuan [Fri, 26 May 2023 06:57:15 +0000 (06:57 +0000)]
Bluestore: fix bluestore collection_list latency perf counter

Fixed bug in BlueStore::_collection_list using l_bluestore_remove_lat as bluestore list delay time,
which should be l_bluestore_clist_lat.

Fixes: https://tracker.ceph.com/issues/61460
Signed-off-by: Wangwenjuan <wangwenjuan_yewu@cmss.chinamobile.com>
(cherry picked from commit 749076a077dd059f3322fc56bf08b4b89ecda0aa)

23 months agoos/bluestore: don't need separate variable to mark hits when lookup oid. 52943/head
locallocal [Mon, 6 Dec 2021 02:01:50 +0000 (10:01 +0800)]
os/bluestore: don't need separate variable to mark hits when lookup oid.

Signed-off-by: locallocal <locallocal@163.com>
(cherry picked from commit 1428544ec66b498830bc884b4824cd90106053d5)

23 months agoMerge pull request #51382 from RaminNietzsche/wip-ifed-fix-require-osd-release-to...
Igor Fedotov [Fri, 11 Aug 2023 07:42:51 +0000 (10:42 +0300)]
Merge pull request #51382 from RaminNietzsche/wip-ifed-fix-require-osd-release-to-pacific

pacific: mon: avoid exception when setting require-osd-release more than 2 versions up.

Reviewed-by: Igor Fedotov <igor.fedotov@croit.io>
23 months agomds: do not send split_realms for CEPH_SNAP_OP_UPDATE msg 52848/head
Xiubo Li [Wed, 17 May 2023 13:06:16 +0000 (21:06 +0800)]
mds: do not send split_realms for CEPH_SNAP_OP_UPDATE msg

The clients won't care about the split_realms and the kclient will
treat this as a corrupted snaptrace.

Fixes commit 93e7267757508520dfc22cff1ab20558bd4a44d4 ("mds: send snap
related messages centrally during mds recovery")
Fixes: https://tracker.ceph.com/issues/61217
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 3be9c9796246eab96f672218d9e45f118f6cdf12)

Conflicts:
 - Misses a dependent commit 7a4c509f7289ff4

23 months agoMerge pull request #52500 from lxbsz/wip-62040
Venky Shankar [Wed, 9 Aug 2023 12:05:58 +0000 (17:35 +0530)]
Merge pull request #52500 from lxbsz/wip-62040

pacific: client: do not send metrics until the MDS rank is ready

Reviewed-by: Venky Shankar <vshankar@redhat.com>
23 months agoMerge pull request #52654 from joscollin/wip-62177-pacific
Venky Shankar [Wed, 9 Aug 2023 12:05:32 +0000 (17:35 +0530)]
Merge pull request #52654 from joscollin/wip-62177-pacific

pacific: qa: fix cephfs-mirror unwinding and 'fs volume create/rm' order

Reviewed-by: Venky Shankar <vshankar@redhat.com>
23 months agoqa: avoid explicit set to client mountpoint as "/" 51509/head
Venky Shankar [Wed, 9 Aug 2023 05:43:01 +0000 (11:13 +0530)]
qa: avoid explicit set to client mountpoint as "/"

This causes self.cephfs_mntpt to set as "/" by default which
overrides the config in ceph.conf. `test_client_cache_size`
updates ceph.conf with:

        client mountpoint = /subdir

However, the ceph-fuse mount command has --client_mountpoint explicitly
set as "/", thereby causing the root of the file system to get mounted which
confuses the test.

Fixes: http://tracker.ceph.com/issues/56446
Introduced-by: bf83eaa4e75516a6937e4097b8708c48856a9473
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 4322dcc2e94bab80042eaf1e236174f6e6772cec)

Conflicts:
qa/tasks/cephfs/fuse_mount.py
- merge conflicts due to updated upstream code
- removed offending line; host_mntpt was appended to the mount command
  later in the code; this issue was created due to manual conflict
  resolution during backporting process;
qa/tasks/cephfs/kernel_mount.py
qa/tasks/cephfs/mount.py
- fixed conflicts between 'main' and 'pacific' branches

23 months agoMerge pull request #52505 from lxbsz/wip-62012
Venky Shankar [Wed, 9 Aug 2023 04:32:01 +0000 (10:02 +0530)]
Merge pull request #52505 from lxbsz/wip-62012

pacific: client: wait rename to finish

Reviewed-by: Venky Shankar <vshankar@redhat.com>
23 months agoMerge pull request #52506 from lxbsz/wip-61983
Venky Shankar [Wed, 9 Aug 2023 04:31:32 +0000 (10:01 +0530)]
Merge pull request #52506 from lxbsz/wip-61983

pacific: client: force sending cap revoke ack always

Reviewed-by: Venky Shankar <vshankar@redhat.com>
23 months agoMerge pull request #52513 from joscollin/wip-62055-pacific
Venky Shankar [Wed, 9 Aug 2023 04:30:38 +0000 (10:00 +0530)]
Merge pull request #52513 from joscollin/wip-62055-pacific

pacific: mds: MDLog::_recovery_thread: handle the errors gracefully

Reviewed-by: Venky Shankar <vshankar@redhat.com>
23 months agoMerge pull request #52499 from lxbsz/wip-62043
Venky Shankar [Wed, 9 Aug 2023 04:29:58 +0000 (09:59 +0530)]
Merge pull request #52499 from lxbsz/wip-62043

pacific: client: trigger to flush the buffer when making snapshot

Reviewed-by: Venky Shankar <vshankar@redhat.com>
23 months agomgr/rbd_support: log number of images 51464/head
Ramana Raja [Wed, 14 Jun 2023 21:41:48 +0000 (17:41 -0400)]
mgr/rbd_support: log number of images

... that have one snapshot request pending when the
mirror_snapshot_schedule handler is shutting down.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit edc3b0e80653c30d0fc318a24673e8a0568912ad)

Conflicts:
src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
 - Above conflict was due to commit e4a16e2
   ("mgr/rbd_support: add type annotation") not in pacific