osd: drop redundant comment

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

Merge pull request #20313 from guzhongyan/fix-22350

osd/OSDMap: misleading message in print_oneline_summary()

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

Merge pull request #20317 from liewegas/wip-pg-scrub-priority

osd/PG: pass scrub priority to replica

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

Merge pull request #20319 from tchaikov/wip-ops_blocked_by_scrub-cleanup

osd: pass ops_blocked_by_scrub() to requeue_scrub()

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

Merge pull request #20279 from liewegas/wip-idempotent-sequence

ceph_test_filestore_idempotent_sequence: many fixes

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

Merge pull request #20267 from liewegas/wip-22847

mon/OSDMonitor: filter out pgs that shouldn't exist from force-create-pg

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

Merge pull request #20259 from guzhongyan/rados-cleanup

rados: clean up rados_getxattrs() and rados_striper_getxattrs()

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

Merge pull request #20260 from guzhongyan/fix-22042

librados: invalid free() in rados_getxattrs_next()

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

Merge pull request #20255 from david-z/wip-fix-kv-max-option

config: Change bluestore_cache_kv_max to type INT64

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

Merge pull request #20301 from bigclouds/wip-fix-declaration-of-rados-striper-trunc

libradosstriper: fix the function declaration of rados_striper_trunc

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

Merge pull request #20233 from cbodley/wip-test-log-nullptr

test/log: fix for crash with libc++

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #20223 from Yan-waller/wip-walle-180124cephosd

osd: use existing osd_required variable for messenger policy

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #20201 from majianpeng/mosdrepop-encode-log

osd: avoid encoding the same log entries repeatedly for different peers

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

os/filestore: add replay guards for omap operations

These were not guarded, meaning they could get replayed onto an object
that was cloned or renamed.  Eek!

Fixes: http://tracker.ceph.com/issues/22920
Signed-off-by: Sage Weil <sage@redhat.com>

test/objectstore/run_seed_to_range: stop on first error

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

ceph_test_idempotent_sequence: use coll_entry_t

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

ceph_filestore_idempotent_sequence: fix up clone, move ops; cleanup

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

qa/tasks/filestore_idempotent: run failure tests later in sequence

We want to get past the initial colleciton and object creation steps,
which don't include interesting ops.

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

Merge pull request #20016 from cbodley/wip-18885

rgw: log unlink_instance mtime as object's mtime

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #20145 from linuxbox2/rgwf-deref-readdir-off

rgw_file: avoid evaluating nullptr for readdir offset

Merge pull request #20188 from cbodley/wip-rgw-frontend-multimap

rgw: beast frontend can listen on multiple endpoints

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

Merge pull request #20013 from cbodley/wip-rgw-auth-skew

rgw: share time skew check between v2 and v4 auth

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

Merge pull request #20017 from cbodley/wip-22248

rgw: unlink deleted bucket from bucket's owner

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #20120 from cbodley/wip-22797

rgw: fix for empty query string in beast frontend

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

Merge pull request #20038 from oritwas/wip-rgw-22742

rgw: bucket resharding should not update bucket ACL or user stats
Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #20295 from trociny/wip-test_deep_copy_clone

test/pybind/rbd: skip test_deep_copy_clone if layering not enabled

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

Merge pull request #20309 from pritha-srivastava/wip-rgw-roles-error-codes

rgw: Reinstating error codes mapping for Roles.

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

Merge pull request #20316 from smithfarm/wip-doc-log

doc: log-and-debug: fix default value of "log max recent"

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

osd: pass ops_blocked_by_scrub() to requeue_scrub()

less nesting levels, and less repeatings.

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

osd/PG: pass scrub priority to replica

If we are scrubbing with high priority on the primary, pass that along
to the replica so that it can schedule its scrub work accordingly.

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

doc: log-and-debug: fix default value of "log max recent"

Doc says 1000000, but the real figure is two orders of magnitude less:

    Option("log_max_recent", Option::TYPE_INT, Option::LEVEL_ADVANCED)
      .set_default(500)
      .set_daemon_default(10000)

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

Merge pull request #20229 from zhsj/fix-dashboard-prefix

pybind/mgr/dashboard: fix duplicated slash in html href

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

osd/OSDMap: misleading message in print_oneline_summary()
The output scared people as showing so many osds were full/nearfull

Improve the output to make the message clearer

Fixes: http://tracker.ceph.com/issues/22350
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>

rgw: Reinstating error codes mapping for Roles.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>

Merge pull request #20114 from cethikdata/ceph-disk-lock

ceph-disk: reduce the scope of activate_lock.

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

test/pybind/test_rados.py: expand test_xattrs/test_obj_xattrs
to cover attribute with empty value case.

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>

librados: invalid free() in rados_getxattrs_next()

Invalid free() can cause corruption when getting an object
attribute with empty value.

Check the validity of the pointer before free(). Also move
the free() call at the start of rados_getxattrs_next() to
avoid memory leak.

Fixes: http://tracker.ceph.com/issues/22042
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>

libradosstriper: fix the function declaration of rados_striper_trunc
change the type of first parameter from rados_ioctx_t to rados_striper_t

Signed-off-by: yuelongguang <yuelongguang@gmail.com>

Merge pull request #20270 from ivancich/wip-fix-bad-dmclock-sim-change

osd,dmclock: fix dmclock test simulator change

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

Merge pull request #20258 from tchaikov/wip-balancer-cleanup

 mgr/balancer: replace magic value of -1 for DEFAULT_CHOOSE_ARGS

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #20230 from ifed01/wip-ifed-store-test-improve

test/store_test: update Many4KWritesTest* test cases to finalize with…

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

Merge pull request #20221 from fangyuxiangGL/max

osd/ReplicatedBackend: 'osd_deep_scrub_keys' doesn't work

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #20217 from rzarzynski/wip-osd-legacy-conf-for-perf

osd: avoid the config's get_val() overhead on the read path.

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

Merge pull request #20169 from liewegas/wip-22668-revert

os/bluestore: disable on_applied sync_complete

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

osd: use defined osd_required features for messenger policy

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

rgw: bucket resharding should not update bucket ACL or user stats

bucket link op resets bucket ACL using rgw_link_bucket instead

Fixes: http://tracker.ceph.com/issues/22124
Fixes: http://tracker.ceph.com/issues/22742
Signed-off-by: Orit Wasserman <owasserm@redhat.com>

pybind/mgr/dashboard: fix duplicated slash in html href

The url_prefix val in html templates is expected not containing '/'
in the end. Otherwise the href will be rendered as '//static/', which
causes browser treating it as http://static/.

Fixes: http://tracker.ceph.com/issues/22851
Signed-off-by: Shengjing Zhu <zhsj@umcloud.com>

test/pybind/rbd: skip test_deep_copy_clone if layering not enabled

(otherwise it will fail on protect snap)

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

Merge pull request #20184 from shun-s/wip-add-osdmap-epoch-show

osd/OSDMap: add osdmap epoch info when printing info summary

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

Merge pull request #20225 from xiexingguo/wip-balancer-pool-options

mgr/balancer: more pool-specific enhancements

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

Merge pull request #20224 from xiexingguo/wip-still-mgr-fixes

pybind/mgr/balancer: remove optimization plan properly

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

Merge pull request #20278 from xiexingguo/wip-null-ws-check

pybind/mgr/balancer: fix sanity check against empty weight-set

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

Merge PR #20261 into master

* refs/pull/20261/head:
doc: Fix path in ceph-fuse.rst

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

mgr/mgr_module: do not offer empty default value for choose_args

as it should be always available. this also silence a pep8 warning.

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

mgr/balancer: introduce CRUSHMap.DEFAULT_CHOOSE_ARGS and use it

avoid using '-1' as a magic variable.

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

test/objectstore/run_seed_to_range.sh: objects

We need some initial objects for this to work.

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

test/objectstore/run_seed_to.sh: make output readable

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

ceph_test_filestore_idempotent_sequence: fix clone check

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

ceph_test_filestore_idempotent_sequence: fix do_coll_create

The old code made no sense whatsoever!

- create one colletion, not a zillion
- inform the model in the parent class

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

ceph_test_filestore_idempotent_sequence: fix gap in ops

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

ceph_test_filestore_idempotent_sequence: start poolid at 2

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

test/objectstore/FilestoreDiff: write to stdout

This keeps our output separate from the filestore log, which we send to
a file so that the terminal output is readable.

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

pybind/mgr/balancer: fix sanity check against empty weight-set

There are paths get_compat_weight_set_weights() will return a
empty dict, not None.

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

Revert change from commit 8c5fea68cb9e0c2e6cc2352e64c4f3f46e29c58f
that introduced a compilation error that was not noticed since the
dmclock support/testing simulators are not built by ceph.

Also, changes below the src/dmclock tree should be made in the dmclock
library and then pulled into ceph.

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

Merge pull request #19711 from trociny/wip-20762

rbd: unified way to map images using different drivers

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

mon/OSDMonitor: ignore and/or remove pgs that shouldn't exist

The update_creating_pgs() change is there mainly for clusters that already
have an invalid pg in the map; going forward they hopefully shouldn't
appear!

Fixes: https://tracker.ceph.com/issues/22847
Signed-off-by: Sage Weil <sage@redhat.com>

mon/OSDMonitor: reject force-create-pg on pgids that shouldn't exist

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

Merge pull request #19902 from linuxbox2/wip-rgw-mploc

rgw: return valid Location element, CompleteMultipartUpload

osd/ReplicatedBackend: only do once encode log_entries  for multi MOSDRepOp

Encode log_entries is the same work for multi MOSDRepOp and encode is
heavy load.

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

Merge pull request #20199 from Songweibin/wip-group-cleanup

rbd: group misc cleanup and update rbd man page

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

Merge pull request #20002 from malc0lm/fix-copypart

rgw: fix 'copy part' without 'x-amz-copy-source-range'

Merge pull request #20222 from trociny/wip-deep-copy-default-format

librbd: by default use new format for deep copy destination

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

Merge pull request #20170 from trociny/wip-22803

qa/workunits/rbd: remove "trash purge --threshold" test

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

Merge pull request #20099 from Songweibin/wip-fix-deep-cp

librbd: fix deep copy a child-image

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

doc: Fix path in ceph-fuse.rst

This mistake was introduced in https://github.com/ceph/ceph/commit/9b6f9da3ce935ba1dcc28dfd6723ca46883ccb5e.

Signed-off-by: Jos Collin <jcollin@redhat.com>

rados: clean up rados_getxattrs() and rados_striper_getxattrs()

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>

Merge pull request #20178 from xiexingguo/wip-map-version

crush, mon: bump up map version only if we truly created a weight-set

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

config: Change bluestore_cache_kv_max to type INT64

If bluestore_cache_kv_max is negative, bluestore won't calculate meta
ratio and kv ratio automatically. So change the type from UINT to INT to
make this bluestore logic work.

Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>

Merge pull request #20197 from xiexingguo/wip-load-ws-from-ms

pybind/mgr/balancer: load weight-set from ms

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

Merge pull request #20196 from yaozongyou/improve-straw2-readability

crush: improve straw2 algorithm's readability

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

Merge pull request #20194 from xiexingguo/wip-badsteps

pybind/mgr/balancer: increase bad_steps properly

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

Merge pull request #20189 from neha-ojha/wip-fix-update_calc_stats

PG: primary should not be in the peer_info, skip if it is

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

Merge pull request #20151 from badone/wip-run-tox-ceph-disk-deps-failure

tests: ceph-disk: Remove sitepackages=True

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

Merge pull request #20140 from smithfarm/wip-python3-mopup

build/ops: rpm: Python 3-only ceph-disk and ceph-volume

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

Merge pull request #19953 from badone/wip-c_read_operations-tautological-compare-warning

c_read_operations.cc: Silence tautological-compare compiler warning

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

Merge pull request #20071 from joscollin/wip-ceph-fuse-doc

doc: Specify mount details in ceph-fuse

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

doc: Specify mount details in ceph-fuse

Signed-off-by: Jos Collin <jcollin@redhat.com>

OSDMap: add osdmap epoch info when printing info summary

  add osdmap epoch info when printing info summary

Signed-off-by: shun-s <song.shun3@zte.com.cn>

Merge PR #19856 into master

* refs/pull/19856/head:
qa: synchronize kcephfs suites with fs/multimds

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

rgw: beast frontend can listen on multiple endpoints

rgw_frontends options port= and endpoint= can be given multiple times,
and the beast frontend will listen on each endpoint

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

Merge pull request #20203 from ceph/wip-rm22642

ceph-volume: fix usage of the --osd-id flag

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

qa/workunits/rbd: remove "trash purge --threshold" test

It is difficult to make it work reliably in different environments.

Fixes: http://tracker.ceph.com/issues/22803
Signed-off-by: Mykola Golub <mgolub@suse.com>

Merge pull request #20090 from liewegas/wip-bluestore-label

os/bluestore: make bdev label parsing error more meaningful and less noisy

Reviewed-by: Varada Kari <varada.kari@gmail.com>

test/log: fix for crash with libc++

the original issue reproduced with operator<<(const char*) in libstdc++,
but this actually crashes with libc++. test the std::basic_streambuf*
overload instead, which is called out explicitly in
http://en.cppreference.com/w/cpp/io/ios_base/iostate:

> The badbit is set by the following standard library functions:
> * basic_ostream::operator<<(basic_streambuf*) when a null pointer is passed as the argument.

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

test/store_test: update Many4KWritesTest* test cases to finalize with fsck

Doing that when statfs report doesn't match our expectations will
provide more insight on the mismatch and helps to avoid races if any.
Maybe Fixes: https://tracker.ceph.com/issues/21312

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

Merge pull request #20214 from dillaman/wip-22819

librbd: potential crash if object map check encounters error

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

osd: avoid the config's get_val() overhead on the read path.

Profiling shows the overhead of the md_config_t::get_val<T>
can be significant. Unfortunately, it is being used in two
critical places across the read path.

The patch resorts to the legacy config infrastructure to
mitigate the performance penalty. It is expected it will
be superseded with a solution that allows to use the new,
intended routines without hurting performance.
`
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

pybind/mgr/balancer: make 'eval' command can evaluate specific pool

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

mgr/balancer: pool-specific optimization for crush-compat

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

pybind/mgr/balancer: remove optimization plan properly

Should pass in plan name instead of the plan itself.

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