Merge pull request #38377 from yanghonggang/master

rgw/rgw_http_client.cc: Introduce a new configuration item - rgw_curl_buffersize

Merge pull request #38800 from sebastian-philipp/doc-cephadm-rm-link-to-de

doc/cephadm: some minor updates

Reviewed-by: Varsha Rao <varao@redhat.com>

doc/cephadm: /etc/ceph is created automaticlly now

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

doc/cephadm: CephFS: Encourage users to call `ceph fs volume create`

Manually deploying MDS daemons is an advanced topic.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

doc/cephadm: update stability notes

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

doc/cephadm: Rm doc/dev/cephadm from user docs

We should not link the dev guide form the user documentation. The user docs are already convoluted and hard to follow. Adding the dev guide is not helpful.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #38784 from sebastian-philipp/resurect-doc-dev-cephadm

doc/dev: resurrect hidden dev/cephadm.rst

Reviewed-by: Varsha Rao <varao@redhat.com>

Merge pull request #38560 from pcuzner/cephadm-maintenance-mode

cephadm: add host-maintenance subcommand

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>

Merge pull request #38681 from pcuzner/enable-exporter

cephadm: enable exporter deployment at bootstrap

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #38704 from varshar16/wip-fix-rook-rm-service

mgr/rook: Remove service_type param from remove_service()

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

Merge pull request #38025 from MahatiC/wip-ssd-write

librbd/cache: Implement aio_write operation

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

Merge pull request #38795 from yuriw/wip-yuriw-octopus-x-master

qa/tests: changed the dirs structure

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

Merge PR #38792 into master

* refs/pull/38792/head:
.github: add MDSMonitor to cephfs label

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

Merge PR #38587 into master

* refs/pull/38587/head:
doc: add explanatory note about cache trim rate setting

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

qa/tests: changed the dirs structure

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

Merge pull request #38787 from yuriw/wip-yuriw-octopus-x-master

qa/tests: octopus-x suite added more workloads

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

Merge pull request #38789 from neha-ojha/wip-fix-cephadm-task

qa/tasks/cephadm.py: do not create rbd pool by default

Reviewed-by: Sebastian Wagner <swagner@suse.com>

.github: add MDSMonitor to cephfs label

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

qa/tests: octopus-x suite added more workloads

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

qa/tasks/cephadm.py: do not create rbd pool by default

rados/cephadm/smoke* does not use the install task and the adjust-ulimits
dependency is met as a part of it. create_rbd_pool needs adjust-ulimits,
so for now we will disable create_rbd_pool by default and only set it
to true for the upgrade suite.

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

Merge pull request #38714 from tchaikov/wip-better-vstart

vstart: format the customized options in ceph.conf

Reviewed-by: luo rixin <luorixin@huawei.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge PR #38769 into master

* refs/pull/38769/head:
doc/cephfs: add data pool-MDS instructions link

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

librbd/cache: Implement aio_write operation

...along with load_existing_entries and shutdown cache
operation

Signed-off-by: Lisa Li <xiaoyan.li@intel.com>
Signed-off-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>

doc/dev: resurrect hidden dev/cephadm.rst

some time ago, a cephadm folder was added that did hide the
old dev documentation page.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

doc/cephfs: add data pool-MDS instructions link

- This commit adds a link to the "Create a Ceph
File System" page. The link that it adds is to the
"Adding a data pool to the MDS" subsection of the
file layouts page.
- s/mds/file system/

Fixes: https://tracker.ceph.com/issues/48531
Signed-off-by: Zac Dover <zac.dover@gmail.com>

Merge pull request #38713 from tchaikov/wip-ceph-annotations

ceph.in: return bytes as outbuf in error path, add type annotations

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

Merge pull request #38777 from neha-ojha/wip-cephadm-rbd

qa: allow the cephadm task to create an RBD pool and add workload to use it

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>

qa/suites/upgrade/octopus-x: add rados_loadgenbig workload

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

qa/tasks/cephadm.py: create RBD pool

The ceph task already does this and a bunch of tests rely on this pool
being already present. Can be disabled by setting create_rbd_pool to False.

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

Merge PR #38742 into master

* refs/pull/38742/head:
doc/cephfs/nfs: Add more details about path and pseudo path
doc/cephfs/nfs: Add note about how to fetch port details with rook
doc/cephfs/nfs: Add warning note about management of dashboard created exports

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>

Merge pull request #38735 from changchengx/pwl_load_existing_cache

librbd/cache/pwl: correct update previous_sync_point_entry

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

Merge pull request #38520 from lixiaoy1/wip-doc-pwl

doc: add RBD persistent write-back cache

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

doc: add RBD persistent write-back cache

Signed-off-by: Li, Xiaoyan <xiaoyan.li@intel.com>

doc/cephfs/nfs: Add more details about path and pseudo path

Fixes: https://tracker.ceph.com/issues/48731
Signed-off-by: Varsha Rao <varao@redhat.com>

doc/cephfs/nfs: Add note about how to fetch port details with rook

Fixes: https://tracker.ceph.com/issues/48731
Signed-off-by: Varsha Rao <varao@redhat.com>

doc/cephfs/nfs: Add warning note about management of dashboard created exports

Fixes: https://tracker.ceph.com/issues/48731
Signed-off-by: Varsha Rao <varao@redhat.com>

Merge PR #32776 into master

* refs/pull/32776/head:
win32*.sh: fetch WNBD dependency
win32*.sh: bump win32 boost dependency
cmake: skip osd, Lua and neorados on Windows
win32*.sh: improve lib handling
win32*.sh: update openssl location
win32*.sh: cleanup dependency build dir when targetting Windows
win32*.sh: Strip binaries individually
win32*.sh: Cleanup zip archive creation
cmake,win32*.sh: Add OS=(ubuntu|suse) flag, for distro settings
win32*.sh: Use nproc for CPU count when targeting win32
test: Include compat.h to find uid_t/gid_t/gidlist when cross compiling
win32*.sh: improve win32 dependency check
win32*.sh: isolate network operations when building win32 dependencies
cmake: drop Python dependency when targeting Windows
win32*.sh: cleanup Windows build script
win32*.sh: fix patch command
win32*.sh: update Windows build scripts and readme

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

Merge pull request #38699 from rosinL/boost-paralllel

do_cmake: add a default value to BOOST_J

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

Merge pull request #38745 from zdover23/wip-doc-jan-2021-dev-guide-basic-workflow-reorg

doc/dev: restructure basic-workflow.rst

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

Merge pull request #38749 from tchaikov/wip-cmake-check-nasm

cmake: only display the result of checking nasm once

Reviewed-by: Changcheng Liu <changcheng.liu@aliyun.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge PR #38703 into master

* refs/pull/38703/head:
test: move snap delete operation to non-root directory
client: optionally check client permission on rmsnap()

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

Merge pull request #38758 from tchaikov/wip-crimson-cleanup

crimson/os: do not let omap_get_values() return input_output_error

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #38757 from rosinL/wip-remove-unused-options

common/options: remove ununsed options

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

crimson/os: do not let omap_get_values() return input_output_error

BlueStore only returns 0 or -ENOENT. so no need to handle the cases
where the return value is neither of them.

but Seastore might return EIO, so keep the interface unchanged.

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

Merge pull request #38616 from ofriedma/wip-ofriedma-dist-cache

rgw: distribute cache for exclusive put

Merge pull request #38663 from tchaikov/wip-crimson-recovery-cleanups

crimson/osd: fixes and cleanups

Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

common/options: remove ununsed options

Signed-off-by: luo rixin <luorixin@huawei.com>

Merge pull request #38676 from ronen-fr/wip-48690

qa/standalone/scrub/osd-scrub-snaps.sh: fix Python print syntax

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

Merge pull request #38603 from smithfarm/wip-48604

rpm: require smartmontools on SUSE

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

vstart: format the customized options in ceph.conf

better formatted in ceph.conf, no extra spaces and tabs anymore.

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

cmake: only display the result of checking nasm once

if nasm is able to emit AVX512 instructions, we can assume that it's
able to generate AVX2 instructions as well. so no need to print "Found
nasm" multiple times.

and by chaining mutual exclusive branches with "elseif", we can have
better readability.

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

cmake: drop duplicated variable

not_arch_x32 replicates ${_support_x64}. and a variable starts with
"not" is just difficult to parse. so drop it.

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

Merge pull request #38694 from dillaman/wip-migration-import

librbd/migration: tweaks and initial set of documentation

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

doc/rbd: incorporate external data source support for live-migration

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

librbd/migration: fixed missing return statements on stream error path

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

librbd/migration: optionally pull S3 keys from MON config store

This allows the S3 keys to be better protected since the MON can
be configured to restrict access to keys by user and the results
can be encrypted in transit.

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

librbd: helper utility to retrieve config from the MON config store

A special "config://" URI prefix can be used to denote configuration
settings that should be (securely) pulled from the MON config store.
This will be first used in a follow-up commit to support storing
the S3 access and secret keys in the MON config store.

This "config://" syntax is already in-use by RGW and ceph-iscsi for
pulling secrets when deployed via cephadm.

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

librbd/migration: require snapshot when importing from native source

Since we cannot mark the source image read-only when running in import-only
migration mode, we should require the user to provide a snapshot to ensure
that data cannot change while the migration is running.

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

ceph.in: remove unused indent

no need to put `if True`. it was used when removing unused variables.
but it'd be better to have less indent for better readability.

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

ceph.in: do not apply rados.cstr() to a bytes

since the parameter is already a bytes instance, there is no need to encode it.

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

pybind/rados: correct annotation of {mon,pg,osd}_command

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

pybind/ceph_argparse: no need to import print()

we are already in a python3 world.

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

pybind/ceph_argparse: PEP8 related cleanups

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

ceph.in: return bytes as outbuf in error path

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

ceph.in,ceph_argparse: add type annotations

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

Merge pull request #30027 from majianpeng/optimize-mutex-contention

os/bluestore: optimize mutex contention

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

Merge pull request #36088 from rhcs-dashboard/fix-45822-master

mgr/dashboard:minimize console log traces of Ceph backend API test

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

Merge pull request #38651 from ifed01/wip-ifed-new-omap-naming

os/bluestore: introduce new "per-pg" naming scheme for omap

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

Merge pull request #38680 from ifed01/wip-ifed-rocksdb-options-annex

os/bluestore: introduce bluestore_rocksdb_options_annex config parame…

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

Merge pull request #38738 from ronen-fr/wip-ronenf-rawformat

librbd/migration: removing an unused capture

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

Merge pull request #38709 from wuhongsong/aios_be_truncated

blk: add upper bound of bluestore_deferred_batch_ops* options

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

doc/dev: restructure basic-workflow.rst

- Rewrote a sentence about forking.
- s/exactly how to proceed/how to proceed/
- Changed titles to present participles
- Rewrote "Fixing the Bug Locally" to improve its elegance.

Signed-off-by: Zac Dover <zac.dover@gmail.com>

Merge pull request #38655 from dillaman/wip-47828

librbd: ensure stripe unit is at least 512 bytes

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Mykola Golub <mgolub@suse.com>

librbd/migration: removing an unused capture

...silencing a compiler warning.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

librbd/cache/pwl: correct update previous_sync_point_entry

Always update previous_sync_point_entry value whatever its old
value.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>

Merge pull request #38733 from ukernel/wip-yanzheng-email

mailmap: update affiliation for Yan, Zheng

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

Merge pull request #38237 from myoungwon/wip-fix-clone-size-mismatch

osd: fix clone size mismatch when deduped object is evicted

Reviewed-by: Samuel Just <sjust@redhat.com>

mailmap: update affiliation for Yan, Zheng

Signed-off-by: "Yan, Zheng" <ukernel@gmail.com>

Merge pull request #37704 from Huber-ming/log_error

radosgw-admin: fix error message when datalog list

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

blk: add upper bound of bluestore_deferred_batch_ops* options

so the number of pending io does not overflow when being passed to submit_batch().

Signed-off-by: hzwuhongsong <hzwuhongsong@corp.netease.com>

Merge pull request #38728 from xxhdx1985126/wip-crimson-osd_op-no-splice

crimson/osd: do not splice osd_op indata

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

crimson/osd: make sure PGBackend's modification operations not change osd_op state

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

crimson/osd: do not splice osd_op indata

As each osd_op's indata holds only its own data, there's no need to drop their it.
On the other hand, indata is still needed when osd_op needs to be redone in case of
acting set change.

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

Merge pull request #38633 from rhcs-dashboard/fix-logs-copy-button

mgr/dashboard: Fix for copy2Clipboard failing to copy on the first time

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>

mgr/dashboard: Fix for copy2Clipboard failing to copy on the first time.

Fixes: https://tracker.ceph.com/issues/48601
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Fix for the copy2Clipboard button to work on the first click itself.

Merge pull request #37267 from TheJJ/fix-up-acting-docs

doc: fix up and acting set explanation

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

doc: fix and improve the explainations of up and acting osd sets

acting = where clients requests are processed
up = where pgs were planned to be by crush+upmap

Fixes: https://tracker.ceph.com/issues/48718
Signed-off-by: Jonas Jelten <jj@sft.lol>

mailmap: update mail for Jonas Jelten

Signed-off-by: Jonas Jelten <jj@sft.lol>

Merge pull request #38719 from fengchunsong/master

test/perf_local: Add div32,prefetch,memory barrier bench for arm64

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

Merge pull request #38568 from batrick/i48594

pybind/mgr/cephadm: limit rgw osd caps

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #38644 from pcuzner/fix-missing-py3-error

mgr/cephadm: correct connection failure message

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #38654 from Daniel-Pivonka/osddryrunbug

mgr/cephadm:fix bug in orch apply osd --dry-run where empty table printed

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

test/perf_local: Add div32,prefetch,memory barrier bench for arm64

arm64 support div32,prefetch,memory barrier, so add them to benchmark.

Signed-off-by: Chunsong Feng <fengchunsong@huawei.com>
Signed-off-by: luo rixin <luorixin@huawei.com>

Merge pull request #38717 from swinds24/fix_compile_error

kv/LevelDBStore: fix incorrect ceph_abort_msg() usage

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

kv/LevelDBStore: fix incorrect ceph_abort_msg() usage

Compile error is encountered when HAVE_LEVELDB_FILTER_POLICY is not
defined.

/ceph/src/kv/LevelDBStore.cc: In member function 'int LevelDBStore::load_leveldb_options(bool, leveldb::Options&)':
/ceph/src/kv/LevelDBStore.cc:96:22: error: invalid initialization of reference of type 'const string& {aka const std::__cxx11::basic_string<char>&}' from expression of type 'bool'ceph_abort_msg(0 == "bloom size set but installed leveldb doesn't support bloom filters");
                    ~~^~~~
/ceph/src/include/ceph_assert.h:90:69: note: in definition of macro 'ceph_abort_msg'
   ::ceph::__ceph_abort( __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, msg)
                                                                     ^~~
/ceph/src/include/ceph_assert.h:62:19: note: in passing argument 4 of 'void ceph::__ceph_abort(const char*, int, const char*, const string&)'
 [[noreturn]] void __ceph_abort(const char *file, int line, const char *func,
                   ^~~~~~~~~~~~
src/kv/CMakeFiles/kv.dir/build.make:130: recipe for target 'src/kv/CMakeFiles/kv.dir/LevelDBStore.cc.o' failed

Signed-off-by: Jerry Lee <leisurelysw24@gmail.com>

Merge pull request #38702 from mkogan1/wip-fix-vstart-o

vstart: fix -o ceph.conf options processing

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

Merge pull request #38711 from Rethan/fix-osdmap-message-max-bytes-comments

option: update comments of option osd_map_message_max_bytes

option: update comments of option osd_map_message_max_bytes

Option osd_map_message_max_bytes indicates the max bytes of MOSDMap message, not maps count
as osd_map_message_max.

Signed-off-by: haoyixing <haoyixing@kuaishou.com>

Merge pull request #38700 from tchaikov/wip-seastar-msgr-test-timeout

test/crimson: add abort timer to messenger test

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

Merge pull request #38576 from myoungwon/wip-fix-seg-fault-manifest-count

osd : prevent accessing deleted reference

Reviewed-by: Samuel Just <sjust@redhat.com>