Commit Graph

122477 Commits

Author SHA1 Message Date
Kefu Chai
e63a6c6a26
Merge pull request #40898 from rzarzynski/wip-crimson-only-mgrclt-noconn-report
crimson/mgr: don't report if there is no connection available.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-04-19 22:06:27 +08:00
Kefu Chai
8e0158a047 doc/rados/configuration/mon-config-ref: use confval directive
for defining options

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 22:03:45 +08:00
Kefu Chai
e5722a46e1 doc/rados/configuration/auth-config-ref: drop section of keyrings
as per Sage, the caps are out of date (should be based on profiles) and
the keyring locations aren't useful information

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 21:45:07 +08:00
Kefu Chai
366a1263bb
Merge pull request #40897 from tchaikov/wip-doc-more-conf-vals
doc/rados/configuration: use confval directive to define options.

Reviewed-by: Reviewed-by: Sage Weil <sage@redhat.com>
2021-04-19 21:43:43 +08:00
Daniel Gryniewicz
cbbe8e8680 RGW Zipper - Remove rgw_pool/sysobj from API
rgw_pool and sysobj are part of the RADOS backend, and do not belong in
the API.  Instead, pull the objects using them into the API.  These are:
RGWOIDCProvider, RGWRole, and a new object LuaScript.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2021-04-19 09:40:34 -04:00
Ilya Dryomov
bd87bf3e30
Merge pull request #40905 from idryomov/wip-rbd-kms-config-map-doc
doc/rbd/rbd-kubernetes: update for recent ceph-csi versions

Reviewed-by: Madhu Rajanna <madhupr007@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2021-04-19 15:40:21 +02:00
zdover23
df10995f7a
Merge pull request #40378 from zdover23/wip-doc-cephadm-osd-declarative-state-rewrite-2021-Mar-25
doc/cephadm: rewrite "delcarative state" in osd.rst

Reviewed-by: Sage Weil <sweil@redhat.com>
2021-04-19 23:03:21 +10:00
Sage Weil
56ade4769c Merge PR #40817 into master
* refs/pull/40817/head:
	mgr/MgrStandby: fix config observer
	mgr/MgrStandby: respawn if mgr_standby_modules changes
	qa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false
	qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
	qa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults
	cephadm: add --single-host-defaults option to bootstrap
	mgr/cephadm: allow mgr colo if mgr_standby_modules=false
	mgr/MgrStandby: add mgr_standby_modules option

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2021-04-19 08:30:42 -04:00
Sage Weil
139ff3adb1 Merge PR #40893 into master
* refs/pull/40893/head:
	mgr/cephadm: don't list non ceph daemons as needing upgrade in upgrade check

Reviewed-by: Sage Weil <sage@redhat.com>
2021-04-19 08:30:11 -04:00
Matt Benjamin
b040f25b71
Merge pull request #37730 from thotz/rgwkmsvaultsslsupport
rgw: extending existing ssl support for vault KMS
2021-04-19 07:37:29 -04:00
Kefu Chai
149ad529c4
Merge pull request #40881 from tchaikov/wip-50393
qa/workunits/mon/test_mon_config_key: use subprocess.run() instead of…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2021-04-19 18:54:40 +08:00
Kefu Chai
1392b40ba2 osd/ReplicatedBackend: cast variable to unsigned before comparing
after the yaml-to-cxx migration, osd_deep_scrub_stride is an OPT_SIZE,
and is hence represented with an uint64. so we need to cast `r` to
uint64_t before comparing it with this setting for silencing GCC
warning.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 18:04:47 +08:00
Ilya Dryomov
6f77102706 doc/rbd/rbd-kubernetes: expose volume expansion functionality
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2021-04-19 11:52:23 +02:00
Ilya Dryomov
d0d4100040 doc/rbd/rbd-kubernetes: imageFeatures is required
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2021-04-19 11:52:23 +02:00
Ilya Dryomov
2656448617 doc/rbd/rbd-kubernetes: mention KMS config map
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2021-04-19 11:52:23 +02:00
Kefu Chai
cdd059b3e4 doc/rados/configuration/mon-config-ref: use confval directive
for defining options

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:35:31 +08:00
Kefu Chai
536f096055 doc/rados/configuration/msgr2: use confval directive
for defining options

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:46 +08:00
Kefu Chai
3a62ba9463 doc/rados/configuration/auth-config-ref: use "describe" to define default keyrings
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:46 +08:00
Kefu Chai
fffa02706b doc/_ext: use iec_size() instead of filesizeformat()
to format size options in the same format supported by our C++
strict_iec_cast() parser. so they are more consistent from user's
perspective.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:46 +08:00
Kefu Chai
3767e0cb16 doc/rados/configuration: merge ms-ref into network-conf-ref
the latter provides more context, and "messenger" is how the networking
infra is implemented.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:46 +08:00
Kefu Chai
1ecd8e7f97 doc/rados/configuration/ceph-conf: use "describe" to define option types
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:46 +08:00
Kefu Chai
a67451d05d doc/rados/configuration: fix formatting of code block
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:46 +08:00
Kefu Chai
76fb3d147d doc: use "confsec" role for configure section
and rename confval_section to confsec for shorter name

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:45 +08:00
Kefu Chai
66a86596a3 doc/rados/configuration/ceph-conf: use confval directive
for defining options

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:45 +08:00
Kefu Chai
02a15a81d8 doc: use ":confval:" role to reference options defined using confval
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:45 +08:00
Kefu Chai
a37f5a5eea doc/rados/configuration/osd-config-ref: use confval directive
for defining options

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:45 +08:00
Kefu Chai
d1c6182fa2 doc/_ext: render see_also field
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:45 +08:00
Kefu Chai
1128f4e22f doc/_ext: render more fields in an option
* print "enum_value" as a list
* print "note" and "warning"

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:45 +08:00
Kefu Chai
23c7081dab doc/rados/configuration/mclock-config-ref: use confval directive
for defining options

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:43 +08:00
Kefu Chai
20676f00c9 doc/rados/configuration/pool-pg-config-ref: use confval directive
for defining options.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:11 +08:00
Kefu Chai
65925d78c6 doc/rados/configuration/bluestore-config-ref: use confval directive
for defining options.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 17:08:07 +08:00
Kefu Chai
f415cec292
Merge pull request #40906 from tchaikov/rzarzynski/wip-crimson-internal_client_request-cleanup
crimson/osd: various cleanups

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-19 16:45:46 +08:00
Kefu Chai
4fd963d68f
Merge pull request #40874 from rhcs-dashboard/fix-cephfs-pool-size-stat
mgr/dashboard: filesystem pool size should use stored stat

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
2021-04-19 16:36:04 +08:00
Kefu Chai
43940b1b91
Merge pull request #40879 from myoungwon/wip-fix-50299
osd: fix reference leak when ManifestOp is not used

Reviewed-by: Samuel Just <sjust@redhat.com>
2021-04-19 16:29:08 +08:00
Kefu Chai
9ae03a788a
Merge pull request #40878 from tchaikov/wip-mop-cleanup
osd: remove C_SetManifestRefCountDone::mop

Reviewed-by: Myoungwon Oh <myoungwon.oh@samsung.com>
Reviewed-by: Sam Just <sjust@redhat.com>
2021-04-19 16:26:56 +08:00
Kefu Chai
671af3ca85
Merge pull request #40896 from jdurgin/wip-yaml-options-fix
common/options: fix several out of date defaults and options added during yaml conversion

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-04-19 16:26:04 +08:00
Kefu Chai
20de7dd55c
Merge pull request #40884 from majianpeng/osd-watch-remove-unused-code
osd/Watch.h: remove unused code.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-04-19 16:25:30 +08:00
Kefu Chai
f2e0770c27 qa/workunits/mon/test_mon_config_key: use subprocess.run() instead of proc.communicate()
the loop of proc.communicate() on python3.6, where we always are able to
get something out of stdout and/or stderr PIPEs. and the `stdout` and
`stderr` keep growing until out of memory. and teuthology considers
the command crashed after a while.

Fixes: https://tracker.ceph.com/issues/50393
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 16:11:30 +08:00
Radoslaw Zarzynski
a28cc0d629 crimson/osd: fix formatting around ClientRequest::do_process().
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-19 15:58:19 +08:00
Radoslaw Zarzynski
713bb9188f crimson/osd: fix header inclusion order in ops_executer.h.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-19 15:58:19 +08:00
Radoslaw Zarzynski
46bd515410 crimson/osd: PG::with_locked_obc() doesn't depend on Op anymore.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-19 15:58:19 +08:00
Radoslaw Zarzynski
1364a46826 crimson/osd: drop namespace for arg in PG::with_locked_obc().
It's unnecessary.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-19 15:58:19 +08:00
Radoslaw Zarzynski
8b90df0dd2 crimson/osd: avoid unneeded obc catching in PG::do_osd_ops_execute().
Actually, `OpsExecuter` already holds `ObjectContextRef` and even
has a (private till now) getter for `hobject_t` extraction.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-19 15:58:19 +08:00
Kefu Chai
7200e5286e
Merge pull request #40872 from wjwithagen/wjw-fix-pidfile-order
core: fix compiler warning due to difference in order of struct members

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-04-19 15:50:33 +08:00
Kefu Chai
f057ea202f
Merge pull request #40749 from tchaikov/wip-python3-spec
ceph.spec: consolidate python3-{setuptools,Cython} builds deps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2021-04-19 15:49:37 +08:00
Kefu Chai
1f4525062b
Merge pull request #40869 from tchaikov/wip-run-make-check.sh-py3
run-make-check.sh: do not specify -DWITH_PYTHON=3

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2021-04-19 15:48:02 +08:00
Kefu Chai
d8a1d1f93a cmake: rearrange configure_file()
AddCephTest and googletest's CMake scripts also call
find_package(Python3...), but they do not specify the required minor
version of Python3. by default, find_package(Python3...) picks the highest
available python3. so, if we have multiple python3 versions installed in the
system, and the highest python3 version is not the one specified by the
-DWITH_PYTHON3=3.x.y in the cmake command line, we might end up using a
different python3 for the ceph CLI. and even worse, the required python3
package might not available for the picked python3 interpreter found by
googletest. as, in general, only a single python3 has the full access to
prepackaged python3-* shipped by a GNU/Linux distro.

in this change, the configure_file() calls are rearranged to the top of
src/CMakeLists.txt, so they have less chance to use the "polluted" cmake
variable for their subvars.

this change address the test failure where we have, for instance, python3.8
installed on RHEL8/CentOS8, where python3.6 is the python3 which has
the access to the python3-* packages.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 12:09:32 +08:00
Kefu Chai
bcd596994f run-make-check.sh: do not specify -DWITH_PYTHON=3
should leave it to do_cmake.sh to decide which python3 version to use,
there is case that we have multiple python3 installed, but only one of them
is fully supported by the distro, in the sense that python3-* packages
are packaged for that python3.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-19 12:04:18 +08:00
Kefu Chai
3903a71a60
Merge pull request #40901 from tchaikov/wip-mgr-rook
cmake: let WITH_MGR_ROOK_CLIENT depend on WITH_MGR

Reviewed-by: Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2021-04-19 11:25:23 +08:00
wangyunqing
cf0926ecb6
doc/radosgw/multisite.rst: fix typos
Signed-off-by: wangyunqing wangyunqing@inspur.com
2021-04-19 11:11:24 +08:00