]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoMerge pull request #40378 from zdover23/wip-doc-cephadm-osd-declarative-state-rewrite...
zdover23 [Mon, 19 Apr 2021 13:03:21 +0000 (23:03 +1000)]
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>
4 years agoMerge PR #40817 into master
Sage Weil [Mon, 19 Apr 2021 12:30:42 +0000 (08:30 -0400)]
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>
4 years agoMerge PR #40893 into master
Sage Weil [Mon, 19 Apr 2021 12:30:11 +0000 (08:30 -0400)]
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>
4 years agoMerge pull request #37730 from thotz/rgwkmsvaultsslsupport
Matt Benjamin [Mon, 19 Apr 2021 11:37:29 +0000 (07:37 -0400)]
Merge pull request #37730 from thotz/rgwkmsvaultsslsupport

rgw: extending existing ssl support for vault KMS

4 years agoMerge pull request #40881 from tchaikov/wip-50393
Kefu Chai [Mon, 19 Apr 2021 10:54:40 +0000 (18:54 +0800)]
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>
4 years agoMerge pull request #40906 from tchaikov/rzarzynski/wip-crimson-internal_client_reques...
Kefu Chai [Mon, 19 Apr 2021 08:45:46 +0000 (16:45 +0800)]
Merge pull request #40906 from tchaikov/rzarzynski/wip-crimson-internal_client_request-cleanup

crimson/osd: various cleanups

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #40874 from rhcs-dashboard/fix-cephfs-pool-size-stat
Kefu Chai [Mon, 19 Apr 2021 08:36:04 +0000 (16:36 +0800)]
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>
4 years agoMerge pull request #40879 from myoungwon/wip-fix-50299
Kefu Chai [Mon, 19 Apr 2021 08:29:08 +0000 (16:29 +0800)]
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>
4 years agoMerge pull request #40878 from tchaikov/wip-mop-cleanup
Kefu Chai [Mon, 19 Apr 2021 08:26:56 +0000 (16:26 +0800)]
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>
4 years agoMerge pull request #40896 from jdurgin/wip-yaml-options-fix
Kefu Chai [Mon, 19 Apr 2021 08:26:04 +0000 (16:26 +0800)]
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>
4 years agoMerge pull request #40884 from majianpeng/osd-watch-remove-unused-code
Kefu Chai [Mon, 19 Apr 2021 08:25:30 +0000 (16:25 +0800)]
Merge pull request #40884 from majianpeng/osd-watch-remove-unused-code

osd/Watch.h: remove unused code.

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoqa/workunits/mon/test_mon_config_key: use subprocess.run() instead of proc.communicate() 40881/head
Kefu Chai [Fri, 16 Apr 2021 04:09:14 +0000 (12:09 +0800)]
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>
4 years agocrimson/osd: fix formatting around ClientRequest::do_process(). 40906/head
Radoslaw Zarzynski [Thu, 18 Mar 2021 09:39:58 +0000 (09:39 +0000)]
crimson/osd: fix formatting around ClientRequest::do_process().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: fix header inclusion order in ops_executer.h.
Radoslaw Zarzynski [Thu, 18 Mar 2021 12:27:57 +0000 (12:27 +0000)]
crimson/osd: fix header inclusion order in ops_executer.h.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: PG::with_locked_obc() doesn't depend on Op anymore.
Radoslaw Zarzynski [Mon, 15 Mar 2021 19:22:03 +0000 (19:22 +0000)]
crimson/osd: PG::with_locked_obc() doesn't depend on Op anymore.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: drop namespace for arg in PG::with_locked_obc().
Radoslaw Zarzynski [Thu, 18 Mar 2021 09:54:40 +0000 (09:54 +0000)]
crimson/osd: drop namespace for arg in PG::with_locked_obc().

It's unnecessary.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: avoid unneeded obc catching in PG::do_osd_ops_execute().
Radoslaw Zarzynski [Mon, 22 Mar 2021 17:18:20 +0000 (17:18 +0000)]
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>
4 years agoMerge pull request #40872 from wjwithagen/wjw-fix-pidfile-order
Kefu Chai [Mon, 19 Apr 2021 07:50:33 +0000 (15:50 +0800)]
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>
4 years agoMerge pull request #40749 from tchaikov/wip-python3-spec
Kefu Chai [Mon, 19 Apr 2021 07:49:37 +0000 (15:49 +0800)]
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>
4 years agoMerge pull request #40869 from tchaikov/wip-run-make-check.sh-py3
Kefu Chai [Mon, 19 Apr 2021 07:48:02 +0000 (15:48 +0800)]
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>
4 years agocmake: rearrange configure_file() 40869/head
Kefu Chai [Thu, 15 Apr 2021 10:46:11 +0000 (18:46 +0800)]
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>
4 years agorun-make-check.sh: do not specify -DWITH_PYTHON=3
Kefu Chai [Thu, 15 Apr 2021 09:22:31 +0000 (17:22 +0800)]
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>
4 years agoMerge pull request #40901 from tchaikov/wip-mgr-rook
Kefu Chai [Mon, 19 Apr 2021 03:25:23 +0000 (11:25 +0800)]
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>
4 years agocmake: let WITH_MGR_ROOK_CLIENT depend on WITH_MGR 40901/head
Kefu Chai [Sun, 18 Apr 2021 13:38:23 +0000 (21:38 +0800)]
cmake: let WITH_MGR_ROOK_CLIENT depend on WITH_MGR

it does not depend on WITH_MGR_DASHBOARD_FRONTEND, which is disabled by
default and is used for enable/disable the inclusion of dashboard
support. while root client is used by orchestrator. so it should depend
on WITH_MGR not WITH_MGR_DASHBOARD_FRONTEND.

this change addresses the regression introduced by
1003f1ffeee0d016e353f2c8c4ba692b5fdc2805

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #40892 into master
Patrick Donnelly [Sat, 17 Apr 2021 17:10:15 +0000 (10:10 -0700)]
Merge PR #40892 into master

* refs/pull/40892/head:
qa/crontab: reduce pacific priority

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40890 from tchaikov/wip-yamlize-options-doc
Kefu Chai [Sat, 17 Apr 2021 02:43:58 +0000 (10:43 +0800)]
Merge pull request #40890 from tchaikov/wip-yamlize-options-doc

common/options,doc: extract formatted desc into .yaml.in

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agocommon/options/global.yaml.in: remove unused mon options 40896/head
Josh Durgin [Fri, 16 Apr 2021 22:16:31 +0000 (18:16 -0400)]
common/options/global.yaml.in: remove unused mon options

These were removed in a5f9ca1571cb2b9965d57c9102239aac28a5cc2a

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #40888 into master
Sage Weil [Fri, 16 Apr 2021 22:10:46 +0000 (18:10 -0400)]
Merge PR #40888 into master

* refs/pull/40888/head:
qa/tasks/cephadm: ignore --keep-logs failure
qa/tasks/cephadm: use yaml.dump_all()
qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
qa/tasks/cephadm: tear down clsuter before gathering logs
qa/suites/rados/cephadm/smoke-roleless: test rgw-ingress
mgr/cephadm: remove virtual_ip check during scheduling
mgr/orchestrator: orch ls: leave off virtual_ip prefixlen
qa/tasks/cephadm: add wait_for_service
qa/tasks/cephadm: allow skip_monitor_stack=true
qa/tasks/cephadm: do subst_vip for cephadm.shell and .apply
qa/tasks/vip: add vip task to allocate virtual IPs
qa/suites/rados/cephadm/smoke-roleless: add rgw-ingress test case
qa/tasks/cephadm: shell: take 'all-roles' or 'all-hosts'
qa/tasks/cephadm: let cephadm.shell take string or list

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agocommon/options/y2c.py: add newline after set_enum
Josh Durgin [Fri, 16 Apr 2021 21:29:25 +0000 (17:29 -0400)]
common/options/y2c.py: add newline after set_enum

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
4 years agocommon/options/immutable-object-cache.in.yaml: fix watermark after yaml conversion
Josh Durgin [Fri, 16 Apr 2021 21:15:52 +0000 (17:15 -0400)]
common/options/immutable-object-cache.in.yaml: fix watermark after yaml conversion

This was set higher by 2093c882298e0dc363fc56727b8e1c4a14d0c2f2

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
4 years agocommon/options/global.yaml.in: fix bluestore cache ratios from yaml conversion
Josh Durgin [Fri, 16 Apr 2021 21:14:33 +0000 (17:14 -0400)]
common/options/global.yaml.in: fix bluestore cache ratios from yaml conversion

These were updated two years ago in 303d42533d3ffe6d4cf29bce3dded8f1e7ceb9a8

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40732 from neha-ojha/wip-50217
Neha Ojha [Fri, 16 Apr 2021 20:00:52 +0000 (13:00 -0700)]
Merge pull request #40732 from neha-ojha/wip-50217

common/options/global.yaml.in: increase default value of bluestore_cache_trim_max_skip_pinned

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse
4 years agomgr/MgrStandby: fix config observer 40817/head
Sage Weil [Fri, 16 Apr 2021 18:58:34 +0000 (14:58 -0400)]
mgr/MgrStandby: fix config observer

Otherwise handle_conf_change() is never called.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/MgrStandby: respawn if mgr_standby_modules changes
Sage Weil [Fri, 16 Apr 2021 16:12:01 +0000 (12:12 -0400)]
mgr/MgrStandby: respawn if mgr_standby_modules changes

If we have standby modules and this goes false, or do not have modules
and this goes true, then respawn.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false
Sage Weil [Tue, 13 Apr 2021 22:47:05 +0000 (18:47 -0400)]
qa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
Sage Weil [Tue, 13 Apr 2021 16:53:24 +0000 (12:53 -0400)]
qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults
Sage Weil [Tue, 13 Apr 2021 16:09:26 +0000 (12:09 -0400)]
qa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocephadm: add --single-host-defaults option to bootstrap
Sage Weil [Mon, 12 Apr 2021 15:51:33 +0000 (11:51 -0400)]
cephadm: add --single-host-defaults option to bootstrap

[global] osd_crush_choose_leaf_type = 0
[global] osd_pool_default_size = 2
[mgr] mgr_standby_modules = false

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: allow mgr colo if mgr_standby_modules=false
Sage Weil [Mon, 12 Apr 2021 14:17:17 +0000 (10:17 -0400)]
mgr/cephadm: allow mgr colo if mgr_standby_modules=false

If the standby mgr daemons' modules aren't listening on any ports, then we
can schedule multiple on the same host.

Note that this may make 'orch ps' output misleading, as ports will be
reported for each mgr instance, but only one of them will actually be
listening at any one time (if they are behaving, at least!).  Treat a
mgr port check error as non-fatal.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/MgrStandby: add mgr_standby_modules option
Sage Weil [Tue, 13 Apr 2021 14:11:31 +0000 (10:11 -0400)]
mgr/MgrStandby: add mgr_standby_modules option

Add config option to control whether the standby modules are started.
Default to true (no change in behavior), but if set to false the standby
mgr modules don't do the redirect business.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocommon/options/global.yaml.in: remove obsolete bluefs options
Josh Durgin [Fri, 16 Apr 2021 19:10:57 +0000 (15:10 -0400)]
common/options/global.yaml.in: remove obsolete bluefs options

These were removed in d17cd6604b4031ca997deddc5440248aff451269 and
1f04b4589d4e96012313fe8a9069b958297b42f1

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
4 years agoqa/tasks/cephadm: ignore --keep-logs failure 40888/head
Sage Weil [Fri, 16 Apr 2021 19:12:49 +0000 (14:12 -0500)]
qa/tasks/cephadm: ignore --keep-logs failure

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocommon/options/global.yaml.in: fix some defaults that got changed by the yaml conversion
Josh Durgin [Fri, 16 Apr 2021 19:08:40 +0000 (15:08 -0400)]
common/options/global.yaml.in: fix some defaults that got changed by the yaml conversion

Presumably git didn't complain during a rebase because the whole file
was removed.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
4 years agocommon/options/global.yaml.in: remove duplicate line
Josh Durgin [Fri, 16 Apr 2021 19:06:57 +0000 (15:06 -0400)]
common/options/global.yaml.in: remove duplicate line

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
4 years agodoc/radosgw/vault: add documentation for ssl authentication 37730/head
Jiffin Tony Thottan [Fri, 4 Dec 2020 10:54:07 +0000 (16:24 +0530)]
doc/radosgw/vault: add documentation for ssl authentication

Now RGW server can use custom ssl certs to authenticate with vault
server, adding steps for the same

Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
4 years agorgw: add support for client cert and key for vault
Jiffin Tony Thottan [Mon, 22 Feb 2021 09:46:10 +0000 (15:16 +0530)]
rgw: add support for client cert and key for vault

Authenticate vault with help of user supplied client cert and keys.

Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
4 years agocommon/options/global.yaml.in: increase default value of bluestore_cache_trim_max_ski... 40732/head
Neha Ojha [Thu, 15 Apr 2021 16:44:27 +0000 (16:44 +0000)]
common/options/global.yaml.in: increase default value of bluestore_cache_trim_max_skip_pinned

This option controls the rate of trimming of onodes and the earlier default of
64 has been seen to be too low for large clusters, leading to buildup of
onodes resulting in memory growth.

Increase the default value to 1000, since there are no known downsides to it.

Fixes: https://tracker.ceph.com/issues/50217
Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agorgw: update debug log for curl error
Jiffin Tony Thottan [Fri, 4 Dec 2020 10:44:31 +0000 (16:14 +0530)]
rgw: update debug log for curl error

The req_data->error_buf stores error returned by the curl command, add
that information to existing debug log.

Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
4 years agorgw: add support to consume user given ca cert for vault
Jiffin Tony Thottan [Tue, 20 Oct 2020 06:13:58 +0000 (11:43 +0530)]
rgw: add support to consume user given ca cert for vault

Currently RGW can authenticate with vault via SSL using system certs.
With this patch user can provide custom ca cert and location of the file
can be specified in ceph.conf like this :
rgw_crypt_require_ssl = <file path>

Fixes: https://tracker.ceph.com/issues/47776
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
4 years agorgw: add seperate option for verify ssl for vault KMS engine
Jiffin Tony Thottan [Mon, 19 Oct 2020 18:12:58 +0000 (23:42 +0530)]
rgw: add seperate option for verify ssl for vault KMS engine

Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
4 years agoMerge pull request #40189 from dang/wip-dang-zipper-rename
Daniel Gryniewicz [Fri, 16 Apr 2021 17:23:21 +0000 (13:23 -0400)]
Merge pull request #40189 from dang/wip-dang-zipper-rename

RGW Zipper - The Great Rename

4 years agoMerge pull request #40891 from idryomov/wip-y2c-reject-duplicate-keys
Ilya Dryomov [Fri, 16 Apr 2021 16:51:52 +0000 (18:51 +0200)]
Merge pull request #40891 from idryomov/wip-y2c-reject-duplicate-keys

common: make y2c.py choke on duplicate keys

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/cephadm: don't list non ceph daemons as needing upgrade in upgrade check 40893/head
Adam King [Fri, 16 Apr 2021 16:49:59 +0000 (12:49 -0400)]
mgr/cephadm: don't list non ceph daemons as needing upgrade in upgrade check

Fixes: https://tracker.ceph.com/issues/50401
Signed-off-by: Adam King <adking@redhat.com>
4 years agoqa/crontab: reduce pacific priority 40892/head
Patrick Donnelly [Fri, 16 Apr 2021 16:13:59 +0000 (09:13 -0700)]
qa/crontab: reduce pacific priority

Now that it is released, we can reduce its priority to be in line with
other nightlies (but still higher, for now).

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agodoc/rados/configuration/mon-osd-interaction: use confval directive to define options 40890/head
Kefu Chai [Fri, 16 Apr 2021 14:49:25 +0000 (22:49 +0800)]
doc/rados/configuration/mon-osd-interaction: use confval directive to define options

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocommon/options,doc: extract formatted desc into .yaml.in
Kefu Chai [Fri, 16 Apr 2021 05:51:23 +0000 (13:51 +0800)]
common/options,doc: extract formatted desc into .yaml.in

* add a field named "fmt_desc", which is the description formatted using
  reStructuredText. it is preserved as it is if it's different from the
  desc or long_desc of an option. we can consolidate it with long_desc
  in future, and use pretty printer which has minimal support for
  reStructuredText for printing the formatted descriptions for a better
  user experience of command line. but at this moment, fmt_desc has
  only one consumer: the "ceph_confval" sphinx extension which extracts
  and translate the options yaml file to reStructuredText, which is in
  turn rendered by sphinx.
* remove unused options from the doc
  - journal_queue_max_ops
  - journal_queue_max_bytes

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40748 from tchaikov/wip-selftest-ann
Kefu Chai [Fri, 16 Apr 2021 15:51:12 +0000 (23:51 +0800)]
Merge pull request #40748 from tchaikov/wip-selftest-ann

pybind/mgr/selftest: add selftest to mypy and cleanups

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge PR #40712 into master
Sage Weil [Fri, 16 Apr 2021 15:31:24 +0000 (11:31 -0400)]
Merge PR #40712 into master

* refs/pull/40712/head:
doc/cephadm: wrong command for single daemon events

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoqa/tasks/cephadm: use yaml.dump_all()
Sage Weil [Fri, 16 Apr 2021 15:30:05 +0000 (10:30 -0500)]
qa/tasks/cephadm: use yaml.dump_all()

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocommon: make y2c.py choke on duplicate keys 40891/head
Ilya Dryomov [Fri, 16 Apr 2021 11:55:56 +0000 (13:55 +0200)]
common: make y2c.py choke on duplicate keys

Commit 5505fc0051a3 ("common: generate legacy_config_opts.h from
.yaml.in files") inadvertently reverted a change of a default value by
adding a second "default" key with the old value.  This was corrected
in commit 75e07f8638ef ("common/options/global: correct default of
auth_mon_ticket_ttl"), but highlights that mis-merging a yaml file
is rather easy.

To prevent this happening again, fail the build if duplicate keys
exist in any of src/common/options/*.yaml.in files.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoqa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
Sage Weil [Tue, 13 Apr 2021 16:53:24 +0000 (12:53 -0400)]
qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephadm: tear down clsuter before gathering logs
Sage Weil [Thu, 15 Apr 2021 22:55:00 +0000 (17:55 -0500)]
qa/tasks/cephadm: tear down clsuter before gathering logs

We dont' always stop all services, because teuthology doesn't know about
things it didn't start.  Use rm-cluster to tear things down, but do not
remove the logs themselves.  After we get logs, we'll clean up completely.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites/rados/cephadm/smoke-roleless: test rgw-ingress
Sage Weil [Thu, 15 Apr 2021 22:45:21 +0000 (17:45 -0500)]
qa/suites/rados/cephadm/smoke-roleless: test rgw-ingress

Test this properly by downing each rgw and haproxy in turn and ensuring
that things remain up.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: remove virtual_ip check during scheduling
Sage Weil [Thu, 15 Apr 2021 22:22:26 +0000 (17:22 -0500)]
mgr/cephadm: remove virtual_ip check during scheduling

In 2f33c6ebbc8e2a6c3844a6921c857fb0796a1552 we made the keepalived task
set the necessary sysctls  to add a virtual_ip, so we don't need this
check anymore.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/orchestrator: orch ls: leave off virtual_ip prefixlen
Sage Weil [Thu, 15 Apr 2021 21:59:09 +0000 (16:59 -0500)]
mgr/orchestrator: orch ls: leave off virtual_ip prefixlen

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephadm: add wait_for_service
Sage Weil [Tue, 13 Apr 2021 16:52:49 +0000 (12:52 -0400)]
qa/tasks/cephadm: add wait_for_service

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephadm: allow skip_monitor_stack=true
Sage Weil [Thu, 15 Apr 2021 19:01:48 +0000 (14:01 -0500)]
qa/tasks/cephadm: allow skip_monitor_stack=true

(Useful for roleless when we want to go faster)

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephadm: do subst_vip for cephadm.shell and .apply
Sage Weil [Thu, 15 Apr 2021 19:01:18 +0000 (14:01 -0500)]
qa/tasks/cephadm: do subst_vip for cephadm.shell and .apply

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/vip: add vip task to allocate virtual IPs
Sage Weil [Thu, 15 Apr 2021 19:00:57 +0000 (14:00 -0500)]
qa/tasks/vip: add vip task to allocate virtual IPs

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #40411 into master
Sage Weil [Fri, 16 Apr 2021 14:48:04 +0000 (10:48 -0400)]
Merge PR #40411 into master

* refs/pull/40411/head:
doc: add note about removal of the `cephfs` nfs cluster type
mgr/volumes/nfs: drop `type` param during cluster create

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge PR #40376 into master
Sage Weil [Fri, 16 Apr 2021 14:47:22 +0000 (10:47 -0400)]
Merge PR #40376 into master

* refs/pull/40376/head:
mgr/cephadm: place maximum on placement count based on host count

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoqa/suites/rados/cephadm/smoke-roleless: add rgw-ingress test case
Sage Weil [Tue, 13 Apr 2021 14:21:41 +0000 (10:21 -0400)]
qa/suites/rados/cephadm/smoke-roleless: add rgw-ingress test case

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephadm: shell: take 'all-roles' or 'all-hosts'
Sage Weil [Tue, 13 Apr 2021 14:58:09 +0000 (10:58 -0400)]
qa/tasks/cephadm: shell: take 'all-roles' or 'all-hosts'

'all' is ambiguous

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephadm: let cephadm.shell take string or list
Sage Weil [Mon, 12 Apr 2021 20:12:01 +0000 (16:12 -0400)]
qa/tasks/cephadm: let cephadm.shell take string or list

Make it a bit more forgiving.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agodoc: use "describe" directive for meta variables
Kefu Chai [Fri, 16 Apr 2021 06:17:57 +0000 (14:17 +0800)]
doc: use "describe" directive for meta variables

they are not options, so we should not use confval for defining them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc: add "confval_section" directive
Kefu Chai [Fri, 16 Apr 2021 06:08:59 +0000 (14:08 +0800)]
doc: add "confval_section" directive

instead of reusing "confval" directive, define a new directive just
for configration sections

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #40870 into master
Sage Weil [Fri, 16 Apr 2021 12:14:28 +0000 (08:14 -0400)]
Merge PR #40870 into master

* refs/pull/40870/head:
auth/cephx: make KeyServer::build_session_auth_info() less confusing
auth/cephx: cap ticket validity by expiration of "next" key
auth/cephx: drop redundant KeyServerData::get_service_secret() overload

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agocommon/options/global: drop duplicate "with_legacy" key
Ilya Dryomov [Fri, 16 Apr 2021 12:03:06 +0000 (14:03 +0200)]
common/options/global: drop duplicate "with_legacy" key

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge PR #40711 into master
Sage Weil [Fri, 16 Apr 2021 12:01:15 +0000 (08:01 -0400)]
Merge PR #40711 into master

* refs/pull/40711/head:
mgr/cephadm: fix nfs-rgw stray daemon

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #40883 from tchaikov/wip-option-auth_mon_ticket_ttl
Ilya Dryomov [Fri, 16 Apr 2021 08:43:59 +0000 (10:43 +0200)]
Merge pull request #40883 from tchaikov/wip-option-auth_mon_ticket_ttl

common/options/global: correct default of auth_mon_ticket_ttl

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoosd: fix reference leak when ManifestOp is released without being referenced 40879/head
myoungwon oh [Fri, 16 Apr 2021 02:58:57 +0000 (11:58 +0900)]
osd: fix reference leak when ManifestOp is released without being referenced

fixes: https://tracker.ceph.com/issues/50299

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoosd/Watch.h: remvoe unused code. 40884/head
Jianpeng Ma [Fri, 16 Apr 2021 05:49:27 +0000 (13:49 +0800)]
osd/Watch.h: remvoe unused code.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
4 years agocommon/options/global: correct default of auth_mon_ticket_ttl 40883/head
Kefu Chai [Fri, 16 Apr 2021 05:39:06 +0000 (13:39 +0800)]
common/options/global: correct default of auth_mon_ticket_ttl

in 5505fc0051a302fed46aa2ecaa8c8aa2a75b9e91, during rebasing against
master it was set to 12_hr by accident.

this setting was changed to 72_hr in
522a52e6c258932274f0753feb623ce008519216

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40319 from cypherean/skip_ssh_patch
Kefu Chai [Fri, 16 Apr 2021 04:46:36 +0000 (12:46 +0800)]
Merge pull request #40319 from cypherean/skip_ssh_patch

mgr/cephadm: skip-ssh flag enables cephadm mgr module

Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge pull request #40858 from adk3798/upgrade-fail
Kefu Chai [Fri, 16 Apr 2021 04:44:48 +0000 (12:44 +0800)]
Merge pull request #40858 from adk3798/upgrade-fail

mgr/cephadm: report exception during upgrade in upgrade status

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge pull request #40837 from liewegas/cephadm-qa-shorten-thrash
Kefu Chai [Fri, 16 Apr 2021 04:42:05 +0000 (12:42 +0800)]
Merge pull request #40837 from liewegas/cephadm-qa-shorten-thrash

qa/suites/rados/thrash: shorten radosbench

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40860 from liewegas/cephadm-cleanup-ha-rgw
Kefu Chai [Fri, 16 Apr 2021 04:41:05 +0000 (12:41 +0800)]
Merge pull request #40860 from liewegas/cephadm-cleanup-ha-rgw

mgr/cephadm: remove old haproxy and keepalived templates

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge pull request #40552 from Daniel-Pivonka/cephadmverifylistsinspecjson
Kefu Chai [Fri, 16 Apr 2021 04:30:11 +0000 (12:30 +0800)]
Merge pull request #40552 from Daniel-Pivonka/cephadmverifylistsinspecjson

mgr/orchestrator: validate lists in spec jsons

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge pull request #40841 from tchaikov/wip-yamlize-legacy-option
Kefu Chai [Fri, 16 Apr 2021 04:28:56 +0000 (12:28 +0800)]
Merge pull request #40841 from tchaikov/wip-yamlize-legacy-option

common: generate legacy_config_opts.h from .yaml.in files

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge PR #40828 into master
Patrick Donnelly [Fri, 16 Apr 2021 04:08:21 +0000 (21:08 -0700)]
Merge PR #40828 into master

* refs/pull/40828/head:
mds: set fscrypt flag on create if xattr buffer has an encryption context

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
4 years agoMerge PR #40741 into master
Patrick Donnelly [Fri, 16 Apr 2021 04:07:08 +0000 (21:07 -0700)]
Merge PR #40741 into master

* refs/pull/40741/head:
mgr/volumes: remove unused semicolon

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40539 into master
Patrick Donnelly [Fri, 16 Apr 2021 04:06:31 +0000 (21:06 -0700)]
Merge PR #40539 into master

* refs/pull/40539/head:
cephfs-top: set the cursor to be invisible
cephfs-top: self-adapt the display according the window size
cephfs-top: use the default window object from curses.wrapper()
cephfs-top: improve the output

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge PR #40412 into master
Patrick Donnelly [Fri, 16 Apr 2021 04:05:51 +0000 (21:05 -0700)]
Merge PR #40412 into master

* refs/pull/40412/head:
vstart_runner: reuse code in LocalRemoteProcess

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #39660 into master
Patrick Donnelly [Fri, 16 Apr 2021 04:03:19 +0000 (21:03 -0700)]
Merge PR #39660 into master

* refs/pull/39660/head:
qa: Update the mdsmap schema in mgr/dashboard/test_health.py
doc: add lsflags command to Administrative Commands document
qa: test fs lsflags command
mon: add command to print fs flags
mds: print each flag value

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #40824 from batrick/i50304
Kefu Chai [Fri, 16 Apr 2021 02:10:16 +0000 (10:10 +0800)]
Merge pull request #40824 from batrick/i50304

pybind/mgr/devicehealth: fix command name

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #40829 from batrick/i50307
Kefu Chai [Fri, 16 Apr 2021 01:55:12 +0000 (09:55 +0800)]
Merge pull request #40829 from batrick/i50307

SimpleRADOSStriper: use debug_cephsqlite

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40859 from wjwithagen/wjw-fix-make-rook-optional
Kefu Chai [Fri, 16 Apr 2021 01:53:21 +0000 (09:53 +0800)]
Merge pull request #40859 from wjwithagen/wjw-fix-make-rook-optional

cmake: Add an option for enabling rook client in dashboard

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoosd: remove C_SetManifestRefCountDone::mop 40878/head
Kefu Chai [Fri, 16 Apr 2021 01:28:09 +0000 (09:28 +0800)]
osd: remove C_SetManifestRefCountDone::mop

as it is not referenced after being assigned.

see also https://tracker.ceph.com/issues/50299

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40876 from tchaikov/wip-top-bar-spacing
Kefu Chai [Fri, 16 Apr 2021 00:25:13 +0000 (08:25 +0800)]
Merge pull request #40876 from tchaikov/wip-top-bar-spacing

doc/_theme: increasing the padding in navigation bar

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agocore: fix compiler warning due to difference in order of struct memebers 40872/head
Willem Jan Withagen [Thu, 15 Apr 2021 11:01:21 +0000 (13:01 +0200)]
core: fix compiler warning due to difference in order of struct memebers

Clang on FreeBSD reports:
```
Building CXX object src/global/CMakeFiles/libglobal_objs.dir/pidfile.cc.o
../src/global/pidfile.cc:170:5: warning: ISO C++ requires field designators to be specified in declaration order; field 'l_whence' will be initialized after field 'l_start' [-Wreorder-init-list]
    .l_start = 0,
    ^~~~~~~~~~~~
../src/global/pidfile.cc:169:17: note: previous initialization for field 'l_whence' is here
    .l_whence = SEEK_SET,
                ^~~~~~~~
```
And Linux and BSD have different orders in their `struct flock`

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