Merge pull request #63789 from trociny/wip-71486-tentacle

tentacle: mds: log meaningful error message when entering damaged state

Merge pull request #63899 from rishabh-d-dave/wip-71188-tentacle

tentacle: mgr/vol: some improvements for stats_util.py and async_cloner.py

Merge pull request #63900 from rishabh-d-dave/wip-71380-tentacle

tentacle: cephfs: session tracker accounts for killing sessions

Merge pull request #63969 from mchangir/wip-71437-tentacle

tentacle: mgr/snap_schedule: fix typo in error message during retention add

Merge pull request #64600 from vshankar/wip-pr-64356

tentacle: client: prohibit unprivileged users from setting sgid/suid bits

Reviewed-by: Milind Changire <mchangir@redhat.com>

Merge pull request #64332 from joscollin/wip-71948-tentacle

tentacle: qa: fix multi-fs tests in test_mds_metrics.py

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #64557 from nbalacha/wip-72166-tentacle

tentacle: rgw: fix aclRequired for bucket-logging

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>

Merge pull request #64558 from nbalacha/wip-72160-tentacle

tentacle: rgw: fix bucket logging AuthType field

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>

Merge pull request #64555 from yuvalif/wip-tentacle-revert-s3test

tentacle: rgw: point to the correct s3test repo and branch

Reviewed-by: Adam Emerson <aemerson@redhat.com>

Merge pull request #64541 from samarahu/wip-71993-tentacle

tentacle: test/d4n: Change D4N filter test cleaning interval values to ints

Reviewed-by: Adam Emerson <aemerson@redhat.com>

Merge pull request #64636 from adk3798/tentacle-nvmeof-dsa

tentacle: cephadm/nvmeof: add DSA acceleration support with conditional mounts and privileges

Merge pull request #64632 from rhcs-dashboard/wip-72076-tentacle

tentacle: mgr/dashboard: Storage Class Management - Local and Glacier

Merge pull request #64444 from adk3798/tentacle-smb-remotectl-prefactor

tentacle: mgr/smb: general refactoring with the intent of making future additions easier

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #64443 from adk3798/tentacle-smb-share-config-pershare-counters

tentacle: mgr/smb: add configs to share defs and enable per-share profile counters

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #64416 from adk3798/tentacle-smb-custom-ports

tentacle: smb: support custom ports

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #64368 from VallariAg/wip-71987-tentacle

tentacle: mgr/cephadm/module.py: Run ok_to_stop logic for stop

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #64623 from idryomov/wip-71961-tentacle

tentacle: librbd: images aren't closed in group_snap_*_by_record() on error

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

Merge pull request #64598 from idryomov/wip-cephadm-rbd-iscsi-ignore-mon-down-tentacle

tentacle: qa/rbd/iscsi: ignore MON_DOWN warning in logs

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Adam King adking@redhat.com

Merge pull request #64590 from idryomov/wip-70917-tentacle

tentacle: test/rbd: remove unit tests about cache tiering

Reviewed-by: Ramana Raja <rraja@redhat.com>

Merge pull request #64512 from adk3798/tentacle-allow-cephadm-container-image-tag

tentacle: qa/tasks/cephadm: override container image tags

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #64511 from adk3798/tentacle-cephadm-no-new-daemon-on-port-change-mid-upgrade

tentacle: mgr/cephadm: don't remove and deploy new daemon if ports change during upgrade

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #64510 from adk3798/tentacle-cephadm-cluster-count-missing-data-dir

tentacle: cephadm: Fix get_cluster_count when data_dir is missing

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #64383 from adk3798/tentacle-smb-rados-chunk-size

tentacle: mgr/smb: remove restriction on 1MiB smb config objects in rados

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #64371 from Nordix/wip-fix-69610

tentacle: orch: Pass TLS certificates when Rook orchestrator is used

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #64629 from rhcs-dashboard/wip-72104-tentacle

tentacle: mgr/dashboard: differentiate account users from rgw users in bucket form

Merge pull request #64643 from zdover23/wip-doc-2025-07-23-backport-64640-to-tentacle

tentacle: doc/cephfs: edit disaster-recovery.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #64637 from ronen-fr/wip-rf-relnotes-duringrecovery

PendingReleaseNotes(RADOS): mention the removal of osd_repair_during_recovery config option

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Laura Flores <lflores@redhat.com>

doc: PendingReleaseNotes(RADOS): note removal of 'osd_repair_during_recovery' config option

Removed in https://github.com/ceph/ceph/pull/60872.
Fixes: https://tracker.ceph.com/issues/71329
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #64646 from zdover23/wip-doc-2025-07-23-backport-64639-to-tentacle

tentacle: doc/radosgw: edit config-ref.rst

Merge pull request #64578 from connorfawcett/tentacle-crushtool-flags-backport

tentacle: crushtool: init with CINIT_FLAG_NO_DAEMON_ACTIONS

doc/radosgw: edit config-ref.rst

Follow up on the suggestions made by Anthony D'Atri in
https://github.com/ceph/ceph/pull/64532.

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

doc/cephfs: edit disaster-recovery.rst

Follow up on the suggestions made by Anthony D'Atri in
https://github.com/ceph/ceph/pull/64604.

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

cephadm/nvmeof: add DSA acceleration support with conditional mounts and privileges

Signed-off-by: Alexander Indenbaum <aindenba@redhat.com>
(cherry picked from commit 3c94c1a4c3f77c2683001264c759779bab1d486d)

Merge pull request #64607 from zdover23/wip-doc-2025-07-21-backport-64604-to-tentacle

tentacle: doc/cephfs: edit disaster-recovery.rst

Reviewed-by: Josh Durgin <jdurgin@ibm.com>

Merge pull request #64398 from zdover23/wip-doc-2025-07-09-backport-64162-to-tentacle

tentacle: doc: do not depend on typed-ast

Reviewed-by: Josh Durgin <jdurgin@ibm.com>

Merge pull request #64265 from zdover23/wip-doc-2025-06-30-backport-62785-to-tentacle

tentacle: pybind/mgr: Fix missing empty lines in mgr_module.py

Reviewed-by: Josh Durgin <jdurgin@ibm.com>

mgr/dashboard: Storage Class - Update

Fixes: https://tracker.ceph.com/issues/72156
Signed-off-by: Dnyaneshwari Talwekar <dtalwekar@redhat.com>
(cherry picked from commit bcc1e34a28e5ea743f12519d76526652773b4ca7)

mgr/dashboard: Glacier Storage Class - create and list
Fixes: https://tracker.ceph.com/issues/71897
Signed-off-by: Dnyaneshwari Talwekar <dtalwekar@redhat.com>
(cherry picked from commit 68766699bafc16a16b82f0d72f1f3e074988c5ca)

mgr/dashboard: Local Storage Class - create and list
Fixes: https://tracker.ceph.com/issues/71460
Signed-off-by: Dnyaneshwari Talwekar <dtalwekar@redhat.com>
(cherry picked from commit 675057f4204acd454fd6f0b0064fcdba925f1f4a)

mgr/dashboard: Tieiring - allow read through

Fixes: https://tracker.ceph.com/issues/71053
Signed-off-by: Dnyaneshwari Talwekar <dtalwekar@redhat.com>
(cherry picked from commit f9b84fae92e6a0174e4161b9e89f10a2c4b9b4fa)

mgr/dashboard: differentiate account users from rgw users in bucket form

fixes: https://tracker.ceph.com/issues/71523

commit includes:
1) Added checkbox to select account user and another dropdown to show account users
2) Also fixed bucket replication as it was throwing error for 'invalidBucketARN'

Signed-off-by: Naman Munet <naman.munet@ibm.com>
(cherry picked from commit c5b5408c5be8c64280de368093509ad4ef8e28ec)

Merge pull request #64204 from rishabh-d-dave/wip-71853-tentacle

tentacle: mgr/vol: include group name in subvolume's pool namespace name

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #64450 from joscollin/wip-72085-tentacle

tentacle: qa: increase the wait time to prevent check_counter failing

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #64538 from batrick/wip-72164-tentacle

tentacle:  mds: nudge log for unstable locks after early reply

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #64579 from joscollin/wip-72184-tentacle

tentacle: qa: increase the randomness to trigger the directory import/export

Reviewed-by: Venky Shankar <vshankar@redhat.com>

librbd: Clean up usage of IoCtx

Clean up of librbd::IoCtx to librados::IoCtx in Group.cc

Signed-off-by: Miki Patel <miki.patel132@gmail.com>
(cherry picked from commit ac14330994f42e92ed54e0a8857fea4f775c4fe5)

librbd: images aren't closed in group_snap_*_by_record() on error

Fixes memory leak and handles resource leak scenario when at leat one IoCtx is not
created successfully. This is done by returning error before opening any image.
Changes are made in group_snap_remove_by_record and group_snap_rollback_by_record

Fixes: https://tracker.ceph.com/issues/71961
Signed-off-by: Miki Patel <miki.patel132@gmail.com>
(cherry picked from commit 693eabf58cc19eba4c21e2ea7c0011643659b3c3)

Merge pull request #64457 from cbodley/wip-72091-tentacle

tentacle: deb/mgr: remove deprecated distutils from ceph-mgr.requires

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #64594 from Hezko/wip-72181-tentacle

tentacle: mgr/dashboard: nvmeof cli feedback fixes

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #64506 from NitzanMordhai/wip-72119-tentacle

tentacle: mixed balance read and rwordered in read ops

Reviewed-by: Laura Flores <lflores@redhat.com>

Merge pull request #63803 from badone/tentacle

Tentacle: OSDMonitor: Make sure pcm is initialised

Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>

doc/cephfs: edit disaster-recovery.rst

Edit the section "Data Pool Damage" in doc/cephfs/disaster-recovery.rst.
This commit is part of the project of improving the data-recovery parts
of the CephFS documentation, as requested in the Ceph Power Users
Feedback Summary in mid-2025.

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

Merge pull request #64415 from ljflores/wip-72053-tentacle

tentacle: osd: Multiple fixes to optimized EC and peering

Reviewed-by: Alex Ainscow <aainscow@uk.ibm.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #64576 from ronen-fr/wip-rf-64567-tentacle

tentacle: osd/scrub: allow auto-repair on operator-initiated scrubs

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Update bucket_logging.rst

Signed-off-by: nbalacha <nibalach@redhat.com>

Merge branch 'tentacle' into wip-72166-tentacle

Signed-off-by: nbalacha <nithya.balachandran@ibm.com>

mgr/dashboard: nvmeof cli rename ns to namespace, fixes for text responses, subsys add params

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>
(cherry picked from commit 702dfddf23036e6ec79e4b9d5eac7d09637971b8)

client: prohibit unprivileged users from setting sgid/suid bits

Prior to fb1b72d, unprivileged users could add mode bits as long as
S_ISUID and S_ISGID were not included in the change.

After fb1b72d, unprivileged users were allowed to modify S_ISUID and
S_ISGID bits only when no other mode bits were changed in the same
operation. This inadvertently permitted unprivileged users to set
S_ISUID and/or S_ISGID bits when they were the sole bits being modified.

This behavior should not be allowed. Unprivileged users should be
prohibited from setting S_ISUID and/or S_ISGID bits under any
circumstances.

This change tightens the permission check to prevent unprivileged
users from setting these privileged bits in all cases.

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

qa/rbd/iscsi: ignore MON_DOWN warning in logs

These seem to be popping up very briefly and don't
appear to be relevant to what is being tested

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

Merge pull request #64570 from Hezko/wip-72180-tentacle

tentacle: mgr/dashboard: support human friendly size parameter split commands to separate api and cli functions

Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #64542 from Hezko/wip-72165-tentacle

tentacle: mgr/dashboard: add help for nvmeof cli

Reviewed-by: Nizamudeen A <nia@redhat.com>

test: remove unit tests about cache tiering

Cache tiering was deprecated in the Reef release,
so we are no longer supporting any issues related
to it.

Ref: https://docs.ceph.com/en/latest/rados/operations/cache-tiering/

Fixes: https://tracker.ceph.com/issues/70917
Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit b6dd408c87b384ce88b097f706f324e50fc61ace)

qa: increase the randomness to trigger the directory import/export

Fixes: https://tracker.ceph.com/issues/65770
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit a4ef269d1e47e639029a86e35304cf6ba0df4ce7)

tentacle: crushtool: init with CINIT_FLAG_NO_DAEMON_ACTIONS

A change to mempool https://github.com/ceph/ceph/pull/55696 has
exposed a use after free bug in crushtool during process exit
where dtors are being called to free up mempool data structures
at the same time that the ceph context service thread is trying
to update them.

This commit modifies crushtool's initialization to prevent
this (unneeded) thread from being created. See issue for more
details about why the thread was not terminiating.

Fixes: https://tracker.ceph.com/issues/71027
Signed-off-by: Connor Fawcett <connorfa@uk.ibm.com>
(cherry picked from commit 2f3ffff3476763bd7cb6ecd378b16cd39eb5f302)

Merge branch 'tentacle' into wip-72160-tentacle

Signed-off-by: nbalacha <nithya.balachandran@ibm.com>

osd/scrub: allow auto-repair on operator-initiated scrubs

Previously, operator-initiated scrubs would not auto-repair, regardless
of the value of the 'osd_scrub_auto_repair' config option.  This was
less confusing to the operator than it could have been, as most
operator commands would in fact cause a regular periodic scrub
to be initiated. However, that quirk is now fixed: operator commands
now trigger 'op-initiated' scrubs. Thus the need for this patch.

The original bug was fixed in https://github.com/ceph/ceph/pull/54615,
but was unfortunately re-introduced later on.
Fixes: https://tracker.ceph.com/issues/72178
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 97de817ad1c253ee1c7c9c9302981ad2435301b9)

Merge pull request #64442 from ronen-fr/wip-rf-noempty-64429-tentacle

tentacle: qa/standalone/scrub: fix "scrubbed in 0ms" in osd-scrub-test.sh

Merge pull request #64419 from ljflores/wip-72023-tentacle

tentacle: qa/tasks: generalize stuck pg ignorelist entry

Merge pull request #64414 from ljflores/wip-72052-tentacle

tentacle: Optimised EC: Ignore snapshot scrubbing on non-primary shards

mgr/dashboard: split ns add to separate api and cli functions

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>
(cherry picked from commit f93afc474675f364972ee2719ad284f0ac850740)

Merge pull request #64556 from zdover23/wip-doc-2025-07-17-backport-64537-to-tentacle-take-two

tentacle: doc/radosgw: Improve formatting and language in bucket_logging.rst

rgw: fix bucket logging AuthType field

Bucket logging now detects the AuthType log record field for unauthenticated
requests correctly.

Fixes: https://tracker.ceph.com/issues/71731
Signed-off-by: N Balachandran <nithya.balachandran@ibm.com>
(cherry picked from commit 517ab7612a218e14afd3f1bfd42b72ebb789ceb1)

rgw: fix aclRequired for bucket-logging

The aclRequired field in the bucket log is meant to indicate
that an acl was required to authorize the operation. This change
introduces a new field in the req_state to track whether an acl was
checked to authorize the request.

Fixes: https://tracker.ceph.com/issues/71730
Signed-off-by: N Balachandran <nithya.balachandran@ibm.com>
(cherry picked from commit 7ab070413cff8a6954142fa7855d6d258822eadf)

doc/radosgw: Improve formatting and language in bucket_logging.rst

Trim trailing extra line characters around main title.

Add missing full stops in list items.

Use double backticks for configuration options, data etc.

Linkify reference to REST API.

No hyphen in "regular expression".

Fix section hierarchy by moving "Log Records" up 2 levels and try to
make the section title more consistent with another section title.

Try to improve partial sentences and try to simplify one sentence.

Remove whitespace at otherwise empty line.

Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>
(cherry picked from commit a19834c2bbdef6feb7b4bf5266d40f4d427a8247)

Merge pull request #64515 from afreen23/wip-72146-tentacle

tentacle: mgr/dashboard: Fix smb module enablement

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>

tentacle: rgw: point to the correct s3test repo and branch

revert this commit: 46b22fcea6aa8fe6bd18dceaff8eebe6c9e7246b

Signed-off-by: Yuval Lifshitz <ylifshit@ibm.com>

mgr/dashboard: add help for nvmeof cli

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>
(cherry picked from commit f7f93b2c7a8bf3730fe4f82a9f4a30bb2ee89b68)

Merge pull request #63773 from zdover23/wip-doc-2025-06-06-backport-63740-to-tentacle

tentacle: doc/mgr: edit telemetry (3 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #64546 from zdover23/wip-doc-2025-07-17-backport-64532-to-tentacle

tentacle: doc/radosgw: edit "Lifecycle Settings"

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/mgr: edit telemetry (3 of x)

Improve the English and the formatting in doc/mgr/telemetry.rst. This
follows up on https://github.com/ceph/ceph/pull/63476.

This commit edits the third hundred lines in doc/mgr/telemetry.rst.

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

doc/radosgw: edit "Lifecycle Settings"

Edit the section "Lifecycle Settings" in the file
doc/radosgw/config-ref.rst. Remove solecisms and pleonasms and plain old
infelicitious formulations.

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

Merge pull request #64533 from zdover23/wip-doc-2025-07-16-backport-64328-to-tentacle

tentacle: doc/rgw/logging: fix journal record format

Reviewed-by: Yuval Lifshitz <ylifshit@ibm.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #63808 from zdover23/wip-doc-2025-06-09-backport-63781-to-tentacle

tentacle: doc/mgr: edit telemetry.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

test/d4n: Change cleaning interval values to ints

Signed-off-by: Samarah <samarah.uriarte@ibm.com>
(cherry picked from commit bb353741a7d94310563f04ce79eb720ec2fbd50d)

doc/cephfs: add mds_allow_batched_ops to conf ref

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit 80c086a7d9028fd9147e23237e0cbce695e01464)

mds: nudge log for unstable locks after early_reply

A getattr/lookup can cause a wrlock or xlock to become unstable after a request
(like rename) acquires it but before early reply. The MDS will not nudge the
log in this situation and the getattr/lookup will need to wait for the eventual
journal flush before the lock is released.

Now looks like:

    2025-06-27T19:41:32.043+0000 7f11d21a9640  5 mds.0.log _submit_thread 25185408~2845 : EUpdate rename [metablob 0x1, 3 dirs]
    2025-06-27T19:41:32.043+0000 7f11d99b8640  1 -- [v2:172.21.10.4:6868/56297870,v1:172.21.10.4:6869/56297870] --> [v2:172.21.10.4:6818/999439823,v1:172.21.10.4:6819/999439823] -- osd_op(unknown.0.23:135 2.e 2:7bf7e7b5:::200.00000006:head [write 19584~2865 [fadvise_dontneed] in=2865b] snapc 0=[] ondisk+write+known_if_redirected+full_force+supports_pool_eio e72) -- 0x563e9b730000 con 0x563e9a674800
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (dn xlock x=1 by request(client.4393:20702 nref=6 cr=0x563e9b83ae00)) on [dentry #0x1/a/file [2,head] auth (dn xlock x=1 by request(client.4393:20702 nref=6 cr=0x563e9b83ae00)) (dversion lock w=1 last_client=4393) pv=14558 v=14556 ap=2 ino=0x10000000002 remote_ino=0x0 referent_inode_ptr=(nil) referent_ino=0x0 state=1610612736 | request=1 lock=2 inodepin=1 dirty=1 waiter=0 authpin=1 0x563e95629900]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (dn xlock x=1 by request(client.4393:20702 nref=6 cr=0x563e9b83ae00)) on [dentry #0x1/b/file [2,head] auth NULL (dn xlock x=1 by request(client.4393:20702 nref=6 cr=0x563e9b83ae00)) (dversion lock w=1 last_client=4393) pv=14557 v=14555 ap=2 ino=(nil) remote_ino=0x0 referent_inode_ptr=(nil) referent_ino=0x0 state=1610612736 | request=1 lock=2 inodepin=0 dirty=1 waiter=0 authpin=1 0x563e95629b80]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (dversion lock w=1 last_client=4393) on [dentry #0x1/a/file [2,head] auth (dn xlock x=1 by request(client.4393:20702 nref=6 cr=0x563e9b83ae00)) (dversion lock w=1 last_client=4393) pv=14558 v=14556 ap=2 ino=0x10000000002 remote_ino=0x0 referent_inode_ptr=(nil) referent_ino=0x0 state=1610612736 | request=1 lock=2 inodepin=1 dirty=1 waiter=0 authpin=1 0x563e95629900]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (dversion lock w=1 last_client=4393) on [dentry #0x1/b/file [2,head] auth NULL (dn xlock x=1 by request(client.4393:20702 nref=6 cr=0x563e9b83ae00)) (dversion lock w=1 last_client=4393) pv=14557 v=14555 ap=2 ino=(nil) remote_ino=0x0 referent_inode_ptr=(nil) referent_ino=0x0 state=1610612736 | request=1 lock=2 inodepin=0 dirty=1 waiter=0 authpin=1 0x563e95629b80]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (ifile excl w=1) on [inode 0x10000000001 [...2,head] /b/ auth v29159 pv29165 ap=1 DIRTYPARENT f(v0 m2025-06-27T19:41:32.017971+0000) n(v0 rc2025-06-27T19:41:32.017971+0000 1=0+1) (isnap sync r=1) (inest lock w=1) (ifile excl w=1) (iversion lock w=1 last_client=4393) caps={4393=pAsLsXsFsx/-@955},l=4393 | request=0 lock=4 dirfrag=1 caps=1 dirtyparent=1 dirty=1 authpin=1 0x563e9a6f5080]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (inest lock w=1 dirty) on [inode 0x1 [...2,head] / auth v179 snaprealm=0x563e9a6ce6c0 f(v0 m2025-06-27T19:09:29.187695+0000 2=0+2) n(v45 rc2025-06-27T19:41:31.249722+0000 3=0+3)/n(v0 rc2025-06-27T19:08:43.024940+0000 1=0+1) (isnap sync r=2) (inest lock w=1 dirty) caps={4359=pAsLsXsFs/-@83,4393=pAsLsXsFs/-@1245} | dirtyscattered=1 request=0 lock=2 dirfrag=1 caps=1 openingsnapparents=0 dirty=1 authpin=0 0x563e9a6f4b00]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (inest lock w=1) on [inode 0x10000000001 [...2,head] /b/ auth v29159 pv29165 ap=1 DIRTYPARENT f(v0 m2025-06-27T19:41:32.017971+0000) n(v0 rc2025-06-27T19:41:32.017971+0000 1=0+1) (isnap sync r=1) (inest lock w=1) (ifile excl w=1) (iversion lock w=1 last_client=4393) caps={4393=pAsLsXsFsx/-@955},l=4393 | request=0 lock=4 dirfrag=1 caps=1 dirtyparent=1 dirty=1 authpin=1 0x563e9a6f5080]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (iquiesce lock w=1 last_client=4393) on [inode 0x10000000000 [...2,head] /a/ auth v29161 pv29163 ap=3 DIRTYPARENT f(v0 m2025-06-27T19:41:32.017971+0000 1=1+0) n(v0 rc2025-06-27T19:41:32.017971+0000 2=1+1) (isnap sync r=2) (inest lock w=1) (ifile lock->sync w=1) (iversion lock w=1 last_client=4393) (iquiesce lock w=1 last_client=4393) caps={4359=pAsLsXs/-@109,4393=pAsLsXs/-@955} | request=1 lock=5 dirfrag=1 caps=1 dirtyparent=1 dirty=1 waiter=1 authpin=1 0x563e9a6f5600]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (isnap sync r=1) on [inode 0x10000000001 [...2,head] /b/ auth v29159 pv29165 ap=1 DIRTYPARENT f(v0 m2025-06-27T19:41:32.017971+0000) n(v0 rc2025-06-27T19:41:32.017971+0000 1=0+1) (isnap sync r=1) (inest lock w=1) (ifile excl w=1) (iversion lock w=1 last_client=4393) caps={4393=pAsLsXsFsx/-@955},l=4393 | request=0 lock=4 dirfrag=1 caps=1 dirtyparent=1 dirty=1 authpin=1 0x563e9a6f5080]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (isnap sync r=2) on [inode 0x1 [...2,head] / auth v179 snaprealm=0x563e9a6ce6c0 f(v0 m2025-06-27T19:09:29.187695+0000 2=0+2) n(v45 rc2025-06-27T19:41:31.249722+0000 3=0+3)/n(v0 rc2025-06-27T19:08:43.024940+0000 1=0+1) (isnap sync r=2) (inest lock w=1 dirty) caps={4359=pAsLsXsFs/-@83,4393=pAsLsXsFs/-@1245} | dirtyscattered=1 request=0 lock=2 dirfrag=1 caps=1 openingsnapparents=0 dirty=1 authpin=0 0x563e9a6f4b00]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (iversion lock w=1 last_client=4393) on [inode 0x10000000000 [...2,head] /a/ auth v29161 pv29163 ap=3 DIRTYPARENT f(v0 m2025-06-27T19:41:32.017971+0000 1=1+0) n(v0 rc2025-06-27T19:41:32.017971+0000 2=1+1) (isnap sync r=2) (inest lock w=1) (ifile lock->sync w=1) (iversion lock w=1 last_client=4393) (iquiesce lock w=1 last_client=4393) caps={4359=pAsLsXs/-@109,4393=pAsLsXs/-@955} | request=1 lock=5 dirfrag=1 caps=1 dirtyparent=1 dirty=1 waiter=1 authpin=1 0x563e9a6f5600]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log NO (iversion lock w=1 last_client=4393) on [inode 0x10000000001 [...2,head] /b/ auth v29159 pv29165 ap=1 DIRTYPARENT f(v0 m2025-06-27T19:41:32.017971+0000) n(v0 rc2025-06-27T19:41:32.017971+0000 1=0+1) (isnap sync r=1) (inest lock w=1) (ifile excl w=1) (iversion lock w=1 last_client=4393) caps={4393=pAsLsXsFsx/-@955},l=4393 | request=0 lock=4 dirfrag=1 caps=1 dirtyparent=1 dirty=1 authpin=1 0x563e9a6f5080]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 10 mds.0.locker nudge_log YES (ifile lock->sync w=1) on [inode 0x10000000000 [...2,head] /a/ auth v29161 pv29163 ap=3 DIRTYPARENT f(v0 m2025-06-27T19:41:32.017971+0000 1=1+0) n(v0 rc2025-06-27T19:41:32.017971+0000 2=1+1) (isnap sync r=2) (inest lock w=1) (ifile lock->sync w=1) (iversion lock w=1 last_client=4393) (iquiesce lock w=1 last_client=4393) caps={4359=pAsLsXs/-@109,4393=pAsLsXs/-@955} | request=1 lock=5 dirfrag=1 caps=1 dirtyparent=1 dirty=1 waiter=1 authpin=1 0x563e9a6f5600]
    2025-06-27T19:41:32.043+0000 7f11d99b8640 20 mds.0.locker : request(client.4393:20702 nref=5 cr=0x563e9b83ae00)
    2025-06-27T19:41:32.043+0000 7f11d99b8640 20 mds.0.log _submit_entry EUpdate rename [metablob 0x1, 3 dirs]

Easily reproducible with two ceph-fuse clients. One session doing:

    $ mkdir a b
    $ touch a/file
    $ while true; do mv -v a/file b/file; mv -v b/file a/file; done

and the other

    $ while true; do stat a/file; done

You can observe the rename/stat stalls (up to 5 seconds; MDS tick interval) without this patch.

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

mds: allow disabling batch ops

To address a bug and future ones where batching lookup/getattr does not help
"kick" the MDS in switching state more quickly (e.g. flushing the MDS journal).

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit 0201f86e6939a3d787bea755a48cb4b4254d2f9c)

common/options: chomp whitespace

If there are trailing newlines in a string (like long_desc), then the generated
C++ code is invalid (because the newline will not be escaped).

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit 73792b78b4b520bcbfac254528f79a80b4d331c5)

Merge pull request #64529 from zdover23/wip-doc-2025-07-16-backport-64433-to-tentacle

tentacle: doc: update mgr modules notify_types

doc/mgr: edit telemetry.rst

Edit doc/mgr/telemetry.rst.

Incorporate Anthony D'Atri's suggestions from
https://github.com/ceph/ceph/pull/63739.

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

doc/rgw/logging: fix journal record format

Fixes: https://tracker.ceph.com/issues/71945
Signed-off-by: Yuval Lifshitz <ylifshit@ibm.com>
(cherry picked from commit 2dd5edf17aed392dc51a0fe9d55fa9963574ced1)

doc: update mgr modules notify_types

Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>
(cherry picked from commit fc4396d6280fcbf0a95567cff144052d81dcd964)

mgr/dashboard: Fix smb module enablement

- changed prop name to `module_name` to avoid confusion while pasisng input props
- the module name is required to enable module

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit 8f2a88eb4dd8e779044e7cd5b48c90f290303912)

qa/tasks/cephadm: override container image tags

By default, container image name is tagged by branch name or
by sha1, i.e. corresponding values suffixed ':' are appended
to the image value.

This patch allows to override the tagging just by providing
desired tag with the standard notation using ':' separator
in the container image parameter value of cephadm task.

Fixes: https://tracker.ceph.com/issues/71844
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>
(cherry picked from commit 0a7931f5ab478b9060b5bca79c95bf56ff699d0d)

mgr/cephadm: don't remove and deploy new daemon if ports change during upgrade

If we're not mid-upgrade, a port/ip change is most likely a user
changing the configuration for the daemon and starting a new
daemon with the new ports can be justified. During upgrade, their
are a number of different upgrade paths (espeically considering
our N+2 upgrade support) where something internal to cephadm
has made the ip we're binding to or the ports being used
change. In these cases, the process of upgrading the daemon
will resolve the issue. Howeverm by having the scheduler
unilaterally remove and deploy fresh versions of daemons
when it sees port changes, we may effectively "upgrade" some
daemons out of the intended order just to make the ports
match up. This was seen with nvmeof which needs to be upgraded
after the mon daemons, but was being removed and redeployed
after the mgr upgrade once cephadm saw the set of expected
ports had changed.

This patch adds a new "upgrade_in_progress" attribute to the
HostAssignment class in the scheduler to make it aware of
an ongoing upgrade. It also changes the behavior specifically
around whether a daemon matches another if the ports match
up when "upgrade_in_progress" was set to True.

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

Merge pull request #64495 from zdover23/wip-doc-2025-07-15-backport-63877-to-tentacle

tentacle: doc/rados/ops: edit cache-tiering.rst

cephadm: Fix get_cluster_count when data_dir is missing

It is possible for cephadm, if it fails to create a cluster, to direct
the user to delete the cluster even though the data_dir has not yet been
created. Running that command would fail during the cluster count check.

Signed-off-by: James Oakley <jfunk@funktronics.ca>
(cherry picked from commit 8e39f8911c4a485975d6adb04b04893e43128e67)

PrimeryLogPG: don't accept ops with mixed balance_reads and rwordered flags

do_op can't accept mixed flag of rwordered and balance_read

Fixes: https://tracker.ceph.com/issues/70715
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit f68b2178a24613960fe1303ece413b24f3ea02e7)

Objecter: remove balance_read and localize_read if rwordered

Objecter shouldn't sent ops with mixed rwordered and balance_read flags

Fixes: https://tracker.ceph.com/issues/70715
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit 40292f2fd10f338c9baab60a019dfe4806e642c7)

doc/rados/ops: edit cache-tiering.rst

Add material to doc/rados/operations/cache-tiering.rst, as suggested by
Anthony D'Atri in
https://github.com/ceph/ceph/pull/63745#discussion_r2127887785.

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