Merge pull request #27321 from liewegas/wip-valgrind-mimic

mimic: qa/valgrind: backport of latest valgrind suppressions

qa/valgrind: backport of latest valgrind suppressions

in the correct location

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #26983 from ifed01/wip-ifed-bmap-alloc-mimic

mimic: os/bluestore: backport new bitmap allocator

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

Merge pull request #26961 from pdvian/wip-38666-mimic

mimic: qa: ignore slow metadata io wrn during osd thrash

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

Merge pull request #27053 from rhcs-dashboard/38284-mimic-show-io-stats

mimic: mgr/dashboard: show I/O stats in Pool list

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

qa/suites: fix bluestore links

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 269910fc8b2bdf64b98534ce525318e108aa9409)

Merge pull request #27081 from dzafman/wip-38275

mimic: Fix recovery and backfill priority handling

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

Merge pull request #27032 from cbodley/wip-38797

mimic: doc/rgw: document placement target configuration

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

mgr/dashboard: mimic fix: show I/O stats in Pool list

* Applied same fix as in nautilus.
* Adapted Pool list columns to avoid constant resizing.
* Added 'decimals' argument to dimless pipe in order for
  stats to fit in Pool list columns.

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

osd: Add OSD_BACKFILL_PRIORITY_FORCED with lower priority
than OSD_RECOVERY_PRIORITY_FORCED

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d088ffb09f46c6207cfedd2cdab9f074197af4bb)

test: Add scripts to test backfill/recovery priority handling

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ca5cf14fa83ee89260688d467257bb3d81efdd36)

osd AsyncReserver: Update priority in AsyncReserver for force and cancel-force

Fixes: http://tracker.ceph.com/issues/38041
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 11097f1235265a3eb753adc7e6d2818e5902e39e)

Backport change:
src/common/AsyncReserver.h (Mimic locking in update_priority())

test: Add option to wait_for_clean() to execute at every sleep

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 70b51362084d2ae5f2a6e9e5856f17452c53e3f3)

Merge pull request #26578 from badone/wip-mimic-test-dup_index-trim

mimic: test: Verify a log trim trims the dup_index

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

Merge pull request #26583 from pdvian/wip-38398-mimic

mimic: common: ceph_timer: stop timer's thread when it is suspended

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

Merge pull request #26612 from badone/wip-mimic-drop-GIL-in-get_config

mimic: mgr: drop GIL in get_config

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

Merge pull request #26707 from pdvian/wip-38505-mimic

mimic: rbd: API list_images() Segmentation fault

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

Merge pull request #26944 from ashishkumsingh/wip-38725-mimic

mimic: mgr/dashboard: Search broken for entries with null values

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>

Merge pull request #26517 from yehudasa/wip-rgw-es-fixes-mimic

mimic: rgw: multiple es related fixes and improvements

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

Merge pull request #26687 from pdvian/wip-38502-mimic

mimic: rgw: rgw_file: use correct secret key to check auth

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

Merge pull request #26664 from pdvian/wip-38415-mimic

mimic: rgw: bug in versioning concurrent, list and get have consistency issue

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

Merge pull request #26945 from ashishkumsingh/wip-38726-mimic

mimic: rgw: bucket limit check misbehaves for > max-entries buckets (usually 1000)

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>

Merge pull request #26702 from ceph/backport-mimic-26685

mimic: ceph-volume: use our own testinfra suite for functional testing

Reviewed-by: Alfredo Deza <adeza@redhat.com>

doc/rgw: document placement target configuration

Fixes: http://tracker.ceph.com/issues/24508
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit c95585b1984e60708addee436a774d0c92ce57a6)

Merge pull request #27014 from badone/wip-mimic-CA-mods

mimic: qa/ceph-ansible: modifications for mimic branch

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

qa/objectstore: bluestore -> bluestore-{bitmap,stupid}

The new default is bitmap, so we were testing bitmap twice.  Instead,
explicitly call out stupid and bitmap cases so a future default change
won't break coverage.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f390704b4616c837352e7d6a8df91526cb047f0d)

os/bluestore: fix minor issues in bitmap logging output

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

os/bluestore: fix overlappedd allocation returned by bitmap allocator

Fixes: https://tracker.ceph.com/issues/24598
Signed-off-by: Igor Fedotov <ifedotov@suse.som>
(cherry picked from commit 539af4f27e773cb21d187b75086c7c9498dd7749)

os/bluestore: provide a rough estimate for bitmap allocator
fragmentation.
The approach is counting 'partial' and 'free' slots at L1 on the fly and
use partial / (partial+free) value as rough fragmentation estimate.

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

os/bluestore: rename new bitmap allocator class to BitmapAllocator.

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

os/bluestore: perform allocations aligned with min_length  in new bitmap allocator

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

test/objectstore/unitetest_fastbmap_allocator: replace ASSERT_TRUE with
ASSERT_EQ

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

os/bluestore: respect min_length as allocation granularity for new
bitmap allocator.
It was used a real minimum threshold before this fix which allowed e.g.
allocated extent length to be equal to min_length + 1.

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

os/bluestore: cosmetic new allocator internal method rename.

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

os/bluestore: properly respect min_length when analysing partially free
slots in bitmap allocator.

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

os/bluestore: cosmetic cleanup in new bitmap allocator.

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

os/bluestore: more verbose logging in new bitmap allocator

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

mimic: qa/ceph-ansible: modifications for mimic branch

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

Merge pull request #26860 from ashishkumsingh/wip-38648-mimic

mimic: doc: Fix incorrect mention of 'osd_deep_mon_scrub_interval'

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

os/bluestore: remove original bitmap allocator

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

os/bluestore: align BitMap allocator's init_rm_free/init_add_free parameters with min_alloc_size

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

os/bluestore: fix improper access to a BitmapFastAllocator::last_pos
from multiple threads.

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

test/allocator: move bluestore allocator's benchmarks to a standalone UT

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

os/bluestore: add new bitmap allocator

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

test/allocator: get rid off bitmap allocator specifics and introduce new
performance test cases

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

os/bluestore: add release(PExtentVector) helper to Allocator class to
free PExtentVector explicitly.

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

os/bluestore: get rid off allocator's reserve method

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

Merge pull request #26968 from pdvian/wip-38668-mimic

mimic: doc/radosgw: Document mappings of S3 Operations to ACL grants

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

doc/radosgw: Document mappings of S3 Operations to ACL grants

Since the ACL documentation is a bit sparse, let people know exactly
what operations they can expect to enable with a given ACL grant.

Fixes: https://tracker.ceph.com/issues/38523
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit bd94c93fada952537c7015743db55bff7619afa8)

qa: ignore slow metadata io wrn during osd thrash

Fixes: http://tracker.ceph.com/issues/38651
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 5abcc32ff642b03c4b53e565e995ebb94802579a)

rgw: bucket limit check misbehaves for > max-entries buckets (usually 1000)

RGWBucketAdminOp::limit_check does not correctly handle
truncation/continuation markers across calls to rgw_read_user_buckets(...).
Also, it should, but does not, flush its formatter periodically.

Fixes: https://tracker.ceph.com/issues/35973
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 675b775ea52e0d7b81efb32c6cffa6987190184b)

mgr/dashboard: Search broken for entries with null values

Fixes: http://tracker.ceph.com/issues/38583
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
(cherry picked from commit ee988b90b84a484811b3351ff9eee242ae5b2ebd)

Conflicts:
- src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts
    Modified the file to keep changes to relevant to this version.

13.2.5

Merge pull request #26735 from aclamk/mimic-fix-1600138

mimic: os/bluestore: Fix bluefs - block balance.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #26789 from theanalyst/mimic-resharding-fixes

mimic: rgw: resharding fixes

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

doc: Fix incorrect mention of 'osd_deep_mon_scrub_interval'

Fixed the incorrect mention of 'osd_deep_mon_scrub_interval' in health-checks.rst.
Changed it to 'osd_deep_scrub_interval'.

Fixes: https://tracker.ceph.com/issues/38310
Signed-off-by: Ashish Singh <assingh@redhat.com>
(cherry picked from commit 7108e6a3c7ec1f3ae3c39682f43db99efb2b7a6c)

Conflicts:
doc/rados/operations/health-checks.rst
           - Fixed conflicts to keep relevant changes.

Merge pull request #26814 from tspmelo/wip-fix-resolve-mimic

mimic: mgr/dashboard: Fix dashboard compile error

Reviewed-By: Sebastian Wagner <swagner@suse.com>
Reviewed-By: Laura Paduano <lpaduano@suse.com>
Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>

mgr/dashboard: Fix dashboard compile error

New version of lodash was generating a compile error.
With this change npm will install an older version of lodash.

Fixes: https://tracker.ceph.com/issues/38590
Fixes: https://tracker.ceph.com/issues/38602
Signed-off-by: Tiago Melo <tmelo@suse.com>

rgw: fix typo

This fixes a typo in a log message. It's a separate commit so
downstream commits point to the right upstream commits via
cherry-pick.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 7d1768f2a332c5ac389cbb4bbeda28752e4f17bc)

rgw: perf -- remove bucket shards asynchronously rather than synchronously

We can now take advantage of the new asynchronous bucket shard removal
code and where we used to remove each shard synchronously now remove
them asynchronously. This would be a huge win when we have tens of
thousands of shards.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit cb0da45c5d6e4dff6514919b3b894df0eea7c1e4)

 Conflicts:
src/rgw/rgw_rados.cc
conflicts with placement set and rgw rados refactor

rgw: clean up unused bucket index shards

Clean up old bucket index shards when a resharding is complete. Also,
when a resharding fails, clean up unfinished bucket index shards. Do
both clean-ups asynchronously.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit f84f70d451036ee99011b8e2c7b974f15d3a005a)

 Conflicts:
src/rgw/rgw_rados.h
merge conflict as bucket_placement functions were moved after the rgw rados
refactor

rgw: a little code clean-up by adding const

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 48e22fb76feffb551074f274986bc4125a02003f)

rgw: remove never-called RGWRados member function

Because RGWRados::cls_rgw_init_index is never called, remove it.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 4593778c6d830a1a0d33528507f1795aee019ce4)

rgw: rename function for clarity

The function cls_rgw_bucket_init was renamed to
cls_rgw_bucket_init_index in order to better describe its
functionality.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 20868bd3b893ba2e17d2bfdc63d6544dbe677a9b)

rgw: batch and process bucket instances

Sort through and batch bucket instances so that multiple calls to reading
current bucket info and locking can be avoided. For the most trivial case when
the bucket is already deleted we exit early with all the stale instances. When
the bucket reshard is in progress we only process the stale entries with status
done, if the bucket is available for locking then we lock down and mark the
other instances as well.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit fb9c0497621fce34283094cfe260480f9122573f)

 Conflicts:
src/rgw/rgw_bucket.cc
Get rid of the following c++17isms:
- split_tenant auto return type -> trailing return type
- tuple destructuring bind for split tenant with std::tie

cli: use rgw-admin reshard stale-instances list/delete

Add a delete command as well that clears the resharded instances. We print out
the json status to indicate success or error state

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit bf8f885016a588130f05c25fdef3d3b6e1216c40)

rgw: implement listing stale instances from a reshard

Dynamic resharding used to leave behind stale bucket instances; walk through the
metadata pool and identify these instances by comparing the reshard status. If
the reshard status is done, these instances are ok to be cleared. For reshard
status of none we compare against the bucket entry point to ensure that we don't
match the current entry point.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 0c35a6fab250a817b2752f319b5c9f1da13bb3df)

ceph-volume: set number of osd ports in the tests

The number of ports the OSDs listen on depend on the version of ceph
being used, so we need to test for that number accordingly.

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

os/bluestore: Fix problem with bluefs's freespace not being balanced when kv_sync_thread is sleeping.

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

librbd: set *image_size to 0 when getting ENOENT in rbd_group_image_list()

Fixes: http://tracker.ceph.com/issues/38468
Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit 141e3a74b6fb10ca923c61dc90e7573f1becf002)

rbd/pybind: add __enter__ and __exit__ for class Group

Fixes: http://tracker.ceph.com/issues/38468
Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit bb8df22e4ae851d858b081a47f063a1f33b4d0c9)

mgr: drop GIL in get_config

Fixes: https://tracker.ceph.com/issues/35985
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit d590a5391876eda23ef286af5800e5bdbb2b4b97)

Conflicts:
        src/mgr/ActivePyModules.cc

ceph-volume: use our own testinfra suite for functional testing

This allows us to run a smaller subset of tests from the ones provided
by ceph-ansible and test only the things that pertain to ceph-volume.

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

rgw_file: use correct secret key to check auth

Currently, the authorize function in rgw_file only use the secret key of
first key pair to compare, add a function which get secret key by user's
access key and check the result is match with user's secret key.

Fixes: https://tracker.ceph.com/issues/37855
Signed-off-by: MinSheng Lin <minsheng.l@inwinstack.com>
(cherry picked from commit e92755c60325475342afcafcd5293a20e3e5216a)

Merge pull request #26451 from smithfarm/wip-38342-mimic

mimic: core: luminous->(mimic,nautilus): PGMapDigest decode error on luminous end

Reviewed-by: Sage Weil <sage@redhat.com>

rgw: bug in versioning concurrent, list and get have consistency issue

Fixes: https://tracker.ceph.com/issues/38060
Signed-off-by: Wang Hao <wanghao72@baidu.com>
(cherry picked from commit cc2a96a47fd71dc8399e31f1a9e87d8a13ea3419)

Merge pull request #26590 from theanalyst/mimic-civetweb-fixes

mimic: rgw: bump mimic civetweb with ssl & abs url fixes

Reviewed-By: Casey Bodley <cbodley@redhat.com>
Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-By: Yuri Weinstein <yuriw@redhat.com>

messages/MMonMgrDigest: use set_data() to avoid screwing up byte_throttler

Use the existing set_data() helper to avoid breaking the byte_throttler
accounting.

Fixes e4ae368ff7a5396194f8bdd5692429af5457998b

Fixes: http://tracker.ceph.com/issues/38295
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit df32d57638ecfcfe2bc88799221e0a85ad37cd38)

message/MMonMgrReport: conditionally reencode PGMapDigest

The encoding changed between luminous and mimic.  Reencode the
structure if the target doesn't have all the features.

Fixes: http://tracker.ceph.com/issues/38295
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e4ae368ff7a5396194f8bdd5692429af5457998b)

Conflicts:
src/CMakeLists.txt
        src/messages/MMonMgrReport.h
- mimic has msgr V1
- do not check SERVER_NAUTILUS on mimic
- use begin() instead of cbegin() on mimic

Merge pull request #26200 from b-ranto/wip-restful-mimic

mimic: mgr/restful: fix py got exception when get osd info

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

Merge pull request #26283 from smithfarm/wip-38141-mimic

mimic: tests: Add hashinfo testing for dump command of ceph-objectstore-tool

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

Merge pull request #26426 from smithfarm/wip-38319-mimic

mimic: mgr: deadlock: _check_auth_rotating possible clock skew, rotating keys expired way too early

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #26593 from smithfarm/wip-38451-mimic

mimic: build/ops: Destruction of basic_string _GLIBCXX_USE_CXX11_ABI=0 and C++17 mode results in invalid delete

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

add a note on rgw civetweb cve in PendingReleaseNotes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

ceph.spec: force use of upgrade devtoolset-gcc under RHEL 7

There is a known crash under C++17 mode that requires an updated
devtoolset to address.

See https://bugzilla.redhat.com/show_bug.cgi?id=1616223

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit a7ce5fb07aa91bfb329dd09f036e5b650f24f2d5)

rpm: bump up required GCC version to 7.3.1

so we can include the fix of
https://gcc.gnu.org/ml/libstdc++/2017-07/msg00077.html and the fix at
https://github.com/gcc-mirror/gcc/commit/7c78f2e67270187dd755632eafe3a526f4e6df30
. otherwise, if a class offers implicit conversion operator to
std::string and std::string_view, seastar will fail to compile. like

/opt/rh/devtoolset-7/root/usr/include/c++/7/bits/basic_string.h:3946:7:
note: candidate: std::basic_string<_CharT, _Traits, _Alloc>&
std::basic_string<_CharT, _Traits, _Alloc>::operator+=(const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char;
_Traits = std::char_traits<char>; _Alloc = std::allocator<char>]
       operator+=(const basic_string& __str)
       ^~~~~~~~
/opt/rh/devtoolset-7/root/usr/include/c++/7/bits/basic_string.h:3988:7:
note: candidate: std::basic_string<_CharT, _Traits, _Alloc>&
std::basic_string<_CharT, _Traits,
_Alloc>::operator+=(std::basic_string<_CharT, _Traits,
_Alloc>::__sv_type) [with _CharT = char; _Traits =
std::char_traits<char>; _Alloc = std::allocator<char>;
std::basic_string<_CharT, _Traits, _Alloc>::__sv_type =
std::basic_string_view<char>]
       operator+=(__sv_type __sv)
       ^~~~~~~~

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

rgw: bump mimic civetweb with ssl & abs url fixes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #26585 from capri1989/doc-fix-mimic

mimic: doc: Fix default value of 'mon_osd_max_split_count'

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

doc: Fix default value of 'mon_osd_max_split_count'

This commit is not cherry-picked from master because the config
parameter mon_osd_max_split_count has been dropped in master

Signed-off-by: Kai Wagner <kwagner@suse.com>

common/ceph_timer: stop timer's thread when it is suspended

otherwise the client could hang when shutting down

Fixes: https://tracker.ceph.com/issues/37766
Signed-off-by: Peng Wang <wp389@126.com>
(cherry picked from commit a942722c5bffbacc8d30643dd9863ef844f0617e)

test: Verify a log trim trims the dup_index

Fixes: https://tracker.ceph.com/issues/38406
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit e91e2f81340846e98ab0704d92a7ad543c416f1b)

Merge pull request #26442 from xiexingguo/wip-mimic

mimic: Revert "msg/async: bump global_seq when retrying connection"

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

Merge pull request #26438 from pdvian/wip-38317-mimic

mimic: os/filestore: ceph_abort() on fsync(2) or fdatasync(2) failure

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

Merge pull request #26573 from neha-ojha/wip-38083-mimic

mimic: qa/workunits/cephtool/test_kvstore_tool.sh: run test in ., not /tmp

Reviewed-by: Sage Weil <sage@redhat.com>

qa/workunits/cephtool/test_kvstore_tool.sh: run test in ., not /tmp

Notably, we can't make a bluestore store on a tmpfs.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5940487be3c848cf45d251f0a00a5d85a5b584e4)

Merge pull request #26493 from dzafman/wip-alternate-backport

mimic: core: scrub warning check incorrectly uses mon scrub interval

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

Merge pull request #26285 from smithfarm/wip-38185-mimic

mimic: tests: krbd discard no longer guarantees zeroing

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

Merge pull request #26424 from smithfarm/wip-38103-mimic

mimic: client: session flush does not cause cap release message flush

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

Merge pull request #26472 from pdvian/wip-38334-mimic

mimic: cephfs: MDCache::finish_snaprealm_reconnect() create and drop MClientSnap message

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

Merge pull request #26474 from pdvian/wip-38335-mimic

mimic: mds: fix potential re-evaluate stray dentry in _unlink_local_finish

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