mgr/cephadm: show failure cause during placement

the host and exception cause are not shown in the event log when a
daemon placement failure occurs

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

qa/task/cephadm: run cephadm only on bootstrap_remote

Because not all the node in teuthology config might
have any cephadm related role we should not execute
cephadm on random node.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit f75b00984e17a08087f41e7110fe64d4872d3200)

mgr/cephadm: validate user provided ssh_config

ensure the user provided ssh_config contains a valid
`StrictHostKeyChecking` setting

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

cephadm: install podman from the Kubic project

ppa:projectatomic is no longer maintained, updates are now provided via
the Kubic project

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

qa/suites/rados/cephadm: install podman from the Kubic project

ppa:projectatomic is no longer maintained, updates are now provided via
the Kubic project

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

mgr/cephadm: mon to mgr service type in scheduler tests

now that we're not deploying even number of mons, need
to use different service type for scheduler tests

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

mgr/cephadm: only deploy 3 mons by default when there are 4 hosts

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

cephadm: verify root privileges before log dir create

root privileges need to be verified before creating the log dir

introduced by 81a7df0

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

mgr/cephadm: add NFS RGW keyring application tag

restrict the OSD keyring caps to the `rgw` application

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

mgr/cephadm: clean-up NFS rgw keyring

remove RGW keyring during NFS daemon `post_remove`

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

mgr/cephadm: add RGW support for NFS ganesha

- create an RGW keyring for NFS daemon access
- generate RGW FSAL in ganesha.conf

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

cephadm: mount RGW keyring in NFS container

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

mgr/cephadm: many-to-many Prometheus error

Fix configuration created by cephadm to prevent any "many-to-many
matching not allowed: matching labels must be unique on one side"
issues. The mgr/prometheus exporter exports suitable instance labels
itself, which can be taken over when `honor_labels` in Prometheus is set
to `true`.

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

mgr/cephadm: Allow customizing mgr/cephadm/lsmcli_blink_lights_cmd per host

* Rename key name from 'lsmcli_blink_lights_cmd' to 'blink_device_light_cmd'
* Refactor TemplateMgr::render() method to use the Ceph common behavior how to name store/module option keys. The old implementation required a key like 'mgr/cephadm/services_nfs_ganesha.conf' instead of 'mgr/cephadm/services/nfs/ganesha.conf' or 'mgr/cephadm/mgr0_blink_device_light_cmd' instead of 'mgr/cephadm/mgr0/blink_device_light_cmd'.

Fixes: https://tracker.ceph.com/issues/48041
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit cd79c9912ab35ee6296d613edc7830410a141e05)

Conflicts:
doc/rados/operations/devices.rst

doc/mgr/orchestrator: Update about "{mds, rgw} add" status in rook

"mds add" and "rgw add" are no longer supported in rook. Their implementation
was removed by commits 56cfeb6 and 0580297. Instead "apply mds" and "apply rgw"
is preferred.

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 23b9fb6456eab167719d653402f59126a12b261b)

cephadm: Set listen-addresses on alertmanager container

This explicitly passes web.listen-address and cluster.listen-address to the alertmanager container allowing the use of public IP addresses.

Fixes: https://tracker.ceph.com/issues/48031
Signed-off-by: Dan Williams <dw@adventsol.co.uk>
(cherry picked from commit 29730a4bc168913d5dad6d9e487d2dc58a0e3c86)

doc: document additional journal args in cephadm logs command

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

mgr/orchestrator: set `lsm_data` to default of Dict type

similar to handling of `sys_api`, convert a NoneType to a Dict

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

cephadm: allow ntpsec service

ntpsec is available starting Ubuntu Focal (20.04) and Debian Buster (10)
as an alternate NTP daemon.

Fixes: https://tracker.ceph.com/issues/47525
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit a8a64d5417d6f9ad977ea685eb74d564b1344cf3)

mgr/cephadm: adapt <placement> usage string

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 86d226471113736e864328eece5e9e34b3ae3696)

cephadm: allow uid/gid == 0 in copy_tree, copy_files, move_files

If the uid or gid passed to copy_tree(), copy_files() or
move_files() is 0 (the root user), the current check for
`if not uid or not gid` does the wrong thing, i.e. it
thinks the uid and/or gid aren't set, then calls out to
extract_uid_gid(), which fails when run against
prometheus/grafana/alertmanager containers.

Fixes: https://tracker.ceph.com/issues/47745
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 768e89d9ae733c88a9e85b71b5432f8d6f511f43)

mgr/cepahdm: move convert_tags_to_repo_digest to serve.py

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

mgr/cephadm: move _check_daemons to serve.py

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

mgr/cephadm: move _apply_service to serve.py

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

mgr/cephadm: move _apply_all_services to serve.py

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

mgr/cephadm: move _update_paused_health to serve.py

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

mgr/cephadm: move _check_for_strays to serve.py

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

mgr/cephadm: move _deploy_etc_ceph_ceph_conf to serve.py

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

mgr/cephadm: move _refresh_host_osdspec_previews to serve.py

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

mgr/cephadm: move _refresh_host_devices to serve.py

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

mgr/cephadm: move _refresh_host_daemons to serve.py

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

mgr/cephadm: move _check_host to serve.py

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

mgr/cephadm: move _refresh_hosts_and_daemons to serve.py

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

mgr/cephadm: move _serve_sleep to serve.py

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

mgr/cephadm: move serve() to serve.py

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

mgr/cephadm: add serve.py

This module contains functions that are executed in the
serve() thread.
Meaning they don't block the CLI

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

cephadm: Fix error setting 'mgr/cephadm/container_init' config

Fixes: https://tracker.ceph.com/issues/47501
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit cce937a599ebaf37fc0b35de19ed44afa80d1f06)

docs: <orch osd spec> is no longer present

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit b38bc14525460e0bec7829774d2385b62d6c8742)

mgr/cephadm: do not escape HTML for custom templates

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

mgr/cephadm: continue trying all hosts for service deployment

One failure should not stop the attempt to start all instances.

Fixes: https://tracker.ceph.com/issues/46665
Signed-off-by: Dan Mick <dmick@redhat.com>
(cherry picked from commit dd7bd4807a1668e1fb91581c69bb549ae62611db)

mgr/cephadm: Make type annotnations for cephadm.services mandatory

* Found a wrong default for `OSDService.create_single_host`

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

Conflicts:
src/mypy.ini
src/pybind/mgr/cephadm/services/nfs.py

mgr/cephadm: get rbd-mirror daemon-id when checking for strays

Currently, list_servers() gets the rbd-mirror service-id instead
of the daemon-id so the daemon is marked as stray. This PR uses
that service-id to find the daemon-id and uses that to check if
the daemon is stray.

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

mgr/cephadm: upgrade_state can be literally "null"

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

Merge pull request #38045 from dsavineau/wip-48184-octopus

octopus: ceph-volume: fix lvm batch auto with full SSDs

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>

ceph-volume: add a unit tests to lvm batch

This commit adds unit tests in order to cover `_sort_rotational_disks()`
call when deploying with full hdd/ssd or mixed hdd/sdd scenarios.

Fixes: https://tracker.ceph.com/issues/48150
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Co-authored-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 13514a24cfdc32d67cfbc1201aa427168a926978)

ceph-volume: fix lvm batch auto with full SSDs

The ceph-volume lvm batch --auto introduced by [1] breaks the backward
compatibility when using non rotational devices only (SSD and/or NVMe).
Those devices are reaffected as bluestore db or filestore journal
devices while we want them as data devices.

Fixes: https://tracker.ceph.com/issues/48106
[1] https://github.com/ceph/ceph/pull/34740

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 2a854ca373fadef099a1d037930eb241e757b2c3)

Merge pull request #37553 from Vicente-Cheng/wip-47747-octopus

octopus: mon: set session_timeout when adding to session_map

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

Merge pull request #37885 from bk201/wip-47944-octopus

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>

Merge pull request #37962 from votdev/custom_container_docs

octopus: doc/mgr/orchestrator: Add hints related to custom containers to the docs

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

Merge pull request #37857 from smithfarm/wip-47940-octopus

octopus: mon/MDSMonitor: divide mds identifier and mds real name with dot

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

Merge pull request #37856 from smithfarm/wip-47936-octopus

octopus: mds: account for closing sessions in hit_session

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

Merge pull request #37855 from smithfarm/wip-47891-octopus

octopus: mgr/volumes/nfs: Fix wrong error message for pseudo path

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

Merge pull request #37854 from smithfarm/wip-46959-octopus

octopus: cephfs-journal-tool: fix incorrect read_offset when finding missing objects

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

Merge pull request #37841 from smithfarm/wip-47991-octopus

octopus: qa/cephfs: add session_timeout option support

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

Merge pull request #37839 from smithfarm/wip-47989-octopus

octopus: cephfs: client: fix inode ll_ref reference count leak

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

Merge pull request #37837 from smithfarm/wip-47954-octopus

octopus: vstart.sh: fix fs set max_mds bug

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

Merge pull request #37724 from rishabh-d-dave/wip-46610-octopus

octopus: pybind/cephfs: add special values for not reading conffile

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

Merge pull request #37671 from Vicente-Cheng/wip-47824-octopus

octopus: mgr/volumes: Make number of cloner threads configurable

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

Merge pull request #37620 from rhcs-dashboard/wip-47811-octopus

octopus: mgr/dashboard: get rgw daemon zonegroup name from mgr

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #37858 from smithfarm/wip-47958-octopus

octopus: mon/MDSMonitor do not ignore mds's down:dne request

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

Merge pull request #37853 from smithfarm/wip-47826-octopus

octopus: osd/osd-rep-recov-eio.sh: TEST_rados_repair_warning:  return 1

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

Merge pull request #37835 from smithfarm/wip-47934-octopus

octopus: tools/rados: flush formatter periodically during json output of "rados ls"

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

Merge pull request #37819 from smithfarm/wip-47994-octopus

octopus: test/store_test: use 'threadsafe' style for death tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #37817 from smithfarm/wip-47987-octopus

octopus: mon/MonMap: fix unconditional failure for init_with_hosts

Reviewed-by: Wido den Hollander <wido@widodh.nl>

Merge pull request #37784 from bk201/wip-47657-octopus

octopus: mgr/dashboard: display devices' health information within a tabset

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>

doc/mgr/orchestrator: Add hints related to custom containers to the docs

Fixes: https://tracker.ceph.com/issues/48113
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 1927809b0b58243dbe84756b9cec7c29bd0a7494)

Merge pull request #37239 from rhcs-dashboard/read_only_backport

octopus: mgr/dashboard: Disabling the form inputs for the read_only modals

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #37530 from batrick/i47734-octopus

octopus: osdc: add timeout configs for mons/osds

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

Merge pull request #37256 from batrick/i47249

octopus: mon: deleting a CephFS and its pools causes MONs to crash

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

Merge pull request #37852 from smithfarm/wip-47889-octopus

octopus: rbd: librbd: ignore -ENOENT error when disabling object-map

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #37851 from smithfarm/wip-47888-octopus

octopus: rbd: librbd: update AioCompletion return value before evaluating pending count

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #37850 from smithfarm/wip-47886-octopus

octopus: rbd: journal: possible race condition between flush and append callback

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #37849 from smithfarm/wip-48003-octopus

octopus: rgw: fix: S3 API KeyCount incorrect return.

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

Merge pull request #37847 from smithfarm/wip-47956-octopus

octopus: rgw/gc: fix for incrementing the perf counter 'gc_retire_object'

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

Merge pull request #37846 from smithfarm/wip-47955-octopus

octopus: rgw/gc: fixing the condition when marker for a queue is

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

Merge pull request #37845 from smithfarm/wip-47896-octopus

octopus: rgw: use yum rather than dnf for teuthology testing of rgw-orphan-list

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

Merge pull request #37812 from smithfarm/wip-48007-octopus

octopus: rbd: rbd-nbd: don't ignore namespace when unmapping by image spec

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #37809 from smithfarm/wip-47962-octopus

octopus: rgw: Add request timeout to beast

Reviewed-by: Friedmann <ofriedma@redhat.com>

Merge pull request #37807 from smithfarm/wip-47960-octopus

octopus: rgw: fix expiration header returned even if there is only one tag in the object the same as the rule

Reviewed-by: Friedmann <ofriedma@redhat.com>

Merge pull request #37803 from smithfarm/wip-47819-octopus

octopus: rgw: radosgw-admin should paginate internally when listing bucket

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

Merge pull request #37800 from smithfarm/wip-47817-octopus

octopus: rgw: allow rgw-orphan-list to note when rados objects are in namespace

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

Merge pull request #37779 from smithfarm/wip-47037-octopus

octopus: rgw: fix user stats iterative increment

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

mgr/cephadm: do not configure Dashboard Ganesha settings

The Dashboard can get cluster information from the Orchestrator.
For settings that are set by previous revisions, the Dashboard will
check them and ask user to remove them.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 99e421065748c03da1fc468b2a09bf22f7bc31b0)

Conflicts:
      src/pybind/mgr/cephadm/services/nfs.py

doc/dashboard: add information for Orchestrator NFS-Ganesha clusters

Fixes: https://tracker.ceph.com/issues/46492
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit a5aaaa69cc82af2a6f4b7f0bd60ce2da5015c8c2)

mgr/dashboard: support Orchestrator and user-defined Ganesha clusters

This change make the Dashboard support two types of Ganesha clusters:

- Orchestrator clusters (Since Octopus)
  - Deployed by the Orchestrator.
  - The Dashboard gets the pool/namespace that stores Ganesha
    configuration objects from the Orchestrator.
  - The Dashboard gets the daemons in a cluster from the Orchestrator.

- User-defined clusters (Since Nautilus)
  - Clusters defined by using `ceph dashboard
    set-ganesha-clusters-rados-pool-namespace` command is treated as
    user-defined clusters.
  - Each daemon has its own RADOS configuration objects. The
    Dashboard uses these objects to deduce daemons.

Fixes: https://tracker.ceph.com/issues/46492
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit a9accaeccf88e1b0ee4688ef2ae9ddbd3bd3dc5e)

Conflicts:
      src/pybind/mgr/dashboard/openapi.yaml
          - We don't have openapi-check feature in the Octopus. The file
            is removed in the backport.
      src/pybind/mgr/dashboard/services/ganesha.py
      src/pybind/mgr/dashboard/tests/test_ganesha.py
          - The conflicts are mainly caused by code re-format in the
    master.

mgr/dashboard: refator orchestrator service and daemon APIs

- Allow listing services by service_type.
- Allow listing daemons by daemon_type.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit b88638873bd738af1ce258549abb6c25e0683907)

Merge pull request #37551 from Vicente-Cheng/wip-47736-octopus

octopus: rgw: rgw_file: avoid long-ish delay on shutdown

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

Merge pull request #37688 from bk201/wip-47822-octopus

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

Merge pull request #37597 from rhcs-dashboard/wip-47792-octopus

octopus: mgr/dashboard: Add short descriptions to the telemetry report preview

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>

doc/PendingReleaseNotes: clean up for 15.2.6

This commit drops release notes that have already been published and
organizes the remaining release notes under a heading so it is clear
they are targeting the 15.2.6 release.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

mon/MonMap: fix unconditional failure for init_with_hosts

This bug prevents setting mon_host to a DNS name.

Fixes: https://tracker.ceph.com/issues/47951
Fixes: 7a1f02acfe6b5d8a760efd16bb594a0656b39eac
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 21d9f8333b8c76979bbe90d60a8ad6ebb5e36c76)

test/mon: add tests for mon_host build by hostname

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

Conflicts:
    src/test/mon/MonMap.cc
- do not attempt to introduce boost::intrusive_ptr into Nautilus
- monmap.build_initial takes bare cct in nautilus (master: cct.get())

test/mon: fix compiler errors in MonMap unittest

The code atrophied. Clean this up.

The tests are disabled because they SIGSEGV during SetUp.

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

Conflicts:
    src/test/mon/MonMap.cc
- do not attempt to introduce boost::intrusive_ptr into nautilus
- monmap.build_initial takes bare cct in nautilus (master: cct.get())

Merge pull request #37691 from smithfarm/wip-47877-octopus

octopus: doc: cephfs: improve documentation of "ceph nfs cluster create" and "ceph fs volume create" commands

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

strtol: Add parse/consume for string_view friendly interface

Also these don't have the stringstream overhead.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit a29695e82ec8a93b000322773949f30694abf3d3)

mon/MDSMonitor: do not ignore mds's down:dne request

Fixes: https://tracker.ceph.com/issues/47881
Signed-off-by: chencan <chen.can2@zte.com.cn>
(cherry picked from commit 768d7fc4e8b74c88ea2a623ee4d21ac1f20d8c7a)

mon/MDSMonitor: divide mds identifier and mds real name with dot

Fixes: https://tracker.ceph.com/issues/47806
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit 4400d70c15e8fb4f013ca22db9fd5fe60c99dc32)

mds: account for closing sessions in hit_session

While stopping an mds we can reply to a request while all client
sessions are closing. We shouldn't assert in this case.

Fixes: https://tracker.ceph.com/issues/47833
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 6823d8fb619c07b4e749ae564df565eadc59c187)

mgr/volumes/nfs: Fix wrong error message for pseudo path

Fixes: https://tracker.ceph.com/issues/47783
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 1552f7239c0e2dc4f661cd80f17369422c919c50)

cephfs-journal-tool: fix wrong read_offset when get missing objects

Fixes: https://tracker.ceph.com/issues/45575
Signed-off-by: Xue Yantao <jhonxue@tencent.com>
(cherry picked from commit bfa63666bb40c7939aa4da3c2c8f43a7022a78e8)