doc/rbd: explicit remind the directory access right

It needs to create admin socket to use perf counter for
debug purpose. Remind the access right to directory.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>

Merge pull request #34732 from lxbsz/fs_fix_new

qa: misc fixes to run for cephfs qa test

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #31912 from zjcmszh/cmpext

pybind/rados: add Ioctx::cmpext()

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

test/pybind/test_rados.py: test Ioctx::cmpext()
Signed-off-by: Zhang Jiao <zhangjiao@cmss.chinamobile.com>

pybind/rados: add Ioctx:cmpext()
Signed-off-by: Zhang Jiao <zhangjiao@cmss.chinamobile.com>

Merge pull request #34578 from lxbsz/volume_client_py3

qa/volume_client: be python3 compatible

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

qa/tasks/cephfs: switch to StringIO to fix byte-like errors

Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/cephfs: switch to mount_wait() to avoid possible umounted assert

For the fuse mount, it sometime will need to wait to a moment to let
the client get ready.

Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/tasks/cephfs/fuse_mount: fix possible chmod 1777 error

INFO:teuthology.orchestra.run.smithi13a2:> (cd /home/ubuntu/cephtest && exec sudo chmod 1777 /home/ubuntu/cephtest/mnt.2)
INFO:teuthology.orchestra.run.smithi132.stderr:chmod: changing permissions of '/home/ubuntu/cephtest/mnt.2': Permission denied
DEBUG:teuthology.orchestra.run:got remote process result: 1

Here just wait and rety for 10 times.

Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/tasks/vstart_runner: remove the stdin str type check

For the "ceph-dencoder" it will use the byte type data.

Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/cephfs: fix AssertionError: CommandFailedError not raised under py3

Signed-off-by: Xiubo Li <xiubli@redhat.com>

Merge pull request #34697 from dillaman/wip-44596

rbd-mirror: skip snapshot image-sync for newly created/cloned images

Reviewed-by: Mykola Golub <mgolub@suse.com>

Merge pull request #34751 from tchaikov/wip-doc-fix

doc/releases/mimic.rst: add title underline

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #34741 from tchaikov/wip-teuthology-cronjobs-mimic

qa/tests: pass "-t 2" to teuthology-suite when testing mimic

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

doc/releases/general.rst: add mising link targets

they are referenced by 60c825486916d0b0b43248a0966d2ecb90f352df

Signed-off-by: Kefu Chai <kchai@redhat.com>

doc/releases: silence sphinx warnings

* mimic.rst: add title underline

to address sphinx warning like:
```
WARNING: Title underline too short.
```

* octopus.rst: use consistent underline

to address following sphinx warning:
```
doc/releases/octopus.rst:49: WARNING: Title level inconsistent:
```

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #34698 from matthewoliver/cephadm_check_pool_exists

cephadm: Check for pool existence for iscsi And NFS

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #34676 from sebastian-philipp/cephadm-inventory-class

mgr/cephadm: add Inventory class

Merge pull request #34695 from mgfritch/cephadm-iscsi-container-image

mgr/cephadm: allow config for an iscsi `container_image`

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #34718 from mgfritch/cephadm-mgr-is-available

cephadm: catch Exception during is_mgr_available

Reviewed-by: Joshua Schmid <jschmid@suse.de>

Merge pull request #34619 from sebastian-philipp/qa-adopt-specific-commit

qa/cephadm: make test_adoption checkout a specific commit

Merge pull request #34693 from sebastian-philipp/cephadm-warn-master-improvement

cephadm: improve warn message

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #34675 from sebastian-philipp/cephadm-service-rm-feedback

mgr/cephadm: remove_service: Feedback, if spec not found

Reviewed-by: Joshua Schmid <jschmid@suse.de>

qa/tests: pass "-t 2" to teuthology-suite when testing mimic

it's an oversight in 21dacc823be184718584c5fd3b647e87b3eeba42

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #34142 from rhcs-dashboard/wip-44667-fix-reload-issues

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #34730 from theanalyst/docs/release-updates-04-20

docs: release updates for nautilus,mimic,octopus

Reviewed-By: Nathan Cutler <ncutler@suse.com>

Merge pull request #34673 from sebastian-philipp/cephadm-man

doc/man: add cephadm

Reviewed-by: Alexandra Settle <asettle@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>

Merge pull request #34725 from lxbsz/_type_equality_funcs

qa/tasks/cephfs/test_scrub: fix self.assertEqual no attribute '_type_equality_funcs'

Reviewed-by: Kefu Chai <kchai@redhat.com>

doc: update release.yml with octopus, nautilus & mimic

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

doc: releases: add release notes for v14.2.9

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #34726 from lxbsz/dict_key_error

qa/tasks/cephfs/cephfs_test_case: switch 'dict_keys' object to list

Reviewed-by: Kefu Chai <kchai@redhat.com>

doc: release notes for v13.2.10 mimic

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

doc: releases: release notes for v13.2.9 mimic

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

doc: releases: v15.2.1 release notes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

qa/tasks/cephfs/test_volumes: to make sure the size is int type

Fix "Error EINVAL: invalid size option '4915200.0'".

In pytho2 int/2 will get a int type result, but in python3 it maybe
a float type.

Fixes: https://tracker.ceph.com/issues/45247
Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/tasks/cephfs/mount: to make sure that the count/seek are int type

To fix "stderr:dd: invalid number: '5.0'".

Fixes: https://tracker.ceph.com/issues/45247
Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/tasks/cephfs/test_scrub: fix self.assertEqual no attribute '_type_equality_funcs'

Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/tasks/cephfs/cephfs_test_case: switch 'dict_keys' object to list

Fix the "TypeError: 'dict_keys' object does not support indexing" under
py3.

Signed-off-by: Xiubo Li <xiubli@redhat.com>

Merge pull request #33769 from lxbsz/qa_vstart_runner_os

qa/vstart_runner.py: add os and arch properties support

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

qa/tasks/vstart_runner: make remote.sh return str as default

To address the issue in https://github.com/ceph/teuthology/pull/1459.

Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/vstart_runner.py: add os and arch properties support

Fixes: https://tracker.ceph.com/issues/44456
Signed-off-by: Xiubo Li <xiubli@redhat.com>

Merge pull request #34685 from lxbsz/vstart_runner

qa/tasks/cephfs/mount: switch to StringIO to fix TypeErrors

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

qa/tasks/cephfs/mount: switch to StringIO to fix TypeErrors

TypeError: cannot use a string pattern on a bytes-like object

Fixes: https://tracker.ceph.com/issues/45175
Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/vstart_runner: remove the debug info

Fixes: https://tracker.ceph.com/issues/45175
Signed-off-by: Xiubo Li <xiubli@redhat.com>

cephadm: Check for pool existance for iscsi And NFS

Currently both iscsi and NFS require pools to be specified when they are
deployed. However, we don't actaully check these pools exist. Leading to
broken containers.

This patch uses the rados client that is part of the mgrmodule to check
that the specified pool exists. As we need to check in 2 different
daemons, a helper method:

   def _check_pool_exists(self, pool, service_name):

was added to `cephadm/module.py`.

Fixes: https://tracker.ceph.com/issues/45161
Signed-off-by: Matthew Oliver <moliver@suse.com>

cephadm: catch Exception during is_mgr_available

Traceback (most recent call last):
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 4578, in <module>
    r = args.func()
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 1121, in _default_image
    return func()
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 2489, in command_bootstrap
    is_available('mgr', is_mgr_available)
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 895, in is_available
    if func():
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 2486, in is_mgr_available
    out = cli(['status', '-f', 'json-pretty'], timeout=timeout)
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 2403, in cli
    return CephContainer(
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 2140, in run
    out, _, _ = call_throws(
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 838, in call_throws
    raise RuntimeError('Failed command: %s' % ' '.join(command))

Signed-off-by: Michael Fritch <mfritch@suse.com>

rbd-mirror: skip snapshot image sync if mirror snapshot is marked clean

This is currently only utilized for the case where a newly created image
has mirroring enabled at time of creation, but it could be expanded in the
future if we track writes.

Fixes: https://tracker.ceph.com/issues/44596
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: EnableRequest now accepts a boolean to indicate a clean image

If the image is clean, it's treated as if it was newly created and
therefore clean since snapshot id 0. The CreateRequest and
CloneRequest state machines pass true for this bool if mirroring
is being enabled during creation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: pass clean_since_snap_id to CreatePrimaryRequest

This will be stored in the primary MirrorSnapshotNamespace for use by
the rbd-mirror snapshot replayer.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

cls/rbd: added clean_since_snap_id to MirrorSnapshotNamespace

It is only valid for primary snapshots so we can re-use the space
previously used by the primary_snap_id without the need to bump the
version id.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

rbd: add '--mirror-image-mode' optional to image creation actions

This allows the user to enable mirroring while creating, cloning,
copying, importing, or migrating an image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: save requested mirror image mode during migration prepare

Once the migration is committed, the requested mode will be applied.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: permit mirroring to be enabled upon image cloning

The librbd clone API's ImageOptions parameter now supports passing
the mirror image mode.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: add non-primary global image id to mirror enable

The constructor that took an ImageCtx did not support passing the
non-primary global image id and instead defaulted to an empty string.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: permit mirroring to be enabled upon image creation

The librbd create API's ImageOptions parameter now supports passing
the mirror image mode.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: mirror enable state machine might need to open image

If attempting to create a snapshot-based mirroring primary snapshot,
the image needs to first be opened. If we weren't supplied an image,
open the image, create the snapshot, and close the image again.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #34570 from cbodley/wip-bucket-layout-json

rgw: bucket layout fixes

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #34645 from cbodley/wip-rgw-reshard-target-layout

rgw: use target bucket layout for reshard

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #33937 from changchengx/unsigned_compare

librbd: fix unsigned value compared with zero

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #34694 from mikechristie/ceph-iscsi-selinux-fixes

ceph-iscsi:  selinux fixes

Reviewed-by: Boris Ranto <branto@redhat.com>

doc/man: add cephadm

Fixes: https://tracker.ceph.com/issues/44971
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

mgr/cephadm: unify apply tests

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

mgr/cephadm: unified add_daemon tests

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

mgr/cephadm: add cleanup to test_cephadm

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

mgr/cephadm: remove_service: Feedback, if spec not found

`ceph orch rm my-unknown-service` still returned
`Removed service my-unknown-service`.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #34678 from sebastian-philipp/doc-cephadm-install-fix-placement

doc/cephadm: install.rst: fix placement spec.

Reviewed-by: Alexandra Settle <asettle@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #34674 from sebastian-philipp/cephadm-ceph-volume-lock-if-fsid

cephadm: Aquire lock, if fsid != None

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #34620 from mgfritch/cephadm-timeout-test-fixup

qa/workunits/cephadm/test_cephadm.sh: extend timeout test

Merge pull request #34600 from dsavineau/issue_45120

cephadm: fix adopt prometheus command

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #34688 from sebastian-philipp/qa-test-cephadm-octopus-version

qa/workunits/cephadm/test_cephadm: Also test octopus

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #34691 from sebastian-philipp/cephadm-ssk-keyring-check_call

mgr/cephadm: use check_call  for `ssh-keygen`

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #33065 from ifed01/wip-ifed-spurious-readerr-alert

os/bluestore: introduce health alert on spurious read errors.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #34666 from rhcs-dashboard/44405-test-totp-increase-time

mgr/dashboard: fix tasks.mgr.dashboard.test_rgw.RgwBucketTest.test_all

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #34483 from dabukalam/master

doc/rados: Remove obsolete placement group note from EC pool creation

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #33916 from aclamk/fix-bs-avl-memaccounting

os/bluestore: Adds shutdown in destructor of AvlAllocator

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #34559 from tchaikov/wip-19076-refactor

mon/OSDMonitor: refactor loops for better readability

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #34328 from liewegas/cpatch

script/cpatch: initial version

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #34430 from yison/rwl-image-writeback-cache-seq4

rbd/cache: Replicated Write Log core codes part 4

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

mgr/cephadm: allow config for an iscsi `container_image`

ceph config set client.iscsi container_image <container_image>

Fixes: https://tracker.ceph.com/issues/45162
Signed-off-by: Michael Fritch <mfritch@suse.com>

selinux: Fix ceph-iscsi etc access

This fixes the selinux errors like this for /etc/target

-----------------------------------
Additional Information:
Source Context                system_u:system_r:ceph_t:s0
Target Context                system_u:object_r:targetd_etc_rw_t:s0
Target Objects                target [ dir ]
Source                        rbd-target-api
Source Path                   rbd-target-api
Port                          <Unknown>
Host                          ans8
Source RPM Packages
Target RPM Packages
Policy RPM                    selinux-policy-3.14.3-20.el8.noarch
Selinux Enabled               True
Policy Type                   targeted
Enforcing Mode                Enforcing
Host Name                     ans8
Platform                      Linux ans8 4.18.0-147.el8.x86_64 #1 SMP
Thu Sep 26
                              15:52:44 UTC 2019 x86_64 x86_64
Alert Count                   1
First Seen                    2020-01-08 18:39:48 EST
Last Seen                     2020-01-08 18:39:48 EST
Local ID                      9a13ee18-eaf2-4f2a-872f-2809ee4928f6

Raw Audit Messages
type=AVC msg=audit(1578526788.148:69): avc:  denied  { search } for
pid=995 comm="rbd-target-api" name="target" dev="sda1" ino=52198
scontext=system_u:system_r:ceph_t:s0
tcontext=system_u:object_r:targetd_etc_rw_t:s0 tclass=dir permissive=1

Hash: rbd-target-api,ceph_t,targetd_etc_rw_t,dir,search

which are a result of the rtslib library the ceph-iscsi daemons use
accessing /etc/target to read/write a file which stores meta data the
target uses.

Signed-off-by: Mike Christie <mchristi@redhat.com>

selinux: Fix ceph-iscsi configfs access

This fixes the the following selinux error when using ceph-iscsi's
rbd-target-api daemon (rbd-target-gw has the same issue). They are
a result of the a python library, rtslib, which the daemons use.

Additional Information:
Source Context                system_u:system_r:ceph_t:s0
Target Context                system_u:object_r:configfs_t:s0
Target Objects
/sys/kernel/config/target/iscsi/iqn.2003-01.com.re
                              dhat:ceph-iscsi/tpgt_1/attrib/authentication
[
                              file ]
Source                        rbd-target-api
Source Path                   /usr/libexec/platform-python3.6
Port                          <Unknown>
Host                          ans8
Source RPM Packages           platform-python-3.6.8-15.1.el8.x86_64
Target RPM Packages
Policy RPM                    selinux-policy-3.14.3-20.el8.noarch
Selinux Enabled               True
Policy Type                   targeted
Enforcing Mode                Enforcing
Host Name                     ans8
Platform                      Linux ans8 4.18.0-147.el8.x86_64 #1 SMP
Thu Sep 26
                              15:52:44 UTC 2019 x86_64 x86_64
Alert Count                   1
First Seen                    2020-01-08 18:39:47 EST
Last Seen                     2020-01-08 18:39:47 EST
Local ID                      6f8c3415-7a50-4dc8-b3d2-2621e1d00ca3

Raw Audit Messages
type=AVC msg=audit(1578526787.577:68): avc:  denied  { ioctl } for
pid=995 comm="rbd-target-api"
path="/sys/kernel/config/target/iscsi/iqn.2003-01.com.redhat:ceph-iscsi/tpgt_1/attrib/authentication"
dev="configfs" ino=25703 ioctlcmd=0x5401
scontext=system_u:system_r:ceph_t:s0
tcontext=system_u:object_r:configfs_t:s0 tclass=file permissive=1

type=SYSCALL msg=audit(1578526787.577:68): arch=x86_64 syscall=ioctl
success=no exit=ENOTTY a0=34 a1=5401 a2=7ffd4f8f1f60 a3=3052cd2d95839b96
items=0 ppid=1 pid=995 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0
egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm=rbd-target-api
exe=/usr/libexec/platform-python3.6 subj=system_u:system_r:ceph_t:s0
key=(null)

Hash: rbd-target-api,ceph_t,configfs_t,file,ioctl

Signed-off-by: Mike Christie <mchristi@redhat.com>

cephadm: improve warn message

make it more fancy!

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Co-authored-by: Michael Fritch <mfritch@suse.com>

Merge pull request #34669 from yuvalif/remove_queue_dependency

cls/2pc_queue: remove the dependency of cls_2pc_queue with cls_queue

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #34664 from yuvalif/clarify_topic_creation_format

rgw/doc: clarify topic creation format

Reviewed-by: Casey Bodley <cbodley@redhat.com>

mgr/cephadm: use check_call  for `ssh-keygen`

Mainly to provide any reasonable error

Fixes: https://tracker.ceph.com/issues/44832
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #34613 from cbodley/wip-44661

rgw: use DEFER_DROP_PRIVILEGES flag unconditionally

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

qa/workunits/cephadm/test_cephadm: Also test octopus

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #34621 from mgfritch/cephadm-test-cleanup

qa/workunits/cephadm/test_cephadm.sh: add CLEANUP var

Merge pull request #34568 from sebastian-philipp/orch-upgrade-usage

mgr/orch: upgrade: better input validation

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #34565 from SUSE/wip-fix-45095

cephadm: handle adopting offline OSDs

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #34442 from tspmelo/wip-fix-rgw-bucket-checkbox

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

doc/cephadm: install.rst: fix placement spec.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

qa/cephadm: make test_adoption checkout a specific commit

Reason is, I want to have a test run of test_adoption, *before* master is affected.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

mgr/cephadm: add Inventory class

This is just a minor cleanup.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

cephadm: Aquire lock, if fsid != None

Fixes:

```
Traceback (most recent call last):
  File "./cephadm", line 4494, in <module>
    r = args.func()
  File "./cephadm", line 1077, in _infer_fsid
    return func()
  File "./cephadm", line 1103, in _infer_image
    return func()
  File "./cephadm", line 2813, in command_ceph_volume
    l = FileLock(args.fsid)
  File "./cephadm", line 560, in __init__
    self._lock_file = os.path.join(LOCK_DIR, name + '.lock')
TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'
```

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #33479 from simon-rock/simon_split_stray

mds : enable fragmentation of stray dir when conditions are met

Merge pull request #34561 from kotreshhr/ceph-fs-status-output

mgr/status: Fix "ceph fs status" json format writing to stderr

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

Merge pull request #34546 from varshar16/wip-flake8-cephfs-shell

cephfs-shell: Fix multiple flake8 errors

Reviewed-by: Rishabh Dave <ridave@redhat.com>

Merge pull request #34534 from ajarr/fix-43061

mon/FSCommands: Fix 'add_data_pool' command and 'fs new' command

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #34164 from ukernel/wip-44382

qa/cephfs: update TestClusterFull:test_barrier

Reviewed-by: Jeff Layton <jlayton@redhat.com>