doc: add crushdiff(8) man page

Signed-off-by: Mykola Golub <mykola.golub@clyso.com>

tools/crushdiff: new tool to test crushmap change

A tool to test the effect (number of pgs, objects, bytes moved)
of a crushmap change. This is a wrapper around osdmaptool, hardly
relying on its --test-map-pgs-dump option to get the list of
changed pgs.  Additionally it uses pg stats to calculate the
numbers of objects and bytes moved.

Signed-off-by: Mykola Golub <mykola.golub@clyso.com>

Merge pull request #42841 from xxhdx1985126/wip-52305

crimson/common: keep ref count of crimson::interruptible::interrupt_cond

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

Merge PR #42371 into master

* refs/pull/42371/head:
mgr/volumes: Fix a race during clone cancel
mgr/volumes: Fail subvolume removal if it's in progress

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

Merge pull request #42884 from ideepika/wip-remove-unused-submodules

.gitmodules: remove thrift submodule

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

Merge pull request #41335 from noonedeadpunk/doc/stretch_mon

doc/rados/operations/stretch-mode: Adjust description of mon.e placement

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

Merge pull request #42053 from TRYTOBE8TME/wip-rgw-dpp-4

rgw: DPP addition 5

Reviewed-by: Ali Maredia <amaredia@redhat.com>

Merge pull request #42439 from ifed01/wip-ifed-more-errors-shared-blob-repair

os/bluestore: fix additional errors during missed shared blob repair.

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>

Merge pull request #41569 from MrFreezeex/rbd-mirror-snap-perf-dump

rbd-mirror: add perf counters to snapshot replayer

Merge pull request #42871 from tchaikov/wip-cmake-exclude-grafonnet-lib

cmake: exclude "grafonnet-lib" target from "all"

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>

Merge pull request #42434 from zenomri/wip-omri-rgw-tracing

[WIP] -  RGW tracing implementation

Merge pull request #41380 from Devp00l/wip-rgw-multisite-doc

doc: Improve RGW multisite documentation

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Alex Settle <asettle@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #42864 from aaryanporwal/vrt-doc

doc/dev: mgr/dashboard: Visual regression tests for ceph dashboard

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #42739 from Matan-B/lua-install-packages-fix

rgw: fix install packages function

Merge pull request #42865 from rhcs-dashboard/fix-rgw-bucket-list-api

mgr/dashboard: stats=false not working when listing buckets

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #42051 from melissa-kun-li/asyncssh

mgr/cephadm: replace execnet and remoto with asyncssh

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #42804 from zdover23/wip-doc-2021-08-17-rbd-nomad-1-of-x

doc: improve RBD "Block Devices and Nomad"

Reviewed-by: Etienne Menguy <etienne.menguy@croit.io>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #42879 from tchaikov/wip-seastar

seastar: pick up change silencing gcc warning

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

mgr/dashboard: stats=false not working when listing buckets

Fixes: https://tracker.ceph.com/issues/51154
Signed-off-by: Avan Thakkar <athakkar@redhat.com>

crimson/common: all interruptible future invocations should have already had interrupt condition in place

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

crimson/common: correct comment error about interruptible future

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

test/crimson: add interruptible async unit test

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

crimson/common: keep ref count of crimson::interruptible::interrupt_cond

Currently, interrupt conditionss are transfered between inner and outer continuation
chains via a tls interrupt_cond variable. This simple strategy leads to problem when it
comes to mixing normal future/continuation procedures and seastar::thread. When seastar::async()
is called, the reactor can directly invoke the passed functor and lead to two different
scenarios:

1.if a seastar::get/yield() inside the passed lambda, the interrupt_cond should be erased at the
end of the continuation execution when it is yielded back;
2.otherwise, the interrupt_cond should be not erased.

There can be so many possible sequences of yielding of several different fibers that we can hardly
judge at the end of the continuation execution whether there was a yielding during the current
execution, which means we can't be able to know whether the tls interrupt_cond should be erased.
There could be other scenarios where the current strategy fails. To end this kind of issues
once and for all, we involve the ref counting mechinary.

Fixes: https://tracker.ceph.com/issues/52305
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

doc/dev: mgr/dashboard: Visual regression tests for ceph dashboard

Fixes: https://tracker.ceph.com/issues/52370
Signed-off-by: Aaryan Porwal <aaryanporwal2233@gmail.com>

Merge pull request #41405 from ideepika/wip-rbd-update-feature-test

test/librbd: add unit tests for rbd update features

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>

crimson/common: trace TLS crimson::interruptible::interrupt_cond<InterruptCond> modifications

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

Merge pull request #42532 from ivancich/wip-multisite-conflict-detection

rgw-multisite: metadata conflict not computed correctly

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

rgw-multisite: metadata conflict not computed correctly

The former logic with a conditional based on `++i == 0` would never
execute. So this uses a boolean to differentiate the first from other
iterations and tries to clarify the code through commenting and an
explicit declaration. Additionally a warning is eliminated by
initializing a variable.

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

Merge pull request #42792 from tchaikov/wip-librbd-cleanups

librbd: trade a map<> for a plain array

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

seastar: pick up change silencing gcc warning

silences compiler warning from src/net/tls.cc

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

Merge pull request #42855 from josephsawaya/rook-label

.github/labeler: add rook label to PRs related to Rook

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

.gitmodules: remove thrift submodule

with 80e82686ebafe36fca6dfd21cb32e63ced94d5cd we now use thrift as a
distro based dependency, hence we no longer need it as a submodule.

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

mgr/cephadm: replace instances of remoto/execnet with asyncssh

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: rewrite test_etc_ceph to apply to asyncssh

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: remove test_stale_connections

remove test_stale_connections because it applies to remoto

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: add test_offline, edit with_cephadm_module

add `event_loop` and `tkey` object to with_cephadm_module, and create MockEventLoopThread in fixtures.py to test async functions of ssh.py.
rewrite test_offline to be compatible with asyncssh

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: simplify _deploy_cephadm_binary, remove _deploy_cephadm_binary_conn

_deploy_cephadm_binary can be simplified to call write_remote_file in ssh.py, and _deploy_cephadm_binary_conn is no longer needed

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: use _remote_connection (ssh.py), _execute_command, _check_execute_command in _run_cephadm

remove _get_connection from module.py and _remote_connection in serve.py, replacing with _remote_connection in ssh.py.
also, replace remoto.process.check with _execute_command and _check_execute_command in ssh.py

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: remove remotes.py, replace old _write_remote_file in serve.py with write_remote_file in ssh.py

remove remotes.py because it is specific to execnet/remoto.
_write_remote_file in ssh.py now fulfills the function of write_file in remotes.py and the old _write_remote_file in serve.py

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: remove _executable_path from module.py

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: make synchronous wrapper functions of the async functions in ssh.py

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: create thread to start event loop for ssh.py, and return results of the async functions with get_result

The EventLoopThread class starts a thread and an event loop which runs forever. Coroutines are scheduled on the event loop by the `get_result` method which uses `run_coroutine_threadsafe` to return a concurrent.futures.Future, and ultimately the result with .result()

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: move _reconfig_ssh, _reset_con, and _reset_cons to ssh.py

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: create async function _write_remote_file to write files on remote host

_write_remote_file uses _check_execute_command in ssh.py which calls _execute_command which uses shlex quote. Thus, any commands with an int will need to be transformed into a str because shlex quote does not take int objects

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: execute commands run over ssh via asyncssh

_execute_command will run commands over ssh using the asyncssh `run` method: https://asyncssh.readthedocs.io/en/latest/api.html#asyncssh.SSHClientConnection.run
_check_execute_command will check the output of _execute_command and raise OrchestratorError if command fails on the remote host.
All commands run over ssh are prepended with sudo in `_execute_command` and shell-escaped with shlex quote.
If the cached ssh connection is closed or broken, the connection object will be removed from the cache, added to the `offline_hosts`, and an OrchestratorError will be raised. On the next call, the connection object will attempt to be recreated.
Exceptions involving asyncssh methods should be handled otherwise errors like TypeError: __init__() missing 1 required positional argument: 'reason' could occur due to the asyncssh error interacting with `raise_if_exception`

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

mgr/cephadm: create and cache asyncssh connection objects, and handle asyncssh connection errors

Create asyncssh connection object in async `_remote_connection` function and cache in `self.cons`
Create a handler for asyncssh log redirection and output ssh log if a connection error occurs
Disable asyncssh logger from propagating because the asyncssh info messages are verbose

Fixes: https://tracker.ceph.com/issues/44676
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>

cmake: exclude "grafonnet-lib" target from "all"

so we don't build this target when running "make", and hence avoid
accessing the internet in a building envronment where the internest
access is not allowed.

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

Merge pull request #42813 from wjwithagen/wjw-fix-hexdump-output

blk: start 1st line of hexdump() on a new line

Reviewed-by: Kefu Chai <tchaikov@gmail.com>

Merge pull request #42856 from dang/wip-dang-zipper-manifest

RGW - Zipper - Remove RGWManifest from API

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

Merge pull request #41522 from Dreamyu20xx/wip-50967

rgw: Get the correct initial value(pos) in raw_obj_to_obj function when zoneid contains ‘_ ’character.

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

Merge pull request #42723 from liewegas/fix-rgw-warning-2

rgw: default auth_client_required=cephx

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

Merge pull request #42803 from joke-lee/sts-memory-leak

rgw: fix sts memory leak

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

Merge pull request #42683 from cbodley/wip-52027

rgw: change order of xml elements in ListRoles response

Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>

Merge pull request #42740 from cbodley/wip-52128

cls/cmpomap: empty values are 0 in U64 comparisons

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>

.github/labeler: add rook label to PRs related to Rook

To make it easier to look for PRs directly related to the Rook orchestrator.

Signed-off-by: Joseph Sawaya <jsawaya@redhat.com>

Merge pull request #42863 from sebastian-philipp/centos_8.2_container_tools_3.0.yaml

qa/distro: Add centos_8.2_container_tools_3.0.yaml

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>

qa/distro: Add centos_8.2_container_tools_3.0.yaml

Let's avoid latest kubic stable

Fixes: https://tracker.ceph.com/issues/52279
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

Merge pull request #42842 from ideepika/wip-werror-testing

run-make-check.sh: fix run-make-check.sh skipping cmake options

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

blk: start 1st line of hexdump() on a new line

Otherwise the fist line looks rather strange

```
2021-08-19T23:42:33.604+0200 4f60700 40 bdev:kd:965(0x4fab180 /usr/local/src/wip.bluestore-test/build/dev/osd0/block.db) data: 00000000  56 f9 b8 f8 1c 00 01 01  1a 6c 65 76 65 6c 64 62  |V........leveldb|
00000010  2e 42 79 74 65 77 69 73  65 43 6f 6d 70 61 72 61  |.BytewiseCompara|
00000020  74 6f 72 98 af 58 a6 02  00 01 02 00 d2 c7 3c 95  |tor..X........<.|
00000030  06 00 01 09 00 03 04 04  00 6b 93 6d c5 2b 00 01  |.........k.m.+..|
00000040  01 1a 6c 65 76 65 6c 64  62 2e 42 79 74 65 77 69  |..leveldb.Bytewi|
.....
```

versus new:
```
2021-08-19T23:42:33.604+0200 4f60700 40 bdev:kd:965(0x4fab180 /usr/local/src/wip.bluestore-test/build/dev/osd0/block.db) data:
00000000  56 f9 b8 f8 1c 00 01 01  1a 6c 65 76 65 6c 64 62  |V........leveldb|
00000010  2e 42 79 74 65 77 69 73  65 43 6f 6d 70 61 72 61  |.BytewiseCompara|
00000020  74 6f 72 98 af 58 a6 02  00 01 02 00 d2 c7 3c 95  |tor..X........<.|
00000030  06 00 01 09 00 03 04 04  00 6b 93 6d c5 2b 00 01  |.........k.m.+..|
00000040  01 1a 6c 65 76 65 6c 64  62 2e 42 79 74 65 77 69  |..leveldb.Bytewi|
.....
```

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

Merge pull request #42852 from sebastian-philipp/centos_8.3_container_tools_3.0.yaml

qa/cephadm: centos_8.3_container_tools_3.0.yaml

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

Merge pull request #41950 from zenomri/rgw-crypt-dpp

src/rgw : ldout and lderr calls were replaced by ldpp_dout calls

Reviewed-by: Ali Maredia <amaredia@redhat.com>

RGW - Zipper - Remove StatOp

As part of removing RGWObjManifest from the Zipper API, we need to
remove StatOp.  It's only used by orphan list, which is part of the
RadosStore.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

RGW - Zipper - Remove WriteOp

As part of removing RGWObjManifest from the Zipper API, we need to remove
WriteOp.  Fortunately, with the multipart upload changes, it's no longer
needed outside the RadosStore.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #42851 from dang/wip-dang-zipper-raw_obj

RGW - Zipper remove unused files

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

Merge pull request #42834 from josephsawaya/rook-orch-qa

qa/tasks/rook: add `ceph orch device ls` command to the rook qa task

Merge pull request #42757 from josephsawaya/wip-mgr-rook-osd-creation

mgr/rook: Rook orchestrator OSD creation using `ceph orch apply osd`

qa/cephadm: centos_8.3_container_tools_3.0.yaml

Let's avoid latest stable

Fixes: https://tracker.ceph.com/issues/52279
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

RGW - Zipper remove unused files

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #42796 from dang/wip-dang-zipper-raw_obj

RGW - Remove last rgw_raw_obj from zipper

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

run-make-check: fix do_cmake not consuming run-make-check opts

run-make-check.sh uses run-make.sh to `prepare`(install dependencies)
and `configure` cmake options, without quotes these options containing
special characters(hypens mostly) are skipped, hence we see not all
options supplied at cmake configure step.

Resolves(focused to solve issues in jenkins build env):
 - missing cmake options:
    cmake_opts+=" -DCMAKE_CXX_COMPILER=$cxx_compiler -DCMAKE_C_COMPILER=$c_compiler"
    cmake_opts+=" -DCMAKE_CXX_FLAGS_DEBUG=\-Werror"
 - Ninja not being used as cmake generator

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

Merge pull request #42793 from sebastian-philipp/dashboard-fix-standby-redirect

pybind/mgr: Fix IPv6 url generation

Merge pull request #42302 from myoungwon/wip-51000

osd: fix to allow inc manifest leaked

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #42820 from ronen-fr/wip-ronenf-mgr-argvvec

common: create a faster & cleaner alternative to argv_to_vec()

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

Merge pull request #42823 from mgfritch/ceph-volume-py3-exec

cmake: s/Python_EXECUTABLE/Python3_EXECUTABLE/

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

Merge pull request #42799 from varshar16/wip-update-email-id

.githubmap: update mail address

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

Merge pull request #42835 from ceph/wip-ctest-fail

run-make-check.sh: Increase failure output log size

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

Merge pull request #42828 from tchaikov/wip-doc-dev-config

doc/dev/config: update to in sync with latest .yaml.in changes

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

run-make-check.sh: Increase failure output log size

Fixes: https://tracker.ceph.com/issues/43566
Signed-off-by: David Galloway <dgallowa@redhat.com>

qa/tasks/rook: add device ls command to rook task

This commit adds the device ls command to the rook qa task
since that command should be working from now on.

Signed-off-by: Joseph Sawaya <jsawaya@redhat.com>

RGW - Zipper - remove last rgw_raw_obj from API

Remove the remaining rgw_raw_obj from the API.  This consists of:

- move get/delete raw_obj from Store to RadosStore; it's only needed by
  RadosStore code
- Add a layout formatter to the API
- remove head_obj and get_manifest() from ReadOp
- Remove GCChain (no longer needed)

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

Fix uninitialized warnings

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #42827 from ronen-fr/wip-ronenf-std-fix2

key_value_store: fix missing std

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

Merge pull request #42825 from hualongfeng/fix_blk_pmem

blk/pmem: Add namespace std for map,string

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

mgr/cephadm: fix generation of wrong IPv6 urls

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

mgr/restful: Fix url generation for IPv6 hosts

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

mgr/prometheus: Fix url generation for IPv6 hosts

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

mgr/dashboard: Fix redirect to active MGR

Fixes: https://tracker.ceph.com/issues/52117
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

pybind/mgr: move build_url from dashboard to mgr_util

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

Merge pull request #42690 from adk3798/offline2

mgr/cephadm: make scheduler able to accomodate offline/maintenance hosts

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Reviewed-by: Cory Snyder <csnyder@iland.com>

doc/dev/config: update to in sync with latest .yaml.in changes

we migrated to a build process which translate the options from .yaml.in
files. so update the document to reflect this change.

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

Merge pull request #42592 from vfreex/cephadm-better-port-stripping

cephadm: better port stripping

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>

Merge pull request #42590 from vfreex/cephadm-propagate-env-vars

cephadm: propagate environment variables to subprocesses

Merge pull request #42589 from vfreex/fix-cephadm-ipv6

cephadm: Fix bootstrap error with IPv6 mon-ip

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>

Merge pull request #42816 from sebastian-philipp/cephadm-upgrade-status-message

mgr/cephadm/upgrade: Upgrade status: We also upgrade non-ceph daemons

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

key_value_store: fix missing std

following the removal of 'using std' in PR #42742, and missed
in PR #42790.

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

Merge pull request #41968 from CongMinYin/fix-ssd-bug

librbd/cache/pwl/ssd: fix m_bytes_allocated exceeding m_bytes_allocated_cap

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

Merge pull request #42768 from s0nea/wip-dashboard-suppressed-alerts

mgr/dashboard: don't notify for suppressed alerts

blk/pmem: Add namespace std for map,string

Due to not use namespace std for map,string, it leads to
`map,string` not be declared.

Signed-off-by: Feng Hualong <hualong.feng@intel.com>

Merge pull request #42758 from liewegas/gh-template

.github/pull_request_template: fix dashboard e2e test command

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

Merge pull request #42801 from ivancich/wip-update-rados-rm-help

doc: clarify use of `rados rm` command

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