doc: fix typo e.g,. => e.g.,

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>

Merge pull request #18543 from neha-ojha/wip-add-cbt-repo

qa: add cbt repo parameter

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

Merge pull request #18573 from neha-ojha/wip-add-cbt-workloads

qa/suites/rados/perf: add workloads

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

Merge PR #18174 into master

* refs/pull/18174/head:
mds: no assertion on inode being purging in find_ino_peers()

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

Merge PR #18537 into master

* refs/pull/18537/head:
mds: set PRIO_USEFUL on num_sessions counter

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

qa/suites/rados/perf: add workloads

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

Merge pull request #18524 from liewegas/wip-backfill-rops

osd/PG: fix recovery op leak

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

Merge pull request #18552 from liewegas/wip-mds-cluster-down

qa/workunits/rest/test.py: stop trying to test obsolte cluster_up/down

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

Merge pull request #18489 from cbodley/wip-21895

rgw: fix extra_data_len handling in PutObj filters

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

Merge pull request #18451 from zmc/wip-cephmetrics

Add cephmetrics suite

Merge pull request #18198 from cbodley/wip-21735

rgw: fix error handling in ListBucketIndexesCR

Add cephmetrics suite

Signed-off-by: Zack Cerza <zack@redhat.com>

qa/workunits/rest/test.py: stop trying to test obsolete 'mds *' commands

These were recently removed.

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

Merge pull request #18511 from smithfarm/wip-rpm-recommend-influxdb

build/ops: rpm: recommend python-influxdb with ceph-mgr

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>

Merge pull request #18182 from nrdmn/dashboard

mgr/dashboard: improve error handling

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #18533 from tchaikov/wip-qa-cephtool

qa: do not "ceph fs get cephfs" w/o a cephfs fs

Reviewed-by: Douglas Fuller <dfuller@redhat.com>

osd/PG: handle remote backfill recovation while waiting for other targets

If we have multiple targets, we may still be waiting on them when we get
a revocation.

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

Merge pull request #18545 from batrick/pr18393-revert

Revert "ceph_context: re-expand admin_socket metavariables in child process"

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>

Merge pull request #18496 from liewegas/wip-pgmap

build: remove PGMap.cc from libcommon

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

osd/PG: make scan recovery op cancellation match up reliably

Previously, there was only one time we would end up in this region of code:
when the backfill was rejected by the peer.  Previously that was apparently
reliably when we had an outstanding SCAN request, because we would
unconditionally cancle the MAX recovery op and clear waiting_on_backfill.

See 624aaf2a4ea9950153a89ff921e2adce683a6f51 for when this code appeared.

Now we have several similar paths, and we don't always have an outstanding
scan call (I don't think!).  Regardless, move most these three cases into
a common helper and make the finish_recovery_op completion conditional
on whether there is an outstanding SCAN.  This fixes a leak of a recovery
op when we defer while a scan is outstanding (this bug was recently
introduced by e708410542b0a52fbb29e14b76f49c94adbc0a59 and then
duplicated by 2463c6463d1ed38a2e15a0960ed1530a47851489).

Note that there is still one other time we register MAX ops: when we are
finishing backfill.  There, we start one per target.  But we will always
get back our reply and process it in the normal way (that old commit
did not change the timing for these).

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

osd/PG: make recovering_oids a multiset

For multiple backfill targets, we start MAX multiple times.

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

Merge pull request #18527 from xiexingguo/wip-hunt-scrub-mismatch

osd/PrimaryLogPG: several oi.extents fixes

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

Merge pull request #18531 from majianpeng/msg-async

msg/async misc cleanup

Reviewed-by: Haomai Wang <haomai@xsky.com>

msg/async: record correctly l_msgr_send_bytes if "rc == 0".

If rc == 0, it mean all data of outcoming_bl whether old or new data.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge PR #18192 into master

* refs/pull/18192/head:
qa/cephfs: test ec data pool
qa/suites/fs/basic_functional/clusters: more osds

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

Revert "ceph_context: re-expand admin_socket metavariables in child process"

This commit introduces a regression where the admin socket specified in
ceph.conf overrides command line arguments or environment variables.

This reverts commit 1630f4bbef3a3ff6efb56acbaa9b8786b945b1e6.

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

Merge pull request #18485 from liewegas/wip-remote-res-preemption

osd: fix recovery reservation bugs, and implement remote reservation preemption

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

rgw: fix extra_data_len handling in PutObj filters

the RGWPutObj_Compress filter relies on a starting offset of 0 to ensure
that we only compress entire objects

for RGWRados::fetch_remote_obj(), we also fetch object metadata. the
replies come back with a 'Rgwx-Embedded-Metadata-Len' header, which
specifies how many bytes of object metadata are at the front of the
request body. when this is present, the offsets passed from
RGWRadosPutObj down to the RGWPutObjDataProcessor filters are offsets
into the http response body, rather than logical offsets into the object
data itself

this commit adds a transformation to RGWRadosPutObj so that only that
logical offset is visible to the RGWPutObjDataProcessor

Fixes: http://tracker.ceph.com/issues/21895
Signed-off-by: Casey Bodley <cbodley@redhat.com>

qa: add cbt repo parameter

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

msg/async: updating l_msgr_running_send_time if write_message failed.

Also for the most time write_message return zero. So avoid checking
"r < 0 or r > 0" every time, it should firstly check "r == 0".

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge pull request #18528 from tchaikov/wip-osd-misplaced

osd/PG: fix calc of misplaced objects

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

msg/async: only system can accept more data, continue send.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge pull request #18523 from tchaikov/wip-vstart-quoted

vstart.sh: should quote the parameters to get them quoted

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

msg/async: remove redundant condition.

From the code, if out_q[r].is_empty, it already remove.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

msg/async: batch handle out_seq.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge PR #18062 into master

* refs/pull/18062/head:
client: put MetaSession map container
client: simplify release context ref mgmt

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

mds: set PRIO_USEFUL on num_sessions counter

This is used by dashboard and status modules,
so let's make sure we're sending it to the mgr.

Fixes: http://tracker.ceph.com/issues/21927
Signed-off-by: John Spray <john.spray@redhat.com>

Merge pull request #18381 from cbodley/wip-21832

Revert "radosgw: fix awsv4 header line sort order."

Merge pull request #18369 from baixueyu/refcount_bug

 rgw: source data in 'default.rgw.buckets.data' may not be deleted after inter-bucket copy

Merge pull request #16605 from theanalyst/tools/release-notes-pyfixes

script: ceph-release-notes: minor fixes for split_component

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

Merge pull request #18482 from liewegas/wip-luminous-note-fix

doc/release-notes: add jewel->kraken notes

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>

Merge pull request #18481 from xiexingguo/wip-choose-acting

osd/PG: miscellaneous choose acting changes and cleanups

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

Merge pull request #18473 from yuyuyu101/wip-objecter-mono

osdc/Objecter: using coarse_mono instead

Reviewed-by: Adam Emerson <aemerson@redhat.com>

Merge pull request #18471 from yuyuyu101/wip-omap-stat

osd/ReplicatedPG: add omap write bytes to delta_stats

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

Merge pull request #16332 from badone/wip-warn-about-objects-with-too-many-omap-entries

osd: Warn about objects with too many omap entries

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

Merge pull request #18506 from majianpeng/osd-scrub

osd/PrimaryLogPG: add condition "is_chunky_scrub_active" to check object in chunky_scrub

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

qa: do not "ceph fs get cephfs" w/o a cephfs fs

introduced by 183646c

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

script: ceph-release-notes: minor fixes for split_component

make labels a set as intersection would fail otherwise, also sort the
results of prefixes before creating the title

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

build/ops: rpm: recommend python-influxdb with ceph-mgr

The influxdb module won't run if python-influxdb is not present (but it will be
graceful about not running). That means python-influxdb is a dependency of
that module, not mgr itself. However, we are not (yet) packaging the modules
separately. (When we do, this could become a Requires: of the module.)

RPM itself does not support "Recommends", and ignores this line. Higher-level
tools may or may not support it, so put this line in a SUSE-only conditional
since we know that zypper supports it.

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

Merge pull request #18517 from dillaman/wip-iscsi-docs

doc/rbd: specify additional ESX prerequisites

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>

OSD/PG: fix calc of misplaced objects

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

Merge pull request #18466 from zealoussnow/wip-wrong-parameter

OSD: drop unsed parameter passed to check_osdmap_features

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>

Merge pull request #18425 from ZVampirEM77/wip-options-cleanup

common/options.cc: cleanup readable literals for default sizes

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

Merge pull request #17894 from chenliuzhong/change-aio-max-nr

ceph.spec.in,debian/rules: change aio-max-nr to 1048576

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

vstart.sh: should quote the parameters to get them quoted

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

Merge pull request #18505 from badone/wip-unittest-crypto-getentropy-limit

unittest_crypto: Don't exceed limit for getentropy

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

Merge pull request #18181 from tchaikov/wip-vstart-quoted-print

vstart.sh: quote command only when necessary

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

Merge PR #17266 into master

* refs/pull/17266/head:
qa: update test_ceph_argparse to test fs cmds
qa: use fs rm_data_pool
qa: fix mdsmap lookup
qa: remove usage of mds dump
PendingReleaseNotes: add obsoleted mds commands
qa: remove use of obsolete mds commands
ceph_volume_client: remove use of obsolete mds cmd
doc: update on obsolete mds commands
cephfs: obsolete deprecated mds commands

Reviewed-by: Douglas Fuller <dfuller@redhat.com>

Merge pull request #17909 from tchaikov/wip-coverity

test/objectstore/test_bluefs: cleanups

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

qa: update test_ceph_argparse to test fs cmds

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

Merge pull request #18475 from yuyuyu101/wip-fix-alignment

os/ObjectStore: fix get_data_alignment return -1 causing problem in msg header

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

Merge pull request #18297 from dzafman/wip-21803

osd/PG: fix objects degraded higher than 100%

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

Merge pull request #18479 from wzliao/wip-correct-scrub-cost

osd/OSD.cc: use option 'osd_scrub_cost' instead

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

doc/rbd: specify additional ESX prerequisites

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

Merge PR #18109 into master

* refs/pull/18109/head:
mds: clean up non-existent data pools in MDSMap
mds: reduce variable scope

Reviewed-by: John Spray <john.spray@redhat.com>

Merge PR #18366 into master

* refs/pull/18366/head:
mon: s/mds_blacklist_interval/mon_mds_blacklist_interval/
mon: tidy up mds_blacklist_interval

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

Merge PR #18384 into master

* refs/pull/18384/head:
mds: disable early reply for dir layout and quota related requests
mds: make mksnap/setlayout wait for unsafe requests on other mds
mds: don't rdlock locks in replica object while auth mds is recovering
mds: move ScatterLock::state_flags into SimpleLock

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

Merge PR #18393 into master

* refs/pull/18393/head:
ceph_context: re-expand admin_socket metavariables in child process

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

Merge pull request #18490 from dillaman/wip-21894

rbd-mirror: strip environment/CLI overrides for remote cluster

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>

qa: use fs rm_data_pool

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

qa: fix mdsmap lookup

We were returning the file system structure and not the mdsmap.

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

qa: remove usage of mds dump

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

Merge pull request #18514 from ceph/wip-fix-cv-create-path

ceph-volume lvm.prepare update to use create_osd_path

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

ceph-volume lvm.prepare update to use create_osd_path

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

Merge pull request #18500 from scienceluo/wip-luo-fix-doc-log-level-branch

doc: complete and update the subsystem logging level info table

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

osd/PrimaryLogPG: add condition "is_chunky_scrub_active" to check object in chunky_scrub.

Avoid every time call scrubber.write_block_by_scrub. Most time scrubber
is inactive. And compare to write_block_by_scrub, is_chunky_scrub_active
is light.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

osd/PrimaryLogPG: clear DEGRADED at recovery completion even if more backfill

We may have log recovery *and* backfill to do, but cease to be degraded
as soon as the log recovery portion is done.  If that's the case, clear
the DEGRADED bit so that the PG state is not misleading.

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

osd/PG: simplify Recovering state change

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

doc/release-notes: fix backticks

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

Merge pull request #18467 from yuyuyu101/wip-21883

msg/async/AsyncConnection: state will be NONE if replacing by another one

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

Merge pull request #18469 from yuyuyu101/wip-remove-legacy

msg/async/AsyncConnection: remove legacy feature case handle

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

Merge pull request #18415 from majianpeng/msg-cleanup

msg/async: batch handle msg_iovlen

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>

Merge pull request #18397 from tchaikov/wip-mon-opts

common/options: set max_background_jobs instead of max_background_compactions

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

Merge pull request #18382 from ceph/wip-vstart-mgr-dashboard

cmake: add cython_rbd as a dependency to vstart target

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #18480 from tchaikov/wip-doc-cleanup

doc: various cleanups

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

OSD: drop unsed parameter passed to check_osdmap_features

Signed-off-by: Leo Zhang <nguzcf@gmail.com>

Merge pull request #18405 from dillaman/wip-21849

librbd: default to sparse-reads for any IO operation over 64K

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>

rpm,debian: use download.ceph.com/tarballs instead of ceph.com/download

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

doc: fix warning reported by "build-doc linkcheck"

all the HTTP 301 (moved permanently) should be killed.

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

osd/PrimaryLogPG: update modified_ranges correctly on truncating

This is necessary since we are modifying the object contents.

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

osd: Add a flag to ScrubMap to signal check needed

If we know none of the scrub maps have errors early in
be_large_omap_check() we can return without doing a lot of unnecessary
work.

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

osd: Warn about objects with too many omap entries

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

osd: Move creation of 'master_set' to scrub_compare_maps

Moving it to scrub_compare_maps allows us to pass it to multiple
subsequently called functions.

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

mon/OSDMonitor: more options in new-style

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

common/options: set max_background_jobs instead of max_background_compactions

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

Merge pull request #18409 from liu-chunmei/fix_dpdk_assert

Fix two dpdk assert happened in dpdk library.

Reviewed-by: Haomai Wang <haomai@xsky.com>

doc: complete and update the subsystem logging level info table

Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>

ceph.spec.in,debian/rules: change aio-max-nr to 1048576

when osd is more than 14 in one host,it report error that aio is not enough.
As the default aio-max-nr is 65536, one OSD needs 4096 aios and other programs may use aios.
This patch change aio-max-nr to 1048576 when install ceph-osd rpm package and debian package

Signed-off-by: chenliuzhong <liuzhong.chen@easystack.cn>

unittest_crypto: Don't exceed limit for getentropy

CryptoRandom::get_bytes calls getentropy directly if available and it
enforces a limit of 256 bytes.

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

Merge pull request #18460 from liewegas/wip-straw2-command

mon/OSDMonitor: add 'osd crush set-all-straw-buckets-to-straw2'

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