mgr/dashboard: fix pool usage calculation

Currently Dashboard Pool usage calculation does not match the output of
'ceph df' command.

Fixes: https://tracker.ceph.com/issues/45185
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit b4a9dc17a3de90379964443d26b29f1759824f28)

Conflicts:
qa/tasks/mgr/dashboard/test_pool.py: relative import
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html: change place of new chunk

Merge pull request #36073 from rhcs-dashboard/wip-46354-octopus

octopus: mgr/dashboard: fix backporting issue #35926

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #35997 from ricardoasmarques/wip-46436-octopus

octopus: mgr/dashboard: Allow to edit iSCSI target with active session

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

Merge pull request #35684 from smithfarm/wip-46121-octopus

octopus: mgr/k8sevents: sanitise kubernetes events

Merge pull request #35958 from callithea/wip-46394-octopus

octopus: mon/PGMap: do not consider changing pg stuck

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

Merge pull request #36034 from smithfarm/wip-46261-octopus

octopus: common, osd: add sanity checks around osd_scrub_max_preemptions

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

Merge pull request #36033 from smithfarm/wip-46089-octopus

octopus: osd/PG: fix history.same_interval_since of merge target again

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

Merge pull request #36032 from smithfarm/wip-46086-octopus

octopus: osd: wakeup all threads of shard rather than one thread.

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

Merge pull request #36030 from smithfarm/wip-46016-octopus

octopus: test: osd-backfill-stats.sh use nobackfill to avoid races in remainin…

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

Merge pull request #36029 from smithfarm/wip-46007-octopus

octopus: osd/PrimaryLogPG: don't populate watchers if replica

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #35898 from sebastian-philipp/octopus-backport-35018-35472-35524-35412-35510-35493-35549-35547-35581-35567-35578-3563

octopus: cephadm batch backport July (1)

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

cephadm: Add "--format" option to "ceph orch status"

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

mgr/test_orchestrator: add iscsi

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

cephadm: add sudo ssh user option

add the ability to use a non-root users for connecting to hosts, this user requires pass wordless sudo access

useful for clusters that have root ssh access disabled

Fixes: https://tracker.ceph.com/issues/44866
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 1052b9db7bdc50f61705e1f1331c5cbb20120586)

mgr/cephadm: Manage /etc/ceph/ceph.conf

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

mgr/tests: _ceph_get_module_option returns proper type now.

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

mgr/cephadm: config_notify now provides a hook

reason is, we want to use this hook to schedule a
ceph.conf update for all hosts.

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

mgr/cephadm: refactor _run_cephadm

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

python-common: Add simple str(HostSpec)

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

mgr/cephadm: add type hints for _refresh_host_*()

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

cephadm: ceph-iscsi remove pool from cap

When we create a ceph-iscsi daemon/continer in cephadm we create a user
and set some caps. Turns out we were a little too restrictive.

We were locking down to only access the pool that was given in the spec,
which happens to be the pool the iscsi config is stored. But in reality
we need to be able  to attach any rbd images which could exist in other
pools.

So this patch removes the `pool=` from the osd cap, so from:

   osd = allow rwx pool={spec.pool}

To:

   osd = allow rwx

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

py-common/deployment/translate: drop unneeded ctor arg

The DriveGroupSpec is already part of the DriveSelection.

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

mgr/cephadm: reconfig ssh after setting or clearing ssh_config

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

python-common: service_spec.from_json: Add docstring explaining histroy

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

qa/cephadm: Add test for --format=yaml

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

mgr/orchestrator: Add test for readable yaml

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

pybind/mgr: move test_orchestrator to orchestrator module

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

mgr/orch: make YAML of ServiceDescription readable

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

mgr/orch: YAML of DaemonDescription readable

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

python-common: Make YAML or OSD Specs readable

* Changes: An empty OSD Spec is now invalid.
* OSDSpec.validate() now fails, if service-id is empty

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

python-common: make YAML representaition of ServiceSpec readable

* Add test for new yaml representation

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

cephadm: error trying to get ceph auth entry for crash daemon

If your cluster has nodes with a . in the name. This will happen.

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 68cfa109b46bb627cfdfe624815aa01ed6b6c39b)

mgr/cephadm: add test for ok-to-stop

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

mgr/cephadm: scheduler: make use of ok-to-stop

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

mgr/cephadm: move _check_safe_to_destroy_mon to MonService

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

mgr/cephadm: move ok_to_stop to CephadmService

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

mgr/cephadm: use fixed Grafana version

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

mgr/cephadm: speedup _refresh_hosts_and_daemons by 10x

by calling 10 hosts in parallel.

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

mgr/cephadm: fix broken "already in use" exception message

Fixes:

```
orchestrator._interface.OrchestratorValidationError: ('name %s already in use', 'b')
```

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

cephadm: Set ms bind ipv6 when mon-ip is ipv6

If you use cephadm bootstrap with an ipv6 mon ip then currently you'll
get into a address family split-brain state, where the mon's messenger
connects and binds to ipv6 but the mgr's binds to ipv4 (usually
0.0.0.0). In this state the bootstrap process hangs as it attempts to
talk and get the mgr state.

A work around is to have `ms bind ipv6 = true` in a ceph conf
you can then pass to bootstrap which gets pulled in and set in mon's
config store.

This patch sets `ms bind ipv6 = true` to the global section in the
mon config store when the mon-ip argument is an ipv6 address.

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

mgr/cephadm: exclude osds without osdspec_affinity

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

cephadm: restrict mds caps to cephfs pools

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

cephadm: unit.run: add `set -e`

In case LVM activates fails for some
unknown reason, prevent the script from
continuing with starting the OSD container.

This leads to faild systemd services with active OSD containers.

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

mgr/orch: read untrusted input using the yaml SafeLoader

https://msg.pyyaml.org/load

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

mgr/cephadm: make `orch status` fail, if ssh key is not set

ceph-salt relies on the output of `orch status` to determine the
end of the bootstrap process.

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

python-common: remove old `cephadm_orchestrator.py`

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

doc/cephadm: adopt: fix misleading `apply` examples

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

doc/mgr/orch: Update documentation to the new CLI

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

cephadm: Give iscsci a RO /lib/modules bind mounted

The ceph iscsi container needs to be able to insert the iscsi_target_mod
but it doesn't exist in the container. for security reasons bind
mounting /lib/modules seems a little dangerous unless we can mount it
RO.
Unfortuntly the docker volume mount (-v) doesn't allow you mount
readonly, adding a `--read-only` actaully does the opposite, makes the
root on the container RO and expects you to write to the mounted volumes
(-v).

However, we get more grainular control over bind mount options if we use
`--mount`[0]. Here we can still bind mound the volume into the container,
but can also add additional options, like bind mounting RO.

This patch adds at addiontal `bind_mounts` option to the CephContainer
along side `volume_mounts`. The `bind_mounts` take a List[List[str]]:

 binds = []
 lib_modules = ['type=bind',
                'source=/lib/modules',
                'destination=/lib/modules',
                'ro=true']
 binds.append(lib_modules)

And this is plumbed through into cephadm. Bind_mounts only needs to be
used if you need a little more control over the mounting, otherwise the
volume_mounts are easier to use.

[0] - https://docs.docker.com/engine/reference/commandline/service_create/#add-bind-mounts-volumes-or-memory-filesystems

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

stop.sh: do not block script when there is no running cluster

A query for current fsid is called inside `do_killcephadm`. This blocks
the script when there is no running cluster. The fix avoids entering the
function if cephadm command fails or returns no daemons.

The change also hides the following output for non-cephadm environments:

```
Unable to locate any of ['podman', 'docker']
```

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

doc/man: add missing cephadm shell `--mount` option

also clean-up `--mount` help usage

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

cephadm: skip any invalid fsid(s) during infer

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

cephadm: sort the list of inferred fsids

$ cephadm shell
ERROR: Cannot infer an fsid, one must be specified: ['1d5df33f-eb94-4a4f-b192-1d5e770ed0e7', 'unknown']
$ cephadm shell
ERROR: Cannot infer an fsid, one must be specified: ['unknown', '1d5df33f-eb94-4a4f-b192-1d5e770ed0e7']

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

mgr/cephadm: annotate scheduling code with comments

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

doc/cephadm: document pool requirement for NFS-Ganesha service

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

cephadm: UX: Change error message when 'orch host add <host>' fails

Instead of printing out a traceback if adding the host fails
during bootstrapping process, should now print error message
telling user host failed to be added

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

cephadm: strip whitespace from iscsi version

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

python-common: validate the service_id during apply

the service_id needs to be validated during `orch apply`, but not during
`orch daemon add`

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

python-common: Add missing IscsiServiceSpec test

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

python-common: Add NFSServiceSpec validate

the ServiceSpec needs to be validated during `orch apply`, but not
during `orch daemon add`

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

cephadm: only SIGKILL once during timeout

no need to continually SIGKILL a process that is already exiting

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

cephadm: add profile log line to Popen wrappers

add debug log line to profile the Popen wrapper read loop
exec runtime, exitcode, stop, fds to read, etc.

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

cephadm: increase is_available timeout 30s -> 60s

bootstrap fails because `ceph -s` might take longer
than 30 sec to return on resource limited hardware

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

doc/cephadm: Add chapter about FQDNs

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

cephadm: call `podman rm --storage`

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

stop.sh: Remove cephadm deployed daemons

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

cephadm: Manually remove containers

This fixes:
```
Error: error creating container storage: the container name "ceph-<fsid>-mon.b" is already in use by "<container-id>". You have to remove that container to be able to reuse that name.: that name is already in use
```

Relates to https://tracker.ceph.com/issues/44990

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

Merge pull request #35988 from votdev/adapt_cephadm_vagrant

octopus: mgr/cephadm: Adapt Vagrantfile to use octopus instead of master repo on shaman

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

Merge pull request #36063 from varshar16/wip-update-nfs-doc-backport

octopus: Update nfs-ganesha package requirements doc backport

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

mgr/dashboard: fix backporting issue #35926

Incorrect conflict-solving during backporting of https://github.com/ceph/ceph/pull/34606
to Octopus (https://github.com/ceph/ceph/pull/35926) led to deletion of
some chuncks in OSD list page.

Fixes: https://tracker.ceph.com/issues/46502
Fixes: https://github.com/ceph/ceph/pull/35926
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #36061 from idryomov/wip-krbd-58-options-octopus

octopus: rbd: recognize crush_location, read_from_replica and compression_hint map options

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

doc: Update nfs-ganesha package requirements

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

qa/suites/krbd: turn on balanced reads for the fsx subsuite

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

test/librbd/fsx: respect rbd_default_map_options in krbd_open()

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

rbd: recognize compression_hint map option

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

rbd: recognize crush_location and read_from_replica map options

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

Merge pull request #36050 from smithfarm/wip-46307-octopus

octopus: tests: unittest_lockdep: skip lockdep test if CEPH_DEBUG_MUTEX is not defined

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

test/unittest_lockdep: skip lockdep test if CEPH_DEBUG_MUTEX is not defined

this change addresses a regression introduced by
2dc50b5f91476cf10429dbcdd52b00e32f599d5c

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

common, osd: add sanity checks around osd_scrub_max_preemptions

to limit maximum preempt_divisor we can use when backing off the
chunky-scrub range on preempting.

Otherwise large osd_scrub_max_preemptions values (i.e., >= 32)
would cause preempt_divisor overflow, hence the dreaded
“divide by zero error”.

Fixes: https://tracker.ceph.com/issues/46024
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit ae05de3e9b2e9868216e5168e50dfcb5074684cb)

osd/PeeringState: fix history.same_interval_since of merge target again

The symptom looks much like we see in
https://tracker.ceph.com/issues/37654.

The root cause is that both merge source and target could be
fabricated PGs (aka placeholders), hence merge target's
same_interval_since could remain 0 after merge.

Fix by adjusting history.same_interval_since to last_epoch_clean
reported by these PGs were found to be ready for merge.
This peer is going to be ignored/purged by primary anyway later
when peering is done.

Fixes: https://tracker.ceph.com/issues/45991
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit be5ea3a01f31b4893a823e971f452f3ccf9de001)

osd/OSD: wakeup all threads of shard.

In our test(4NVME), we found for 4K randread(8/16 mean shard, 2/1 mean
thread_per_shard):
QD 8_2(IOPS(k)) 16_1(IOPS(K)) 8_2(apply patch)
32  191  263  263.5

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit d1cf3fb80bce50a13da0fd45dba65248cbe38383)

test: osd-backfill-stats.sh use nobackfill to avoid races in remaining test

Fixes: https://tracker.ceph.com/issues/44314
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 92f970cbedbe3d86faa9e6ba2af8ab83b36e4bf2)

osd/PrimaryLogPG: don't populate watchers if replica

If an object has an established watch, serving a read from replica
eventually leads to an assert in is_degraded_or_backfilling_object()
called from handle_watch_timeout().

The issue is that after can_serve_replica_read() check is satisfied,
we look up the object context.  If not found, we fetch the object info
and then call populate_obc_watchers() which sees the recorded watch and
treats it as unconnected, arming HandleWatchTimeout on replica.

Fixes: https://tracker.ceph.com/issues/45795
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 1652b321da73b45cd33d7a03a2fef47e5708e37e)

Merge pull request #35877 from ivancich/octopus-rgw-ordered-listing-stuck

octopus: rgw: fix bug where ordered bucket listing gets stuck

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

Merge pull request #35796 from callithea/wip-45786-octopus

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Ishan Rai <ishanrai05@gmail.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>

Merge pull request #35926 from rhcs-dashboard/wip-46354-octopus

octopus: mgr/dashboard: Display users current bucket quota usage

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>

mgr/dashboard: Display users current bucket quota usage
Fixes: https://tracker.ceph.com/issues/45011
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 966d887f7a5e0765b4210ab4edcb1cea3e03ac35)
(cherry picked from commit 4fabba0bb772d480dcddc83272c83e7714726fc1)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts
        - Replace cd-usage-bar totalBytes and usedBytes with total and bytes
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #35892 from callithea/wip-46308-octopus

octopus: mgr/dashboard: Display check icon instead of true|false in various datatables

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

mgr/dashboard: Allow to edit iSCSI target with active session

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

mgr/cephadm: Adapt Vagrantfile to use octopus instead of master repo on shaman

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

Merge pull request #35748 from ifed01/wip-ifed-better-bluefs-stats-octopus

octopus:os/bluestore: improve/fix bluefs stats reporting

Merge pull request #35847 from callithea/wip-46171-octopus

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

os/bluestore: show file count for 'bluefs-stats'

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

 Conflicts:
src/os/bluestore/BlueFS.h - trivial

bluestore/bluestore-tool: add bluefs-stats command

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

bluestore/bluestore_tool: fix execute_command return handling

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

os/bluestore/store_test: fix execute_command return handling

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

os/bluestore: fix incomplete 'bluestore bluefs stats' cmd rename

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

Merge pull request #35799 from sseshasa/wip-46229-octopus

octopus: mon/OSDMonitor: Reset grace period if failure interval exceeds a threshold.

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

Merge pull request #35793 from callithea/wip-46183-octopus

octopus: mgr/DaemonServer.cc: make 'config show' on fsid work

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

Merge pull request #35737 from neha-ojha/wip-46165-octopus

octopus: osd: make message cap option usable again

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Vikhyat Umrao <vikhyat@redhat.com>