os/bluestore: bind attrs to bluestore_cache_meta mempool.

This seems to be a better choice over bluestore_cache_data

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit f4e09fc103454fa8a41b5ffb822639368a89522d)

 Conflicts:
src/os/bluestore/bluestore_types.h
 Caused by the lack of explicit std:: reference in headers - master has
 got this as a part of crimson effort.

os/bluestore: add missing structs to bluestore_cache_other mempool

Fixes: https://tracker.ceph.com/issues/47551
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 4592c5df554190065fa9a994f7b6dc3fed7ea214)

os/Bluefs: fix file reader/writer buffer mempool

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit 6a50c85067c03884473922318267769a9e77ef2e)

 Conflicts:
src/os/bluestore/bluestore_types.h
 Lacked explicit std:: ref in the target header

bluestore: _get_used_bytes should reflect new mempool fields

with bluestore_cache_other split further, the _get_used_bytes should
take into account the new mempool splits as well.

see also: 0ce8ee4b123eacfc2bfb14f554487e928512415a
  68ee931fd4b6bf748f95b14dae31d11738fbaf1e

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit d9f84b41eff99357585f27c89449e379a28a9212)

common/mempool: More detailed bluestore stats

Splits bluestore bluestore_cache_other, exposes accounting of some internals.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit bb488df5e4ffa1ec2b5d25d9af0ce7f5093d7470)

Introduce separate mempool for FileReaderBuffer and FileWriter

FileReaderBuffer and FileWriter uses Bufferlists which needs to be
tracked by mempool to get the proper memory usage.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit 9bb741c12cf1ffe3e9fec8e0d2fbaae107947215)

 Conflicts:
src/os/bluestore/BlueFS.cc
 trivial

split mempool allocation for bluestore_cache_other

While doing root cause analysis it bluestore_cache_other gives a bit of
a crude estimate, something more helpful would be to have it split into
the following fields:

- bluestore_cache_onode
- bluestore_cache_meta
- bluestore_onode_attrs

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit 1c6bc3893bf4cadae344ef19290f5c7e55dd5a62)

 Conflicts:
src/os/bluestore/bluestore_types.h
  Lacked explicit std:: namespace reference in headers which pacific has

Merge pull request #36953 from ceph/wip-octopus-bz1872983

octopus: ceph-volume: simple scan should ignore tmpfs

Merge pull request #36928 from jan--f/wip-47237-octopus

octopus: ceph-volume: support for mpath devices

Merge pull request #36925 from leseb/bp-36700-octopus

octopus: ceph-volume: retry when acquiring lock fails

Merge pull request #36852 from jan--f/wip-47146-octopus

octopus: ceph-volume: add libstoragemgmt support

Merge pull request #36975 from sebastian-philipp/octopus-backport-36765-36738-36757-36793-36509-36794-36571-36315-36817-36330-36752-3679

octopus: cephadm batch backport September (1)

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Joshua Schmid <jschmid@suse.com>

Merge pull request #37201 from tchaikov/octopus-doc-rtd

octopus: doc: enable Read the Docs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>

doc: add in-doc search from read the docs

readthedocs-sphinx-search features better user experience than the
builtin search offered by sphinx

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8bd8a8badbf992347a0883a537cce414432c867e)

doc: use plantweb as fallback of sphinx-ditaa

RTD does not support installing system packages, the only ways to install
dependencies are setuptools and pip. while ditaa is a tool written in
Java. so we need to find a native python tool allowing us to render ditaa
images. plantweb is able to the web service for rendering the ditaa
diagram. so let's use it as a fallback if "ditaa" is not around.

also start a new line after the directive, otherwise planweb server will
return 500 at seeing the diagram.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0cb56e0f13dc57167271ec7f20f11421416196a2)

doc/conf.py: exclude pybindings docs from build for RTD

because it'd difficult to prepare (dummy) librados,libcephfs and librbd for
their python bindings in the building environment offered by Read the Docs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 847e4ef941401e1b580e93d7058e8413bd131e21)

readthedocs: add .readthedocs.yml

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 99b75c14d2c84bad8a6b491e4981eeb481751c40)

Merge pull request #36840 from Huber-ming/octopus-loglevel

octopus: rgw: log resharding events at level 1 (formerly 20)

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

Merge pull request #36812 from Huber-ming/octopus-dump

octopus: rgw: dump transitions in RGWLifecycleConfiguration::dump()

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

Merge pull request #37080 from idryomov/wip-relax-preauth-asserts-octopus

octopus: msg/async/ProtocolV2: allow rxbuf/txbuf get bigger in testing

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

15.2.5

Merge pull request #37145 from linuxbox2/octopus-rgwlc-mtime

Octopus rgwlc mtime

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

rgwlc:  fix (post-parallel) non-current expiration

Object mtime had been lifted correctly into LCOpRule for
DMExpiration and, apparently, NonCurrentTransition, but not
for NonCurrentExpiration.

Some additional debug statements added at level 20.

Fixes: https://tracker.ceph.com/issues/47308
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

msg/async/ProtocolV2: allow rxbuf/txbuf get bigger in testing

We have a kernel client test case that constructs huge auth tickets
to exercise the three related code paths in the kernel.  One of the
tickets is bigger than 1000000 bytes, as required for triggering the
third code path.

We haven't bumped into this assert earlier because the kernel client
is still on msgr v1.  However, "rbd map" and "rbd unmap" commands
started connecting to the cluster in commit 96f05a7956b3 ("rbd: delay
determination of default pool name") and that happens via msgr v2.

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

mgr/cephadm: Add comments to secondary contaieners

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Co-authored-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 98c0119833b9fc9648d667f002d84b1ccb75f334)

cephadm: properly remove `osd-activate` container

Othwerise we end up with being unable to create
new containers, due to the name being already used

Fixes: https://tracker.ceph.com/issues/47170
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit bff74b01803bddd082cd9b4641a2d7fcbf080ef2)

mgr/cephadm: customize blink_device_light cmd via j2

Customized blink a device light. By default running something like:

    lsmcli local-disk-ident-led-on --path $path

If you must, you can customize this via:

    ceph config-key set mgr/cephadm/lsmcli_blink_lights_cmd '<my jinja2 template>'

where my jinja2 template is something like:

    lsmcli local-disk-{{ ident_fault }}-led-{{'on' if on else 'off'}} --path '{{ path or dev }}'

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit dc2dd8b19242d7b8da1f881ae128b2746d8ff398)

mgr/cephadm: Add extensive test for blink_device_light

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 17cdcdc73094f4cb4f45575e02434234cf9cebd8)

mgr/cephadm: PEP8tify test_migration.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit fa49f096066ab6e84e52cc122368eccbd56eb681)

cephadm: auto wrap and unwrap ipv6 addresses

This patch attempts to simplify IPv6 support in cephadm by automatically
wrapping and unwrapping IPv6 addresses when required.

There are some asumptions though, if you are supplyings an IPv6 addrv
then it needs to be wrapped. But because you are specifiying, you should
know what your doing.

But in general, it means in bootstrap you should be able to supply ipv6
addresses wrapped or not so long as there isn't a post appended.

Fixes: https://tracker.ceph.com/issues/46922
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit 09eac4bef0f04f5db7118f94dd9679f3295bddf8)

Conflicts:
src/pybind/mgr/dashboard/tools.py
src/python-common/ceph/deployment/service_spec.py

mgr/cephadm: PEP8tify module.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ce35b3381cf6ef28f233355e6c3844db606c1244)

mgr/cephadm: Verify non-empty list in get_active_daemon functions

The get_active_daemon functions for monitoring stack daemons
were just returning the first or last daemon in the given list
without checking the list actually contained any daemons

Fixes: https://tracker.ceph.com/issues/47171
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 2c440edebf7cd4e535bcb680bd7131f0d22daf7a)

mgr/cephadm: kick serve loop to trigger ceph.conf deployment

Otherwise we'll wait 600s.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 4609210e105cbbe2d5f685fc4890cce8d8b0ba6f)

mgr/cephadm: add test_daemon_check

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d0978ddf414a88fd8edc7cb355d0f678b2cf2d92)

mgr/cephadm: Make daemon actions asynchronous

Fixes broken `ceph orch redeploy <current active mgr>`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 365f839a79ac5e321dc088aaec07644c7bc554eb)

mgr/cephadm: add scheduled_daemon_actions to HostCache

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ce4798ba0d33d2c8cfc7811553eed11f0f6af781)

mgr/cephadm: move fail_over from upgrade.py to MgrService

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 3e5676d6c02f5aa458e4714ea5e61bd13c9e3a3f)

mgr/cephadm: _wait_for_ok_to_stop: add missing f-prefix

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f5ae34ab711f808baa570637ed79c934282d6c1a)

mgr/cephadm: _create_daemon: remove usused parameter

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 66a9f87d16e3e006bb8e2de41399887f58448374)

mgr/orch: daemon redeploy: Fix missing default value

Fixes: https://tracker.ceph.com/issues/47035
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit e6f2237840b8fa17d6ca95b02b784a224a4f22f7)

mgr/cephadm: PEP8tify inventory.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit fef1151a62dedc7edc34fd9887aa59a94d9c9c7f)

mgr/cephadm: disable autopep8 for test_{spec,scheduling}.py

The signal to noise ratio is just too bad.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d30d5e4746483880ca3b3306150255c0739224a8)

doc/mgr: Clean up orchestrator.rst (spell/punct, awkward wording)

Signed-off-by: Dan Mick <dmick@redhat.com>
(cherry picked from commit a2a90542021005622e6a763c4593d2994177f4bd)

mgr/cephadm: PEP8tify services/osd.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1a229055b040f10afd84d036c7acf5cbcc13b1dd)

cephadm: Give better access to the /dev in the iscsi container

In testing it seems the main iscsi container's /dev related volume mount to just
/dev/log is too narrow. And in certain circumstances it needs to access
to see /dev/rbd* devices. Like if using krdb.

This patch volume mounts /dev rather then /dev/log in the main
container, but since this aligns with what we need in the tcmu-runner
container it actaully ends up simplifying the code as well.

Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit 40c0d6821252e8112b655dee67d9d3eb5b7ffbff)

mgr/orchestrator: PEP8tify

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ee634f2921ba0f9083b3778ea5651f52c1ed98f7)

mgr/cephadm: use `check_mon_command` during iscsi config

ensure the mon commands actually succeed

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2e98c8cda49161e66856f0aaf1bfa9ae9a3f3417)

cephadm: infer latest image with a valid tag

Fixes: https://tracker.ceph.com/issues/47134
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d61676f92dc701daeab71bd9d9c35d6cfa9a6434)

mgr/cephadm: use `check_mon_command` util

rather then checking the retval explicitly

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2f7fef134753f880c54027fbe18d4bf7425098fe)

mgr/cephadm: merge NFSGanesha into NFSService class

these two classes really preform the same function

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 82598631c30bf483a5bda285414df7245fe283c1)

mgr/cephadm: use supplied `CephadmDaemonSpec`

69ed3d9cffd refactored `_create_daemon()` which obsoleted any need to
search for the NFSServiceSpec in the SpecStore

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 87ccbad67170a9a0b35776d53826b0a944239cb5)

mgr/cephadm: move NFS config/create func

preserve func order seen in the impl. for the other services

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 170220875d942b6f1678d5a388a19e081251f554)

cephadm: Update error message on host failure

Now the error message explains how to add the ssh key to the not
reachable host

Fixes: https://tracker.ceph.com/issues/46551
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 1bfb044518d8b771c8f6cac2396f636b0cbdf12e)

mgr/cephadm: PEP8tify some tests

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit a385c3cc28188f5a4c85a113086ab11f9cace67c)

cephadm: deploying of monitoring images partially broken

Deployment of monitoring images has been broken in the context of
ceph-salt. Due to the removal of the registries in
/etc/containers/registries.conf, all images need to be provided
qualified.

Fixes: https://tracker.ceph.com/issues/46726
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 658230048bff5907d6dad8e216a540014a0898f1)

cephadm: remove py2 from tox tests

cephadm is dependent on py3, and the presence of py2 in
tox is just going to throw more errors over time as py3
idioms are adopted. py2 is EOL, and older hosts should
have py3 available as an installation option anyway.

This patch just removes py2 from the tox test.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit c8649eff0097635ad16778d2194b07d139ce806a)

mgr/cephadm: PEP8tify cephadmservice.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 56f11c015ad323bb31e9fa372d30541b4b54de41)

cephadm: remove py2 from test_adoption

Since cephadm is py3 based, and py2 is EOL this patch
removes the py2 test iteration from test_adoption.sh

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 225cbd8d790602b30050e0e32ecffd400ec17731)

cephadm: remove py2 from test stream

Since py2 is EOL, and cephadm requires py3 anyway this
patch removes the py2 test iteration from the functional
testing suite.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit db5f758ec5d1887b664d16d08552ff272b8c214f)

cephadm: make devices lists more granular in gather-facts

The gather-facts commands returns a list of hdd and flash
devices. This patch changes the list content from being
simple strings representing the disks to a dict, making it
easier to extend in the future.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 9b43b5c555d7e4160bc704a9702edc17797de50d)

cephadm: add gather-facts to the qa test

Adds a gather-facts invocatio after check-host is run.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit e24321be416e3e10b31c602c2b0715119f869833)

cephadm: enhance memory and cpu data

Added free/available memory state, and cpu loadavg info

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit fb72a14ad4a6675f6471c69365187844bb98d322)

cephadm: fixes to address PR requirements

Minor changes to address issues raised in the PR;
- formatting of ipv6 addresses
- missing docstrings
- NIC mtu and speed now int instead of string
- added NIC driver name
- removed discrete JSON method making gather-facts JSON only
- added upper/lower device lists to show NIC relationships
- added hostname to the JSON!
- added selinux/apparmor status
- added timestamp (epoch) for the gather-facts run
- added system uptime (secs)

Closes:

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 92250132bf48da1df86a71edbfa5815a210c8b6b)

cephadm: add gather_facts command

The gather_facts command is intended to provide host
level metadata to the caller, which could then be used
in a number of places: orchestrator inventory, displayed
in the UI etc

Data is extracted mainly from sysfs and /proc

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit ff00e0d04c0ab82078fb41849e758bb6fb2ed291)

mgr/cephadm: PEP8tify schedule.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 83e4559fcef059e8f65b9730b5e1ca7820699ddb)

mgr/cephadm: use raw string during `re.search`

cephadmservice.py:348: DeprecationWarning: invalid escape sequence \:
    port = re.search('\:\d+\/', end_point)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit ed0074da2ca00b3fc1669865667e1090d9676fbe)

qa/tasks/cephadm.py: add ceph logs directory in job's info.yaml

This commit adds the file path of ceph log directories to the job's
info.yaml log file. The motivation behind this is, in case of job
timeout, the logs would still be tranferred to teuthology host
before nuking test machines using these ceph log directory paths in
job's info.yaml log file.

Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>
(cherry picked from commit d2ff5c5eb609eba02e6c966015bb7e1d9b349be4)

Conflicts:
qa/tasks/cephadm.py

CODEOWNERS: Add cephadm man page to @ceph/orchestrators

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f3aed0828b6fa3bc0753892161082cb766ad9866)

doc/man/cephadm: Add missing parameters for `ls`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 20b679a8928767db5b7314a4f017fcf2eb4fbf36)

Merge pull request #36981 from neha-ojha/wip-47297-octopus

octopus: mon/OSDMonitor: only take in osd into consideration when trimming osd…

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

ceph-volume: simple scan should ignore tmpfs

When simple scan is ran against a ceph-volume
OSD, util.encryption.legacy_encrypted returns
tmpfs. We want to avoid creating a Device
object with tmpfs and ignore the OSD as it's
not a ceph-disk created OSD.

Resolves: rhbz#1872983

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit ff4b7bfa573e95acf4cdc01ccf2881f0935e91d6)

mon/OSDMonitor: only take in osd into consideration when trimming osdmaps

we should not take down osd into consideration when trimming osdmap. in
e62269c892, we decrease the upper bound of range of osdmaps to be trimmed
if the given osd is out. but we should have to decrease it only if the
osd in question is still *in*.

so, in this change, the min_lec is decreased only if the osd in question
is *in*.

Fixes: https://tracker.ceph.com/issues/47290
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 79175740cf2394bba74163ca8a5131419b9641ed)

 Conflicts:
src/mon/OSDMonitor.cc - trivial resolution

Merge pull request #36973 from sebastian-philipp/octopus-mgr-re-add_osd_support

octopus: Revert "mgr/osd_support: remove module and all traces"

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

Revert "mgr/osd_support: remove module and all traces"

This reverts commit a55c1dd0fac826978edf22e448c3456e7634cbc3.

Kept to keep upgrades from older point releases working.
This module can be removed as soon as we no longer
support upgrades from old octopus point releases.

Revert "build/debian: remove osd_support"

This reverts commit 8ff2824beb78dfd03710e94302f038ea70fb4561.

Fixes: https://tracker.ceph.com/issues/47109
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 43f1bdb6ef7d740eda219bac7d0280ed558e319d)

ceph-volume: support for mpath devices

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
Fixes: https://tracker.ceph.com/issues/45094
(cherry picked from commit ee8887f4c0ff4f91117f31b621b95c8d08019130)

ceph-volume: retry when acquiring lock fails

When preaparing the osd device with --mkfs, the ceph-osd binary tries to
acquire an exclusive lock on the device (soon to become an OSD).
Unfortunately, when running in containers, we have seen cases where
there is a race between ceph-osd and systemd-udevd to acquire a lock on
the device. Sometimes systemd-udevd gets the lock and releases it soon
so that the ceph-osd gets sometimes the lock is still held and because
ceph-osd uses LOCK_NB the command fails.

This commit retries if the lock cannot be acquired, up to 5 times for 5
seconds, this should be more than enough to acquire the lock and
proceed with the OSD mkfs.

Unfortunately, this is so transient that we cannot lock earlier from c-v,
this won't do anything.

Fixes: https://tracker.ceph.com/issues/47010
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit a285cd08921f51ef1101950eb6b9addcdfbecc35)

ceph-volume: show correct rejected reason in inventory if device type is not acceptable

If device type is not acceptable in `c-v inventory`, its rejected reason
becomes "Insufficient space (<5GB)" by mistake. It's because sys_api is
empty due to skipping devices that are neither `disk` nor `device`. We
should report the target device is not acceptable in this case.

Fixes: https://tracker.ceph.com/issues/46102
Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
(cherry picked from commit 3e5d91d41f7275d4656019c1ca3fc80927d214c9)

rgw: log resharding events at level 1 (formerly 20)
log resharding events at level 1 (formerly 20)
Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit a5428c8a29414044a87b7dc009f27b336d4232e2)

Conflicts:
src/rgw/rgw_rados.cc

rgw: dump transitions in RGWLifecycleConfiguration::dump()

Signed-off-by: Shengming Zhang <zhangsm01@inspur.com>
(cherry picked from commit c843b6f08799c1fef39a4a6fd24c27207d1e951e)

Merge pull request #36786 from callithea/wip-46936-octopus

octopus: mgr: Add missing states to PG_STATES in mgr_module.py.

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36795 from ifed01/wip-ifed-simplify-pin-octopus

octopus: os/bluestore: simplify Onode pin/unpin logic

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36644 from smithfarm/wip-46471-octopus

octopus: rgw: stop realm reloader before store shutdown

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

ceph-volume: Update inventory tests to stress LSMDisk

Inventory tests now test the LSMDisk class directly

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 96686db918fdd7c42fb8cab7382d2d1524948e48)

ceph-volume: address PR merge comments

Change to use existing properties of the Device class to
determine whether the lsm data gathering should be
attempted.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit d59a75f484096f08191f815223608b7f2e55a1fb)

ceph-volume: improve pytest coverage of the LSMDisk class

By adding lsm_Disk, the attribute can be overridden within
the testcases to allow mock data to be used

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 05f7be95e9a3b83e2b4c7d3d3491781f8b8db98a)

ceph-volume: add mock test to validate lsm_data field

The lsm_data field (dict) is now checked for format and
content as part of tox tests

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 158927caeab8e18505af0a7f1583597eeee242e9)

ceph-volume: fixes for PR #2

Fixes to resolve the following  issues raised in the PR
led_status
transport_map and lsm_Disk references
health_map access

Commit to be squashed prior to merge

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 2d5d24547545ba203659f397c754949c80ce2c51)

ceph-volume: minor updates prior to merge #1

Changes addressing comments in PR - commit to be
squashed prior to merge

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 60e110fa07b267d6a4d9b4f5d7038ac5d9736645)

ceph-volume: add libstoragemgmt support

Initial support for libstoragemgmt integration to
provide additional metadata to the device inventory.

LSM provides health, rpm, linkspeed, linktype as well as
visibility of the disks's LED status indicators (specifically
the IDENT and FAULT lights)

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 3d3bbc13ea74ce2f5b902785df588174dedb3c24)

Merge pull request #36689 from rhcs-dashboard/wip-46993-octopus

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36587 from tspmelo/wip-46907-octopus

octopus: mgr/dashboard: Extract documentation link to a component

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

Merge pull request #36614 from rishabh-d-dave/cv-add-tests-for-new-lvm-functions-o

octopus: ceph-volume: add tests for new functions that run LVM commands

Merge pull request #36608 from rishabh-d-dave/cv-rm-container-classes-o

octopus: ceph-volume: remove container classes from api/lvm.py

Merge pull request #36782 from callithea/wip-46974-octopus

octopus: mgr/dashboard: Strange iSCSI discovery auth behavior

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

Merge pull request #36831 from rhcs-dashboard/wip-47155-octopus

octopus: mgr/dashboard: redirect to original URL after successful login

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

Merge pull request #36661 from smithfarm/wip-46586-octopus

octopus: doc/rados: Fix osd_scrub_during_recovery default value

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36690 from smithfarm/wip-46996-octopus

octopus: doc/mgr/crash: Add missing command in rm example

Reviewed-by: Neha Ojha <nojha@redhat.com>

mgr/dashboard: redirect to original URL after successful login

Fixes: https://tracker.ceph.com/issues/45067
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit b5359a155c6ff7e92ab6c6ed16f7ff9fc76c76ea)
(cherry picked from commit 330c75cb511d61306a8841973f2b18e17893c555)

Merge pull request #36693 from epuertat/wip-47001-octopus

octopus: mgr/dashboard/api: reduce amount of daemon logs

Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #35975 from callithea/wip-46418-octopus

octopus: mgr/dashboard: Hide password notification when expiration date is far

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>