mgr/dashboard: prometheus alerting: add some leeway for package drops and errors (1%)

Fixes: https://tracker.ceph.com/issues/48201
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>

Merge pull request #37235 from adk3798/4mon

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

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #37916 from orozery/librbd-crypto-wait-for-copyup

librbd: wait for copyup in unaligned crypto write

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

Merge pull request #38017 from YanfeiXu/yann-dev

cmake: add support for python3.9

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

Merge pull request #38021 from tchaikov/wip-mgr-liburl3

pybind/mgr: add urllib3==1.25.11 to mgr/requirements.txt

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

pybind/mgr: add urllib3==1.25.11 to mgr/requirements.txt

in hope to address the failure of

ERROR: Cannot install -r requirements.txt (line 3) and kubernetes because these package versions have conflicting dependencies.

The conflict is caused by:
    kubernetes 12.0.0 depends on urllib3>=1.24.2
    requests 2.24.0 depends on urllib3!=1.25.0, !=1.25.1, <1.26 and >=1.21.1

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

cmake: add support for python3.9

add support for python3.9.

Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com>

Merge pull request #37775 from dzafman/wip-upgrade-mimic-fix

test: Remove mimic-x* upgrade testing in master

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

Merge pull request #38006 from xxhdx1985126/wip-crimson-recovery-bug-fix2

crimson/osd: make load_obc_for_recovery pop up all errors

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

crimson/osd: make load_obc_for_recovery pop up all errors

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

Merge pull request #37943 from xxhdx1985126/wip-crimson-recovery-bug-fix

crimson: recovery bug fix

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

Merge pull request #37997 from rhcs-dashboard/48155-fix-api-test-full-health

mgr/dashboard: fix API test: test_full_health

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

mgr/dashboard: fix API test: test_full_health

Fixes: https://tracker.ceph.com/issues/48155
Signed-off-by: Alfonso Martínez <almartin@redhat.com>

Merge PR #37942 into master

* refs/pull/37942/head:
ceph-volume: fix lvm help test
ceph-volume: add a unit tests to lvm batch
ceph-volume: fix lvm batch auto with full SSDs

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>

crimson/osd: make non-first push ops' version to be the version of the recovering object

An object may take more than one push op to recover, those later push ops also need to
set their version accordingly

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

crimson/osd: make PglogBasedRecovery op take recovering objs triggered elsewhere into account

PGRecovery::start_recovery_ops() should wait for all inflight recovery ops, whether they are
started by BackgroundRecovery or not, otherwise there may be circumstances in which BackgroundRecovery
keep recursively invoking its do_recovery when start_recovery_ops returns recovery done while there are
still missing objects.

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

Merge pull request #37941 from dzafman/wip-48077

Allowing scrub configs begin_day/end_day to include 7 and begin_hour/end_hour to include 24 is confusing

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

Merge pull request #37539 from zdover23/wip-doc-ceph-df-2020-oct

doc/rados: ceph df output update

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

test: unittest_osdscrub: Remove invalid hour test and add day of week testing

Signed-off-by: David Zafman <dzafman@redhat.com>

osd: Eliminate day of weeek 7 and hour 24

Add test case for permitted hours to make sure scrub doesn't start
Remove permitted hours in extended sleep test

Fixes: https://tracker.ceph.com/issues/48077
Signed-off-by: David Zafman <dzafman@redhat.com>

doc/rados: ceph df output update

This commit updates the "ceph df" output
so that it is current as of October 2020.
-Add correctly formatted `ceph df` output.
-Add explanation of "DIRTY" column.
-(DATA) remains to be defined (1 instance)
-(OMAP) remains to be defined (1 instance)
-USED remains to be defined (1 instance)
-Update prompts in "Checking OSD Status"

Fixes: https://tracker.ceph.com/issues/47523
Signed-off-by: Zac Dover <zac.dover@gmail.com>

Merge PR #37932 into master

* refs/pull/37932/head:
src/script/ceph-backport.sh: abort if jq not available

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

ceph-volume: fix lvm help test

ed5ceb0 changed the LVM help code but not the associated test.

Signed-off-by: Dimitri Savineau <dsavinea@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>

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>

Merge pull request #37928 from tchaikov/wip-qa-ceph-ctx-archive

qa/tasks/ceph: extract update_archive_setting()

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

Merge pull request #37453 from tspmelo/wip-rbd-change-detection

mgr/dashboard: Improve Change Detection on RBD Snapshot

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

Merge pull request #37641 from henyxia/dev/henyxia/add-mgr-dashboard-prom-ssl-verify

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #37983 from tchaikov/wip-crimson-os-co-locate-alien-allocator

crimson/os: do not configure seastar allocator for alien threads

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

Merge PR #32777 into master

* refs/pull/32777/head:
common,log,msg: Fix win32 compiler warnings
win32,common: provide a default ceph.conf location
common: add newline before parsing config on Windows
common: verify unix sockets support on Windows
common: fix md_config_t::get_cluster_name
global, common: Print config parse errors
common: accept config files containing whitespaces
librbd: avoid broken mingw rng
common: define DEV_NULL
tools,common,msg: Use O_BINARY for win32 compatibility
log: fix timestamps on Windows
common,librbd: add portable ceph_memzero_s
common,msg: Fix socket handling
common: Extend win32 compatbility layer

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

Merge pull request #37984 from tchaikov/wip-fio

cmake: drop WITH_SYSTEM_FIO option

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #37965 from rhcs-dashboard/about-modal-cleanup

mgr/dashboard: Moving copyright variable into the app.constants

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #37958 from ronen-fr/wip-ronenf-librbd-move1

librbd: removing a "pessimizing move"

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

Merge pull request #37990 from tchaikov/wip-liburing-fPIC

cmake: build liburing with -fPIC

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

Merge pull request #37915 from gregsfortytwo/wip-stretch-fixes

Fix several stretch mode issues

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

Merge PR #37741 into master

* refs/pull/37741/head:
ceph-volume: remove mention of dmcache from docs and help text

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>

Merge PR #37896 into master

* refs/pull/37896/head:
ceph-volume: implement the --log-level flag

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #37506 from rhcs-dashboard/fix-47478-master

mgr/dashboard: Improvements in cluster > OSDs

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #37649 from rhcs-dashboard/add-header-tooltip

mgr/dashboard: add description for CRUSH Ruleset

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

cmake: build liburing with -fPIC

in liburing,
https://github.com/axboe/liburing/commit/75cad68b953fe0fabbc4b1ced1ab4ba0ed5da18e
partially reverts
https://github.com/axboe/liburing/commit/4e360f71131918c36774f51688e5c65dea8d43f2,
which builds liburing.a with -fPIC.

so we need to pass -fPIC by ourselves. otherwise we'd have

/usr/bin/ld: ../../liburing/src/liburing.a(setup.ol): relocation R_X86_64_PC32 against symbol `io_uring_queue_mmap' can not be used when making a shared object; recompile with -fPIC
/usr/bin/ld: final link failed: Bad value
collect2: error: ld returned 1 exit status
src/test/fio/CMakeFiles/fio_ceph_objectstore.dir/build.make:154: recipe for target 'lib/libfio_ceph_objectstore.so' failed

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

cmake: expose FIO_INCLUDE_DIR via libfio

always use the fio built from source for better consistency.

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

cmake: drop WITH_SYSTEM_FIO option

there is no well-known distro packaging fio.h, so drop this option.

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

Merge pull request #37981 from tchaikov/wip-make-dist

make-dist: add liburing to dist tarball

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

cmake: use make explicitly to build fio

we cannot assume that user uses "make" as the generator of cmake, if,
for instance, ninja is used, `$(MAKE)` is not a valid variable in the
generated `build.ninja`. so we should use "make" explicitly.

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

crimson/os: do not configure seastar allocator for alien threads

4cd2b00d2a703510777bd761609be221859bd790 allows us to colocate seastar
allocator used by seastar reactors and libc allocator used by alien threads,
there is no need to configure seastar allocator for alien thread
anymore.

this change partially reverts

- f7715b86ef09a820adb2d43d4e82cabc9a04199f
- b55919071fc872d880bebe70bc270b9d66d02ab0

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

crimson/os: do not #include unused headers

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

cmake: use src/liburing for building liburing if it exists

so we can build with liburing enabled if the dist tarball contains
liburing.

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

make-dist: use a loop to collect the ingredients of the dist tarball

for better readability

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

make-dist: add liburing to dist tarball

since liburing is enabled by default, let's included it in the dist
tarball.

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

make-dist: extract download_from() out

so we can reuse it

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

Merge PR #36998 into master

* refs/pull/36998/head:
doc/mgr/volumes: Document authorize/deauthorize cli commands
qa/tasks/cephfs: test `fs subvolume authorize/deauthorize`
mgr/volumes: Allow/deny auth IDs access to FS subvolumes
mon/MonCap: allow 'profile mgr' to create/update/del auth IDs

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

Merge PR #37618 into master

* refs/pull/37618/head:
mds: throttle cap acquisition via readdir

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

Merge PR #37662 into master

* refs/pull/37662/head:
mon/MDSMonitor: deal with subscription after being expired

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #37600 from mgfritch/cephadm-nfs-rgw

mgr/cephadm: add RGW support for NFS ganesha

Reviewed-by: Daniel-Pivonka <dpivonka@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #37792 from p-se/monitoring-prom-many-to-many

mgr/cephadm: many-to-many Prometheus error

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #37967 from linuxbox2/wip-rgwfile-zwrite

rgw_file: fix some zipper flow for RGWLibContinuedReq

Merge pull request #37968 from changchengx/paxos

mon/PaxosService: remove unnecessary code

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

Merge pull request #37970 from toabctl/fix-orch-cli-doc-link

mgr/orchestratori: Fix doc link in README.rst

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

mgr/orchestrator_cli: Fix doc link in README.rst

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>

doc: update stretch mode doc to not be a lie

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

mon: include stretch mode status in more outputs

It was missing from the monmap dump, and included in OSDMap::dump()
but not the OSDMap::print() which is used for text-based CLI queries.

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

mon: retain disallowed leader list on restart

We were only setting this when new monmaps were read from paxos -- whoops!
Pull apart that mechanism a little bit and make sure to set them before
doing elections, as part of bootstrap.

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

mon: Output the real leader in ::_quorum_status() and get_leader_name()

These functions previously assumed the first mon in the quorum
was the leader. That isn't accurate if the first monitor is
disallowed or it lost a connectivity-mode election, though.

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

mon: monmap: print out disallowed_leaders in text form, when non-empty

This is already dumped in the programmatic output, but it got left out of
the direct-user-facing calls (as in "ceph mon dump").

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

mon: Do not increase compatv when using monitor location or stretch mode

For mon_info_t, I first wrote things so that when monitors get a location
added in MonMap::mon_info_t, I bumped the struct_v to 5 and also bumped
the min_compat to 5. This made sure that nobody could decode the
struct and lose the location info, which if it were a monitor
would be very bad.

And for the MonMap, when stretch mode is enabled I bumped up the
comptav (in addition to the always-increased struct_v), for the same reason.

But clients also have to decode these structures, and we can't
disallow older clients from connecting to a stretched cluster.

Happily, usage of any stretch modes already requires a feature
bit and sets it as required in the monmap, so these are already
gated. Therefore, just don't set new compat values in these cases.

While at it, also gate setting the location on the monmap indicating
all monitors are updated.

Reported-by: Travis Nielsen <tnielsen@redhat.com>
Signed-off-by: Greg Farnum <gfarnum@redhat.com>

mon: fix erroneous commit of monmap stretch mode when failing to enable

MonmapMonitor::try_enable_stretch_mode() was accidentally writing into the
pending_map even when commit was false. Whoops!

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

Merge pull request #37966 from tchaikov/wip-cmake-uring

cmake: set GIT_SHALLOW and UPDATE_DISCONNECTED

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

cmake: set GIT_SHALLOW and UPDATE_DISCONNECTED

* GIT_SHALLOW=TRUE, so we don't pull the full git history,
  as we don't care about it.
* UPDATE_DISCONNECTED=TRUE, to skip the UPDATE step, this change
  somehow works around
  https://gitlab.kitware.com/cmake/cmake/-/issues/19703. otherwise
  cmake keeps building liburing.

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

blk/kernel/io_uring: bump liburing to v0.7

* use functions exposed by liburing instead of using syscalls
* v0.7 is the latest release at the time of writing, as liburing is under
  active development. it'd be better to use a newer release.
* also use https://git.kernel.dk/liburing instead of
  http://git.kernel.dk/liburing.

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

rgw_file: fix some zipper flow for RGWLibContinuedReq

Some bits of the standard Zipper conversions were missed for
the RGWLibContinuedReq case, where the setup is encapsulated in
the request, but execution is broken up in to steps.   This
currently affects only RGWWriteRequest.

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

librbd: removing a "pessimizing move"

Silencing a compiler warning ("warning: moving a temporary object
prevents copy elision")

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

mgr/dashboard: Moving copyright into the app.constants

Move the variable copyright from about.component.ts to the app.constants.ts

https://tracker.ceph.com/issues/48135
Signed-off-by: Nizamudeen A <nia@redhat.com>

Merge pull request #37919 from tchaikov/wip-cmake-liburing

cmake: enable LIBURING bluestore backend by default

Reviewed-by: Mark Nelson <mnelson@redhat.com>

Merge pull request #37929 from BryceCao/wip-modify-error-code-of-bucket-info-API

rgw : modify error message to NoSuchBucket when bucket doesn't exist in bucket info API

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

Merge pull request #37913 from rhcs-dashboard/button-disable

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

Merge pull request #37832 from tchaikov/wip-doc-slow-ops

doc: reformat health-messages.rst and revise SLOW_OPS section

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

Merge pull request #37951 from agayev/misc-zbd-changes

doc, os/bluestore: Zoned storage related cleanup.

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

Merge pull request #37637 from p-se/dashboard-smart-logging

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

doc/mgr/volumes: Document authorize/deauthorize cli commands

Fixes: https://tracker.ceph.com/issues/40401
Signed-off-by: Kotresh HR <khiremat@redhat.com>

qa/tasks/cephfs: test `fs subvolume authorize/deauthorize`

Fixes: https://tracker.ceph.com/issues/40401
Signed-off-by: Ramana Raja <rraja@redhat.com>
Signed-off-by: Kotresh HR <khiremat@redhat.com>

mgr/volumes: Allow/deny auth IDs access to FS subvolumes

... via the `ceph fs subvolume authorize/deauthorize` command.

Fixes: https://tracker.ceph.com/issues/40401
Signed-off-by: Ramana Raja <rraja@redhat.com>
Signed-off-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #37454 from votdev/custom_container_docs

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

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

Merge pull request #37946 from bk201/wip-47373

mgr/dashboard: disable cluster selection in NFS export editing form

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

mon/MonCap: allow 'profile mgr' to create/update/del auth IDs

Signed-off-by: Ramana Raja <rraja@redhat.com>

Merge pull request #37955 from tchaikov/wip-cmake-crimson-cleanup

cmake: rename crimson tests named like foo_bar to foo-bar

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

Merge pull request #37953 from tchaikov/wip-crimson-recovery-cleanup

test/crimson: do not support variadic future

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

cmake: do not name demo-like tests with unittest-*

these tests cannot be exercised without human intervention.

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

cmake/test: remove duplicated target_link_libraries()

it is a copy-n-paste error.

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

cmake: rename crimson tests named like foo_bar to foo-bar

for two reasons:

* less typing: no need to press "shift" for inputting "_"
* more consistent with executable names like "ceph-conf"
* simpler to grep when compiling the tests. there is chance
  we need to kill the dead jobs on a jenkins worker node
  where it happens to be compiling the tests.

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

Merge pull request #37940 from yuvalif/remove_lua_submodule

rpm,deb,cmake: remove the lua submodule

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

Merge PR #37869 into master

* refs/pull/37869/head:
qa: for the latest kclient it will also return EIO

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

Merge PR #37713 into master

* refs/pull/37713/head:
mds: fix wrong log text and allignment

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

Merge PR #37664 into master

* refs/pull/37664/head:
cephfs: release client dentry_lease before send caps release to mds

Reviewed-by: Zheng Yan <zyan@redhat.com>

Merge PR #37654 into master

* refs/pull/37654/head:
mds: print the METRIC_TYPE for debug info
mds: add XXPayload:print support
mds: only update the requesting metrics

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

Merge PR #32479 into master

* refs/pull/32479/head:
mds: add dentry lease metric payload support
client: add _dentry_valid() helper support

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

crimson/common: refactor crimson::do_until()

* define `errorator_t` instead of `futurator` to simplify the code a
  little bit.
* use seastar helper function / types when appropriate

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

test/crimson: do not support variadic future

also add "unittest-seastar-errorator" to unit test.

this should address the build failure introduced by
688b95798bfd88b409abce9b70bb6d2933819bef

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

Merge pull request #37950 from tchaikov/wip-crimson-recovery-cleanup

crimson: cleanups

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

mon/PaxosService: remove unnecessary code

The class declaration has been included in the header file.

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

mon/MDSMonitor: deal with subscription after being expired

check expiration condition before taking further action

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