Merge pull request #29996 from iliul/export-standby-metadata

mgr/prometheus: export standby mds metadata

Merge pull request #30122 from tchaikov/wip-40646

install-deps: revert 47d4351d

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

Merge pull request #30119 from neha-ojha/wip-41385

osd/MissingLoc, PeeringState: remove osd from missing loc in purge_strays()

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

Merge pull request #30072 from wjwithagen/wjw-wip_split_run-rbd-unit-tests

test/librbd: allow parallel runs of run-rbd-unit-tests

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

install-deps: revert 47d4351d

this change reverts 47d4351d3ad2787ae7781d868608eb0e3c7797c7

see also 33dfffc8

Fixes: https://tracker.ceph.com/issues/40646
Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #30018 from xiexingguo/wip-38483

osd: prime splits/merges for any potential fabricated split/merge participant

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

test/librbd: allow parallel runs of run-rbd-unit-tests

Running all tests sequential makes it the longest test of
`make check`, with each partial test taking around 500 sec.
Running 6 tests thus takes almost an hour.

Cut this down if ctest runs tests in parallel

Default behaviour of src/test/run-rbd-unit-tests.sh is kept:
  Without parameters the tests are run in sequence

To run unitttest_librbd with RBD_FEATURES, use `N` as parameter

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

Merge pull request #29990 from aclamk/fix-doc-ceph_kvstore_tool-stats

doc/ceph-kvstore-tool: add description for 'stats' command

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

doc/man/ceph-kvstore-tool: fix typo

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

osd/MissingLoc, PeeringState: remove osd from missing loc in purge_strays()

We should always try to keep osds in missing_loc consistent with peer_missing
and peer_info. When we remove an osd from peer_missing and peer_info, we
should also remove it from missing_loc during purging strays.

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

Merge pull request #29639 from baixueyu/wip-crypto-bug

rgw: get barbican secret key request maybe return error code

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

Merge pull request #29776 from cbodley/wip-rgw-beast-static-flat-buffer

rgw: increase beast parse buffer size to 64k

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

Merge pull request #29852 from cbodley/wip-41395

rgw: move bucket reshard checks out of write path

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

Merge pull request #29856 from cbodley/wip-41412

rgw: RGWCoroutine::call(nullptr) sets retcode=0

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #29894 from markhpc/wip-rgw-reshard-json

rgw/rgw_reshard: Don't dump RGWBucketReshard JSON in process_single_logshard

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

Merge pull request #30088 from tchaikov/wip-40646

ceph.spec.in: use g++ >= 8.3.1-3.1

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

Merge pull request #29742 from dang/push

rgw: make sure modelines are correct for all files

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

Merge pull request #29199 from tianshan/fix_gc_tag_remove

rgw: gc remove tag after all sub io finish

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

Merge pull request #29628 from NancySu05/lihuanhuan

RGW: add bucket permission verify when copy obj

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

Merge pull request #29943 from markhpc/wip-rgw-optimize-get_val2

rgw/rgw_op: Remove get_val from hotpath via legacy options

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

Merge pull request #29654 from Songweibin/wip-rbd-list-descendants

 librbd: skip stale child with non-existent pool for list descendants

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

Merge pull request #30113 from tchaikov/wip-dmclock

dmclock:  pick up change to use specified C++ settings if any

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

dmclock:  pick up change to use specified C++ settings if any

see https://github.com/ceph/dmclock/pull/73

so dmclock won't add `-std=c++11` to CXX_FLAGS even if the parent project already
have `-std=c++17` in CXX_FLAGS.

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

Merge pull request #29613 from trociny/wip-41206

librbd: behave more gracefully when data pool removed

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

Merge PR #29835 into master

* refs/pull/29835/head:
osd/PeeringState: fix wrong history of merge target

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

Merge pull request #30097 from jan--f/ceph-backport-cp-indiviudal-commits

ceph-backport.sh: cherry-pick individual commits

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

Merge pull request #30063 from Rjerk/wip-silence-unused-warning

rgw/services: silence -Wunused-variable warning

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

Merge pull request #30065 from tchaikov/wip-rgw-test-wo-global

test: do not include unnecessary includes

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

ceph-backport.sh: cherry-pick individual commits

In git 2.23.0 (possibly earlier too) cherry-pick seems to interact with
rev-list and submodules in unexpected ways, where the cherry-pick of a
commit range (<sha1>..<sha1>) fails with "changes would be overwritten"
in a submodule. CP'ing individual commits avoids this.

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

Merge pull request #30060 from c744402859/master

rgw: fixed "unrecognized arg" error when using "radosgw-admin zone rm".

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

Merge pull request #30091 from joke-lee/doc-rgw-object-version

rgw: add --object-version in radosgw-admin help info

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

Merge pull request #29957 from smithfarm/wip-ceph-backport-sh-improvements

script/ceph-backport.sh: wholesale refactor

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>

doc/ceph-kvsore-tool: add description for 'stats' command

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

Merge pull request #29665 from rishabh-d-dave/cv-remove-redundant-calls

ceph-volume: minor optimizations related to class Volumes's use

ceph.spec.in: use g++ >= 8.3.1-3.1

since https://bugzilla.redhat.com/show_bug.cgi?id=1726630 has been
fixed. and we have devtoolset-8-gcc-c++-8.3.1-3.1.el7.x86_64.rpm.

no reason to stick with devtoolset-8-gcc-c++-8.2.1-3 anymore.

Fixes: https://tracker.ceph.com/issues/40646
Signed-off-by: Kefu Chai <kchai@redhat.com>

rgw: add --object-version in radosgw-admin help info

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>

Merge pull request #30086 from uniqueyehu/fix-complie-errors-dpdk

msg/async/dpdk: fix complie errors from fix FTBFS

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

msg/async/dpdk: fix complie errors from fix FTBFS

Signed-off-by: yehu <yehu5@huawei.com>

Merge pull request #30010 from wjwithagen/wjw-fix-rbd-ggate-postfork

tools/rbd-ggate: close log before running postfork

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

Merge pull request #29923 from xiexingguo/wip-bump-decode-version

osd/osd_types: bump up some encoding versions

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: yanjun <yan.jun8@zte.com.cn>

Merge pull request #30066 from uniqueyehu/fix-compile-error-dpdk

async/dpdk: fix compile errors from ceph::mutex update

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

test: do not include unnecessary includes

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

librbd: allow remove snapshot with child from non-existent pool

Signed-off-by: songweibin <song.weibin@zte.com.cn>

rgw: fixed "unrecognized arg" error when using "radosgw-admin zone rm".

Signed-off-by: Hongang Chen <c744402859@gmail.com>
Author:    root <root@devel.localdomain>
Date:      Mon Sep 2 11:23:45 2019 +0800

Merge pull request #30034 from tchaikov/wip-install-tox-deps-from-wheelhouse

mgr: install tox deps from wheelhouse

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

async/dpdk: fix compile errors from ceph::mutex update

Signed-off-by: yehu <yehu5@huawei.com>

tools/rbd-ggate: close log before running postfork

Otherwise the assert in Log:open() will trigger since
all data is kept during the fork and also the `is_started` flag

Fixes: https://tracker.ceph.com/issues/41592
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

rgw/services: silence -Wunused-variable warning

Signed-off-by: Lan Liu <liulan@umcloud.com>

script/run_tox.sh: install tox deps from wheelhouse

could be faster

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

Merge pull request #29583 from rafaelquint/configfield2

mgr/dashboard: Verify fields on Configuration page

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

Merge pull request #29919 from dzafman/wip-41522

ceph-objectstore-tool can't remove head with bad snapset

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

Merge pull request #29941 from dzafman/wip-41517

osd: Fix assert in the case that snapset is missing

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>

rgw: increase beast parse buffer size to 64k

the flat_buffer starts very small and rarely grew above 512 bytes when
reading headers. this buffer's capacity() is what determines the size of
reads when when recv_body() calls boost::beast::http::async_read_some().
raising this buffer size to a static 64k greatly reduces the number of
socket reads

Reported-by: Marcus Watts <mwatts@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #30019 from mxdInspur/fix_20190829

librbd: clean up unused variable

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

Merge pull request #29968 from wjwithagen/wjw-fix-dencode-bluestore_bdev_t

bluestore/bdev: initialize size when creating object.

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

Merge pull request #29931 from yaozongyou/refine-decltype

osdc: using decltype(auto) instead of trailing return type

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

librbd: clean up unused variable: C_MigrateObject::m_object_size

Fixes: https://tracker.ceph.com/issues/41580
Signed-off-by: mxdInspur <muxiangdong@inspur.com>

Merge pull request #30035 from tchaikov/wip-rgw-maybe-unused

rgw/rgw_user: add [[maybe_unused]] for silencing -Wunused-variable wa…

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

Merge pull request #29927 from votdev/add_cephfs_legend

mgr/dashboard: Display legend for CephFS standbys

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

Merge pull request #29934 from votdev/add_missing_i18n

mgr/dashboard: Add missing text translation

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

Merge pull request #30001 from votdev/issue_41573

mgr/dashboard: A block-manager can not access the pool page

Merge pull request #28885 from Kriechi/fix-bucket-policy-spelling

docs: rgw: fix bucket operation spelling: ListBucketMultipartUploads

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

script/ceph-backport.sh: leave Assignee blank in backport PR

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

mgr/dashboard: Verify fields on Configuration page

Fixes: https://tracker.ceph.com/issues/41193
Signed-off-by: Adam King <adking@redhat.com>
Signed-off-by: Rafael Quintero <rquinter@redhat.com>

Merge pull request #29794 from votdev/improve_error_msg

mgr/dashboard: Improve RestClient error logging

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

Merge pull request #29353 from votdev/issue_40981

mgr/dashboard: CephFS class issues with strings

Merge pull request #29848 from rhcs-dashboard/fix-41358-master

mgr/dashboard: fix SAML input argument handling

Reviewed-by: Lenz Grimmer <LGrimmer@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

mgr/dashboard: fix tox missing bits and add lint-fixer (#29802)

mgr/dashboard: fix tox missing bits and add lint-fixer

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

rgw/rgw_user: add [[maybe_unused]] for silencing -Wunused-variable warning

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

Merge pull request #29993 from votdev/fix_pool_e2e

mgr/dashboard: Fix pool deletion e2e

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

mgr/ansible: document requirements in requirements.txt

so install-deps.sh is able to collect them in wheels

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

mgr/dashboard: access_control: add grafana scope read access t… (#29989)

mgr/dashboard: access_control: add grafana scope read access to *-manager roles

Reviewed-by: Lenz Grimmer <LGrimmer@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

mgr/dashboard: CephFS class issues with strings

Fixes: https://tracker.ceph.com/issues/40981
Signed-off-by: Volker Theile <vtheile@suse.com>

Merge pull request #30022 from Yan-waller/wip-yanj-miscleanup

osd: misc cleanups

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

osd: drop useless get_possibly_deleted_pool_pg_num

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>

osd: no need to dump empty waiting_for_split

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>

Merge pull request #29982 from falcon78921/wip-doc-41516

doc: updated ceph monitor config options

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

doc: updated ceph monitor config options

Executed ceph-conf --dump-all on a freshly installed v14.2.2 (nautilus)
cluster. Compared the global defaults to the keys/values specified in
mon-config-ref.rst. Checked options.cc to make sure the obsolete keys
are no longer used.

Fixes: https://tracker.ceph.com/issues/41516
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>

osd: prime splits/merges for any potential fabricated split/merge participant

If we have to fabricate a merge target, we need to prime any future splits
it might have.  Otherwise a sequence like

- e100 1.f merge to 1.7
- e110 1.7 split to 1.f, 1.17, 1.1f

where we process all of the above in one go at, say, e120, will lead to
a crash in register_and_wake_split_child because 1.17 and/or 1.1f aren't
primed.

Fix by making identify_splits_and_merges do a recursive scan on any
merge/split participants detected too.

Fixes: http://tracker.ceph.com/issues/38483
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #29939 from majianpeng/bluestore-print-correctly-info

os/bluestore: print correctly info.

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

Merge pull request #30005 from wjwithagen/wjw-fix-vstart-mkdir

vstart.sh: Make sure mkdir succeeds

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

mgr/dashboard: Fix pool deletion e2e

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

mgr/dashboard: A block-manager can not access the pool page

Fixes: https://tracker.ceph.com/issues/41573
Signed-off-by: Volker Theile <vtheile@suse.com>

vstart.sh: Make sure mkdir succeeds

Even in the case the full path was not created, make sure mkdir
does create the full path.

And while there replaced some `test ....` with `[ ... ]`
like in the remainder of the file.

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

script/ceph-backport.sh: wholesale refactor

This commit refactors the script to make it more user-friendly and
maintainable. Added features:

* script now determine release/milestone from backport issue instead of
  requiring user to provide it
* script now generates a more verbose PR description
* backport PR title is based on original PR instead of the tracker issue
* improved error handling
* new --debug option that triggers "set -x"
* new --verbose option
* errors and diagnostic messages are now printed to stderr

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

mgr/prometheus: export standby mds metadata

Signed-off-by: lei01.liu <lei01.liu@horizon.ai>

ceph-volume: test number of times LVs list was created

Add a test that cofirm that the LVs list was created only once when
calling devices.lvm.listing.list()

Signed-off-by: Rishabh Dave <ridave@redhat.com>

Merge pull request #29917 from tchaikov/wip-mon-always-on-modules

mgr/MgrMonitor: print pending.always_on_modules before updating it

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

Merge pull request #29857 from dzafman/wip-41255

backfill_toofull seen on cluster where the most full OSD is at 1%

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #29604 from votdev/python_cleanup

mgr/dashboard: Cleanup Python code

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

mgr/dashboard: access_control: add grafana scope read access to *-manager roles

Fixes: https://tracker.ceph.com/issues/41572
Signed-off-by: Ricardo Dias <rdias@suse.com>

mgr/dashboard: Extract E2E wait calls into PageHelper (#29789)

mgr/dashboard: Extract E2E wait calls into PageHelper

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #29881 from tchaikov/wip-test-bufferlist

test/bufferlist.cc: encode/decode int64_t instead of long

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

Merge pull request #29916 from badone/wip-tracker-41518-grafana-server

qa/ceph-ansible: Disable dashboard

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

mgr/dashboard: Extract E2E wait calls into PageHelper

Signed-off-by: Tiago Melo <tmelo@suse.com>

Merge PR #20160 into master

* refs/pull/20160/head:
cephfs: Make mds-mds per message versioned

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

Merge PR #29911 into master

* refs/pull/29911/head:
qa: ignore RECENT_CRASH for multimds snapshot testing

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

Merge pull request #29966 from idryomov/wip-krbd-zero-after-overlap

qa: krbd_parent_overlap.t: fix read test

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

Merge pull request #29967 from theanalyst/rgw/beast-endpoint-fix

rgw: asio: check the remote endpoint before processing requests

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

bluestore/bdev: initialize size when creating object.

The other partss of the struct are initialized by their
ctors. Only for unint_64 there is no ctor.

Otherwise ceph-dencoder tests will fail in comparing
the exported output.
[~/master36] wjw@cephdev.digiware.nl> build/bin/ceph-dencoder type bluestore_bdev_label_t select_test 1 encode export /tmp/typ-yFISvjvgj
[~/master36] wjw@cephdev.digiware.nl> hexdump -C !$
hexdump -C /tmp/typ-yFISvjvgj
00000000  62 6c 75 65 73 74 6f 72  65 20 62 6c 6f 63 6b 20 |bluestore block |
00000010  64 65 76 69 63 65 0a 30  30 30 30 30 30 30 30 2d |device.00000000-|
00000020  30 30 30 30 2d 30 30 30  30 2d 30 30 30 30 2d 30 |0000-0000-0000-0|
00000030  30 30 30 30 30 30 30 30  30 30 30 0a 02 01 28 00 |00000000000...(.|
00000040  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00 |................|
00000050  00 00 70 74 03 04 00 00  00 00 00 00 00 00 00 00 |..pt............|
00000060  00 00 00 00 00 00 00 00  00 00 |..........|
0000006a

[~/master36] wjw@cephdev.digiware.nl> build/bin/ceph-dencoder type bluestore_bdev_label_t select_test 1 encode decode encode export /tmp/typ-MjWXdCpzJ
[~/master36] wjw@cephdev.digiware.nl> hexdump -C !$
hexdump -C /tmp/typ-MjWXdCpzJ
00000000  62 6c 75 65 73 74 6f 72  65 20 62 6c 6f 63 6b 20 |bluestore block |
00000010  64 65 76 69 63 65 0a 30  30 30 30 30 30 30 30 2d |device.00000000-|
00000020  30 30 30 30 2d 30 30 30  30 2d 30 30 30 30 2d 30 |0000-0000-0000-0|
00000030  30 30 30 30 30 30 30 30  30 30 30 0a 02 01 28 00 |00000000000...(.|
00000040  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00 |................|
00000050  00 00 73 64 00 00 00 00  00 00 00 00 00 00 00 00 |..sd............|
00000060  00 00 00 00 00 00 00 00  00 00 |..........|
0000006a

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