mds: Fix duplicate client entries in list to avoid multiple client evictions

Cannot be cherry-picked from master because the container to be changed that's being used in mimic is std::list instead of std::vector

Fixes: https://tracker.ceph.com/issues/41585
Signed-off-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
(manual backport of f4afb43f3649161516f2350df9fd1d918b13736b)

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>

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)

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>

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>

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>

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>

Merge pull request #26496 from batrick/i35975-2

mimic: qa: whitelist cap revoke warning

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

qa: whitelist cap revoke warning

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

Merge pull request #26309 from pdvian/wip-38192-mimic

mimic: rgw: Object can still be deleted even if s3:DeleteObject policy is set

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

Merge pull request #25782 from pdvian/wip-37693-mimic

mimic: mon: mark REMOVE_SNAPS messages as no_reply

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

Merge pull request #25785 from ukernel/mimic-37740

mimic: mds: extend reconnect period when mds is busy

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

Merge pull request #26252 from ukernel/mimic-37480

mimic: mds: handle fragment notify race

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

Merge pull request #26292 from pdvian/wip-38189-mimic

mimic: mds: broadcast quota message to client when disable quota

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

osd, test: Add test case with osd support for overdue PG scrubs and deep scrubs

Add trigger_deep_scrub osd command for testing
Publish stats when trigger_scrub/trigger_deep_scrub is used for testing
Add optional argument to trigger_scrub/trigger_deep_scrub
for amount of extra time to change last scrub stamps

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

Conflicts:
        src/osd/OSD.cc : Resolved in test_ops

Modify osd-scrub-repair.sh from master branch version to use mimic
mon_warn_not_scrubbed and mon_warn_not_deep_scrubbed config values.

mon: Fix scrub health warning handling

Make this mon_warn code clearer since it involves 2 values
Code used mon scrub interval instead of pg scrub interval
Fix scrub warniing handling use per-pool intervals when specified

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

Modified from master to leave config name alone and not to use ratio

common: Fix some configuration descriptions

osd_scrub_backoff_ratio
osd_deep_scrub_randomize_ratio

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

osd: Increase log level in PG::_update_calc_stats()

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

test: Correct typo trying to call flush_pg_stats

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

Merge pull request #26129 from pdvian/wip-38039-mimic

mimic: rgw: fails to start on Fedora 28 from default configuration

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

Merge pull request #26266 from pdvian/wip-38147-mimic

mimic: rgw: "radosgw-admin bucket rm ... --purge-objects" can hang

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #26277 from ceph/wip-wjw-boost_noncopyable-mimic

mimic: common: fix missing include boost/noncopyable.hpp

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

mds: fix potential re-evaluate stray dentry in _unlink_local_finish

If MDS handles cap release before _unlink_local_finish, then when MDS
processes _unlink_local_finish, eval_stray might be re-entered twice,
so this will cause crashing.

Fixes: http://tracker.ceph.com/issues/38263
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit 72c93baac64211e9f02fa01e743451bf5d63d7a6)

Conflicts:
src/mds/MDCache.h : Resolved in notify_stray

mds: remove superfluous cap sequence increment

"cap->issue_norevoke(cap->issued())" was introduced by commit
10b1a5663f5 "mds: share inode max size after MDS recovers".
It is no longer required since commit 77515b7a3c7 "mds: increase
cap sequence when sharing max size"

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit d86287fa3cfaf897041fb179e8f7bc7a8818592b)

mds: fix MDCache::finish_snaprealm_reconnect()

It creates MClientSnap message, but does not send it to client

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit b4e7a66235450b9c30ebcaba97f03d371fac2c02)

Merge pull request #26304 from dzafman/wip-38208

mimic: mon: A PG with PG_STATE_REPAIR doesn't mean damaged data, PG_STATE_IN…

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

Merge pull request #26342 from ifed01/wip-ifed-fix-compress-mimic2

mimic: os/bluestore: do not assert on non-zero err codes from compress() call

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

Merge pull request #26354 from pdvian/wip-38239-mimic

mimic: qa/tasks/radosbench: default to 64k writes

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

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

This reverts commit ed65a7a53aedfd56343fdaefdeb59c22256f01b7.

See: https://github.com/ceph/ceph/pull/25956

Seems we don't want [39e8de2](https://github.com/ceph/ceph/commit/39e8de2d72e2541323f8ed9d8b68075fcbd02701)
to be backported.
It turns out the old async-connection implementation will
automatically bump the global_seq each time it switches to
the STATE_CONNECTING state and restarts the connecting process.

The same applies to mimic.

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

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

If we get an error from f[data]sync that is always a fatal error.

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

restful: Fix regression when traversing leaf nodes

The commit 23b6c90 introduced a regression when traversing leaf nodes.
The issue is that it traverses the keys of a `dict` returned by
`nodes_by_id`, not the actual `items` of the node. That resulted in an
500 error because it tried to treat `str` as a `dict` and failed.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit fb51bad963cc649fb12ca0ed8b738a2e819299b6)

mgr: fix beacon interruption caused by deadlock

There is potential deadlock between this code and DaemonServer::send_report()

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
(cherry picked from commit 70e56269b1a459d6b0e7b23bc3037602963ea5c2)

client: flush cap release on session flush

MDS expects the completed cap release prior to responding to the session flush
for cache drop.

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

Conflicts:
src/client/Client.cc
- use m.detach() instead of std::move(m) as argument to send_message()

Merge pull request #26344 from liewegas/wip-centos-notmcalloc-only-mimic

mimic: qa: don't use notcmalloc flavor unless we need it

Merge pull request #25944 from wido/mimic-zabbix-pg

mimic: mgr/zabbix: Send more PG information to Zabbix

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

Merge pull request #26376 from tchaikov/mimic-38266

mimic: tests: Allow multi instances of "make tests" on the same machine

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

test: listen on random port in tests which start ceph-mon

See-also: http://tracker.ceph.com/issues/36737
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 94a84b6f5adad75b3cbf956447ee5d9caf1018d2)

test: write log file to current directory

instead of writing log files to '/tmp', write them to current directory.

by default, ctest runs the tests in ${CMAKE_CURRENT_BINARY_DIR}, so, in
this case, the log files are located in build/src/test/. this ensure
that current user has enough previledge to remove the log files.

this also allows multiple instances of 'unittest_log' to run in parallel.

See-also: http://tracker.ceph.com/issues/36737
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a13a6f1d0b39a541896591cd04fc1980bb1acfee)

Conflicts:
src/log/test.cc: trivial resolution

Merge pull request #26373 from pdvian/wip-38096-mimic

mimic: doc: rados/configuration: refresh osdmap section

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

Merge pull request #25721 from ashishkumsingh/wip-37689-mimic

mimic: ceph-objectstore-tool: Dump hashinfo

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

Merge pull request #26077 from ashishkumsingh/wip-37992-mimic

mimic: osd: keep using cache even if op will invalid cache

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

Merge pull request #26235 from pdvian/wip-38109-mimic

mimic: mgr will refuse connection from the monitor who starts behind it

Reviewed-by: Tim Serong <tserong@suse.com>

Merge pull request #26239 from pdvian/wip-38106-mimic

mimic: osd/PG.cc: account for missing set irrespective of last_complete

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

Merge pull request #26260 from pdvian/wip-38143-mimic

mimic: os/bluestore: fixup access a destroy cond cause deadlock or undefine

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

doc/rados/configuration: refresh osdmap section

"osd map cache size" and "osd map message max" were reduced in commit
855955e58e63 ("osd: reduce size of osdmap cache, messages").

"osd map cache bl size" and "osd map cache bl inc size" were removed
six years ago.

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

Merge pull request #26288 from neha-ojha/wip-wl-slow-mimic

mimic: qa/tasks/thrashosds-health.yaml: whitelist "slow request"

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

Merge pull request #26291 from pdvian/wip-38187-mimic

mimic: deep fsck fails on inspecting very large onodes

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #26324 from smithfarm/wip-38111-mimic

mimic: osd: force-backfill sets forced_recovery instead of forced_backfill in 13.2.1

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

qa/tasks/radosbench: default to 64k writes

The default rados bench is 4MB writes, but this tends to fill up our
tiny test clusters.  Use 64KB instead.

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

qa/tasks/keystone.py: no need for notcmalloc in example

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

qa/suites/rgw/tempest/tasks/rgw_tempest: no need for notcmalloc

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

os/bluestore: do not assert on non-zero err codes from  compress() call

Fixes: https://tracker.ceph.com/issues/37839
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 4083bc29b6b4191a5ef3c17976eeac091626f1b0)

Merge pull request #26329 from dzafman/wip-37393

mimic: osd-backfill-stats.sh fails in rados/standalone/osd.yaml

Fixes: http://tracker.ceph.com/issues/37393
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #26333 from alfredodeza/mimic-rm38229

mimic: doc: pin the version for "breathe" to 4.1.11

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

doc: pin the version for `breathe` to 4.1.11

It has the compatibility needed for Sphinx version 1.6.3

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

test: osd-backfill-stats.sh Fix check of multi backfill OSDs, skip remapped test

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

test: Fix test to detect a test setup failure

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

test: osd-backfill-stats.sh: Fix subtests to get primary which can change

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

qa/standalone/osd/osd-backfill-stats: fixes

Grep from the primary's log, not every osd's log.

For the backfill_remapped task in particular, after the pg_temp change it
just so happens that the primary changes across the pool size change and
thus two different primaries do (some) backfill.  Fix that test to pass
the correct primary.

Other tests are unaffected as they do not (happen to) trigger a primary
change and already satisfied the (removed) check that only one OSD does
backfill.

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

Merge pull request #26294 from jan--f/25390-mimic

[mimic] ceph-volume: revert partition as disk

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

osd/PG: fix misused FORCE_RECOVERY[BACKFILL] flags

__set_force_backfill__ should set PG_STATE_FORCED_BACKFILL
instead of PG_STATE_FORCED_RECOVERY.

Fixes: http://tracker.ceph.com/issues/27985
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 60ef742a84d5201b2a6e6c1780741da0b31c49a8)

rgw: cleanup for RGWDeleteObj::verify_permission()

- if the 'Effect' field of user policy and bucket policy
  is set to 'Allow', RGWDeleteObj::verify_permission()
  should return 0 instead of true;

- as the same with bucket policy, if the 'Effect' field
  of user policy is set to 'Deny', RGWDeleteObj::verify_permission()
  should return -EACCES instead of false;

Signed-off-by: Enming.Zhang <zvampirem77@gmail.com>
(cherry picked from commit 86334645cf96c03515d30804e2df0bdf22916fb5)

Conflicts:
src/rgw/rgw_op.cc : Resolve in verify_permission

rgw: fix obj can still be deleted even if deleteobject policy is set

Fixes: http://tracker.ceph.com/issues/37403
Signed-off-by: Enming.Zhang <zvampirem77@gmail.com>
(cherry picked from commit 84879e915eb3f01b453aa2138cd44c09925e7cd1)

Conflicts:
src/rgw/rgw_op.cc : Resolved in verify_permission

mon: A PG with PG_STATE_REPAIR doesn't mean damaged data, PG_STATE_INCONSISTENT does

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

Merge pull request #25856 from ashishkumsingh/wip-37821-mimic

mimic: qa/rados/upgrade: align thrashing with upgrade suite, don't import/export pgs

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #26074 from wido/mimic-mgr-perf

mimic: mgr: add get_latest_counter() to C++ -> Python interface.

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #25957 from pdvian/wip-37900-mimic

mimic: [journal] max journal order is incorrectly set at 64

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #25987 from ashishkumsingh/wip-37925-mimic

mimic: common: fix for broken rbdmap parameter parsing

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

ceph-volume: add inventory call to functional tests

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit a183a28c5e423c5658a37f7a1d3add9d64c6d683)