]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agomgr/rook: Make use of rook-client-python when talking to Rook 29427/head
Sebastian Wagner [Mon, 13 Jan 2020 12:01:20 +0000 (13:01 +0100)]
mgr/rook: Make use of rook-client-python when talking to Rook

Fixes:

* `CephFilesystem.spec.onlyManageDaemons` does not exist
* `CephObjectStroe.spec.gateway.allNodes` does not exist
* Added directory-osds to existsing nodes was broken

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agocmake: Integrate Rook client generation
Sebastian Wagner [Mon, 13 Jan 2020 12:00:41 +0000 (13:00 +0100)]
cmake: Integrate Rook client generation

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/rook: Automatically generate Rook client interface
Sebastian Wagner [Mon, 13 Jan 2020 11:58:32 +0000 (12:58 +0100)]
mgr/rook: Automatically generate Rook client interface

using the official Rook client Python library.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoAdd submodule to rook-client-python.git
Sebastian Wagner [Tue, 11 Feb 2020 15:56:44 +0000 (16:56 +0100)]
Add submodule to rook-client-python.git

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #33236 from sebastian-philipp/python-common-py.typed
Sebastian Wagner [Thu, 13 Feb 2020 10:32:46 +0000 (11:32 +0100)]
Merge pull request #33236 from sebastian-philipp/python-common-py.typed

python-common: add py.typed (PEP 561)

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33212 from liewegas/wip-orch-newcli
Sebastian Wagner [Thu, 13 Feb 2020 10:31:37 +0000 (11:31 +0100)]
Merge pull request #33212 from liewegas/wip-orch-newcli

mgr/orch: first phase of new cli

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #33250 from tchaikov/wip-seastar
Kefu Chai [Thu, 13 Feb 2020 10:08:52 +0000 (18:08 +0800)]
Merge pull request #33250 from tchaikov/wip-seastar

crimson: pickup change to fix --cpuset support and cleanups

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #32647 from optimistyzy/115
Kefu Chai [Thu, 13 Feb 2020 07:35:19 +0000 (15:35 +0800)]
Merge pull request #32647 from optimistyzy/115

NVMEDevice: Split the read I/O if the io size is large.

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33246 from jan--f/c-v-batch-fix-has_common_vg
Jan Fajerski [Thu, 13 Feb 2020 07:00:47 +0000 (08:00 +0100)]
Merge pull request #33246 from jan--f/c-v-batch-fix-has_common_vg

ceph-volume: use get_device_vgs in has_common_vg

5 years agoMerge pull request #33223 from dsavineau/issue_44069
Jan Fajerski [Thu, 13 Feb 2020 07:00:30 +0000 (08:00 +0100)]
Merge pull request #33223 from dsavineau/issue_44069

ceph-volume: fix is_ceph_device for lvm batch

5 years agocmake: disable -Wnon-virtual-dtor when compiling seastar 33250/head
Kefu Chai [Thu, 13 Feb 2020 04:32:00 +0000 (12:32 +0800)]
cmake: disable -Wnon-virtual-dtor when compiling seastar

quite a few base classes with virtual functions mark their destructor
non-virtual and `protected` for better performance, as seastar destruct
them via the concrete type of the instance.

so let's disable this warning. but, please note, this newly added
CXX_FLAG in `Seastar_CXX_FLAGS` won't be populated to crimson, as it is
only added to the CXX_FLAGS used for compiling seastar itself. so we still
have `-Wnon-virtual-dtor` warnings when compiling crimson as long as seastar
headers are included.

so to silence these warnings, we need to add it also to `crimson::cflags`,
probably it's worth trading the noise caused by seastar's optimizations
with the potentially useful warning messages caused by our oversights.
in my case, there are over 300 lines of warnings split by GCC-10, so i
still think it'd be better to add it also to crimson to increase the
signal-to-noise ratio. we can aways remove it every once in a while to
check if we forget to mark the destructor of a base class `virtual`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/thread: s/Condition/seastar::readable_eventfd/
Kefu Chai [Thu, 13 Feb 2020 04:27:29 +0000 (12:27 +0800)]
crimson/thread: s/Condition/seastar::readable_eventfd/

in the latest version of seastar, we are not able to construct a
`seastar::pollable_fd_state` directly, as its constructor is now
`protected`, and only the reactor is able to create an instance of
`seastar::pollable_fd_state` now.

and `seastar::readable_eventfd` offers all we need to get notified
by reactor in an alien world. so let's used it instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoseastar: pickup change to fix --cpuset support
Kefu Chai [Thu, 13 Feb 2020 04:47:17 +0000 (12:47 +0800)]
seastar: pickup change to fix --cpuset support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33216 into master
Sage Weil [Thu, 13 Feb 2020 01:09:05 +0000 (19:09 -0600)]
Merge PR #33216 into master

* refs/pull/33216/head:
cephadm: avoid trigger old podman bug
qa/workunits/cephadm/test_cephadm.sh: wait longer for grafana

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: avoid trigger old podman bug 33216/head
Sage Weil [Wed, 12 Feb 2020 16:56:22 +0000 (10:56 -0600)]
cephadm: avoid trigger old podman bug

This ticket seems to suggest that (1) the root cause is related to an
exec that is orphaned and screws up the container state (due to, e.g., ssh
dropping, or a timeout), (2) -f may be needed, sometimes, to recover, and
(3) newer versions fix it.

  https://github.com/containers/libpod/issues/3226

Way back in 26f9fe54cb635cbcd8f74849d6fa3528cdf5d755 we found that using
-f the first time around was a Bad Idea, so we'd rather avoid this.

Instead, just avoid triggering the bug.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephadm/test_cephadm.sh: wait longer for grafana
Sage Weil [Tue, 11 Feb 2020 23:23:33 +0000 (17:23 -0600)]
qa/workunits/cephadm/test_cephadm.sh: wait longer for grafana

Sometimes it is very slow to start (only on 18.04, strangely?).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32562 from IlsooByun/fix_dm
J. Eric Ivancich [Wed, 12 Feb 2020 19:47:44 +0000 (14:47 -0500)]
Merge pull request #32562 from IlsooByun/fix_dm

rgw: do not remove delete marker when fixing versioned bucket

5 years agoMerge pull request #30611 from ivancich/wip-make-reshard-status-enum-class
J. Eric Ivancich [Wed, 12 Feb 2020 19:46:23 +0000 (14:46 -0500)]
Merge pull request #30611 from ivancich/wip-make-reshard-status-enum-class

rgw: change cls rgw reshard status to enum class

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
5 years agomgr/orch: add 'orch service rm' 33212/head
Sage Weil [Tue, 11 Feb 2020 16:21:00 +0000 (10:21 -0600)]
mgr/orch: add 'orch service rm'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch,cephadm: orch daemon rm ...
Sage Weil [Tue, 11 Feb 2020 16:11:01 +0000 (10:11 -0600)]
mgr/orch,cephadm: orch daemon rm ...

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: service ls -> ps, add DaemonDescription
Sage Weil [Tue, 11 Feb 2020 16:01:33 +0000 (10:01 -0600)]
mgr/orch: service ls -> ps, add DaemonDescription

- We keep ServiceDescription around unmodified (although it will need some
  cleanup later)
- We add DaemonDescription, and clean out the service-related ambiguities
- Add a new list_daemons() method for Orchestrator
- Add a new 'ceph orch ps' command
- In cephadm, drop get_services(), and implement list_daemons()
  - a million changes to make this work
- Adjust health alert and option names

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agovstart.sh: ceph orchestrator -> ceph orch
Sage Weil [Tue, 11 Feb 2020 15:47:02 +0000 (09:47 -0600)]
vstart.sh: ceph orchestrator -> ceph orch

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: split out daemon_action from service_action
Sage Weil [Tue, 11 Feb 2020 15:05:55 +0000 (09:05 -0600)]
mgr/orch: split out daemon_action from service_action

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33205 into master
Sage Weil [Wed, 12 Feb 2020 17:13:41 +0000 (11:13 -0600)]
Merge PR #33205 into master

* refs/pull/33205/head:
mgr/cephadm: Bail if we cannot find a host for services
mgr/cephadm: fix placement of new daemons (mds,rgw,rbd-m)
mgr/orchestrator: minor change to improve type checking
mgr/cephadm: test_cephadm: simplify matching strings

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32587 from zdover23/wip-doc-nautilus-osd-fix-10Jan2020
zdover23 [Wed, 12 Feb 2020 16:59:28 +0000 (02:59 +1000)]
Merge pull request #32587 from zdover23/wip-doc-nautilus-osd-fix-10Jan2020

doc: emphasize the importance of require-osd-release nautilus

5 years agoceph-volume: add is_ceph_device unit tests 33223/head
Jan Fajerski [Wed, 12 Feb 2020 15:49:30 +0000 (16:49 +0100)]
ceph-volume: add is_ceph_device unit tests

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoceph-volume: fix is_ceph_device for lvm batch
Dimitri Savineau [Tue, 11 Feb 2020 21:53:55 +0000 (16:53 -0500)]
ceph-volume: fix is_ceph_device for lvm batch

This is a regression introduced by 634a709

The lvm batch command fails to prepare the OSDs on the created LV.
When using lvm batch, the LV/VG are created prior the OSD prepare.
During that creation, multiple tags are set with null value.

$ lvs -o lv_tags --noheadings
  ceph.cluster_fsid=null,ceph.osd_fsid=null,ceph.osd_id=null,ceph.type=null

Since we call is_ceph_device which returns True if the ceph.osd_id LVM
tag exists but doesn't test the value then we raise an execption.

When the tag value is set to 'null' then we can consider that the device
isn't part of the ceph cluster (because not yet prepared).

Closes: https://tracker.ceph.com/issues/44069
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
5 years agoMerge pull request #32879 from shyukri/wip-42769-orch-log-handling-ench
Sebastian Wagner [Wed, 12 Feb 2020 15:32:34 +0000 (16:32 +0100)]
Merge pull request #32879 from shyukri/wip-42769-orch-log-handling-ench

mgr/orch: logging - handle lists output

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoceph-volume: use get_device_vgs in has_common_vg 33246/head
Jan Fajerski [Wed, 12 Feb 2020 13:47:37 +0000 (14:47 +0100)]
ceph-volume: use get_device_vgs in has_common_vg

Fixes: https://tracker.ceph.com/issues/44099
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge PR #33229 into master
Sage Weil [Wed, 12 Feb 2020 14:28:51 +0000 (08:28 -0600)]
Merge PR #33229 into master

* refs/pull/33229/head:
rpm: define weak_deps for el8

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33230 from Rjerk/fix-multisite-doc-typo
Casey Bodley [Wed, 12 Feb 2020 13:48:31 +0000 (08:48 -0500)]
Merge pull request #33230 from Rjerk/fix-multisite-doc-typo

doc/radosgw/multisite-sync-policy.rst: fix typo

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agopython-common: add py.typed (PEP 561) 33236/head
Sebastian Wagner [Wed, 12 Feb 2020 10:34:40 +0000 (11:34 +0100)]
python-common: add py.typed (PEP 561)

Bugs found:

* Fixed documentation of how `mgr/Orchestrator.create_osds` is called
* mgr/Rook.create_osds: Added missing `.path` when querying paths.
* mgr/Rook.create_osds: Fixed progress message
* mgr/RookCluster.create_osds: Empty list instead of `None`
* python-common: use empty objects instead of `None`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #33233 from tchaikov/wip-crimson-misc
Kefu Chai [Wed, 12 Feb 2020 10:02:31 +0000 (18:02 +0800)]
Merge pull request #33233 from tchaikov/wip-crimson-misc

crimson: fix build with GCC-10

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #33221 from liewegas/fix-44065
Kefu Chai [Wed, 12 Feb 2020 08:48:21 +0000 (16:48 +0800)]
Merge pull request #33221 from liewegas/fix-44065

ceph.spec: Recommend (but do not require) podman

Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/common: correct type of callback func 33233/head
Kefu Chai [Wed, 12 Feb 2020 08:12:38 +0000 (16:12 +0800)]
crimson/common: correct type of callback func

`md_config_obs_t` is defined as
```
using md_config_obs_t = ceph::md_config_obs_impl<ConfigProxy>;
```
in `common/config_obs.h`. it takes advantage of a fact that
somebody exposes the correct version of `ConfigProxy` to the global
namespace. this is intended to fulfill the needs of other components
which expects `md_config_obs_t`. otherwise we need to specify
`ceph::md_config_obs_impl<ceph::ConfigProxy>` or
`ceph::md_config_obs_impl<crimson::common::ConfigProxy>` depending on
if we are programming crimson or not.

but in this case, we are actually defining
`crimson::common::ConfigProxy`, so it'd be better to define
`md_config_obs_t` explicitly instead relying on "somebody" which exposes
`ConfigProxy`. and `ConfigObserver` is defined using the current
`ConfigProxy`, so it's more correct and more readable than using
`md_config_obs_t` defined in `common/config_obs.h`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: disable concepts in boost::asio
Kefu Chai [Wed, 12 Feb 2020 08:05:14 +0000 (16:05 +0800)]
cmake: disable concepts in boost::asio

GCC-10 and Clang choke when compiling a concept constrained with
its template parameter, which is in turn another concept. as a
workaround of the bug of boost::asio, we should disable concepts
support in it. but it's nice to enable it when the compiler is
able to use concepts to do some compile time checkings even the
concepts are not compliant to C++20.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33174 from jan--f/c-v-functional-centos8
Jan Fajerski [Wed, 12 Feb 2020 07:51:47 +0000 (08:51 +0100)]
Merge pull request #33174 from jan--f/c-v-functional-centos8

ceph-volume: use centos8 for functional testing

5 years agodoc/radosgw/multisite-sync-policy.rst: fix typo 33230/head
Liu Lan [Wed, 12 Feb 2020 05:23:44 +0000 (13:23 +0800)]
doc/radosgw/multisite-sync-policy.rst: fix typo

Signed-off-by: Liu Lan <rjerk.whatever@gmail.com>
5 years agoMerge pull request #33224 from howard0su/clean
Kefu Chai [Wed, 12 Feb 2020 04:55:47 +0000 (12:55 +0800)]
Merge pull request #33224 from howard0su/clean

src: polish the wording

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agorpm: define weak_deps for el8 33229/head
Kefu Chai [Wed, 12 Feb 2020 04:24:50 +0000 (12:24 +0800)]
rpm: define weak_deps for el8

RHEL/CentOS 8 comes with rpm 4.14, see
https://centos.pkgs.org/8/centos-baseos-x86_64/rpm-4.14.2-25.el8.x86_64.rpm.html
and
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/packaging_and_distributing_software/new-features-in-rhel-8_packaging-and-distributing-software

and since "Recommends" was introduced by rpm 4.12, see
https://fedoraproject.org/wiki/Changes/RPM-4.12 .
so we are able to use "Recommends" in el8 as well.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33203 from howard0su/wip_fix_dpdk
Kefu Chai [Wed, 12 Feb 2020 02:28:48 +0000 (10:28 +0800)]
Merge pull request #33203 from howard0su/wip_fix_dpdk

msg/async/dpdk: Fix build when DPDK enabled

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoceph.spec: Recommend (but do not require) podman 33221/head
Sage Weil [Tue, 11 Feb 2020 20:07:25 +0000 (14:07 -0600)]
ceph.spec: Recommend (but do not require) podman

1- Strictly speaking, docker is okay too.
2- We don't want podman (or docker) installed inside the container image,
but we do need the cephadm package.

Fixes: https://tracker.ceph.com/issues/44065
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agosrc: polish the wording 33224/head
Jun Su [Wed, 12 Feb 2020 01:01:02 +0000 (09:01 +0800)]
src: polish the wording

Signed-off-by: Jun Su <howard0su@gmail.com>
5 years agoMerge PR #33211 into master
Sage Weil [Wed, 12 Feb 2020 00:17:06 +0000 (18:17 -0600)]
Merge PR #33211 into master

* refs/pull/33211/head:
qa/tasks/mgr/dashboard/test_orchestrator: support addr attribute in inventory

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agodebian/control: make cephadm recommend (but not require) docker
Sage Weil [Tue, 11 Feb 2020 21:54:57 +0000 (15:54 -0600)]
debian/control: make cephadm recommend (but not require) docker

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33191 into master
Sage Weil [Tue, 11 Feb 2020 23:25:21 +0000 (17:25 -0600)]
Merge PR #33191 into master

* refs/pull/33191/head:
cephadm: shell: allow -e

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: shell: allow -e 33191/head
Sage Weil [Mon, 10 Feb 2020 21:44:08 +0000 (15:44 -0600)]
cephadm: shell: allow -e

Set environment variables for shell commands.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33207 into master
Sage Weil [Tue, 11 Feb 2020 20:01:53 +0000 (14:01 -0600)]
Merge PR #33207 into master

* refs/pull/33207/head:
doc/index: remove quick start from front page for now
doc/bootstrap: warn that cephadm is not for production yet

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agodoc/index: remove quick start from front page for now 33207/head
Sage Weil [Tue, 11 Feb 2020 14:39:59 +0000 (08:39 -0600)]
doc/index: remove quick start from front page for now

1- wait until this works on a production version,
2- maybe a shorter procedure, or just the initial steps and then
link off to bootstrap.rst?

This effectively reverts 79040c2 (PR #32531)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/bootstrap: warn that cephadm is not for production yet
Sage Weil [Tue, 11 Feb 2020 14:41:10 +0000 (08:41 -0600)]
doc/bootstrap: warn that cephadm is not for production yet

We can remove this when octopus is released, and/or adjust the language.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33214 from yuriw/wip-yuriw-crontab-master
Yuri Weinstein [Tue, 11 Feb 2020 18:59:42 +0000 (10:59 -0800)]
Merge pull request #33214 from yuriw/wip-yuriw-crontab-master

qa/tests: reduced runs for nautilus, added runs for octopus

5 years agorgw: change cls rgw reshard status to enum class 30611/head
J. Eric Ivancich [Fri, 27 Sep 2019 00:57:39 +0000 (20:57 -0400)]
rgw: change cls rgw reshard status to enum class

Get the type safety and reduced impact on global namespace of enum
class.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoceph-volume: port lvm functional tests to centos 33174/head
Jan Fajerski [Fri, 7 Feb 2020 16:02:06 +0000 (17:02 +0100)]
ceph-volume: port lvm functional tests to centos

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoceph-volume: port batch functional tests to centos8
Jan Fajerski [Tue, 21 Jan 2020 15:19:18 +0000 (16:19 +0100)]
ceph-volume: port batch functional tests to centos8

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agomgr/cephadm: Bail if we cannot find a host for services 33205/head
Sebastian Wagner [Tue, 11 Feb 2020 12:22:49 +0000 (13:22 +0100)]
mgr/cephadm: Bail if we cannot find a host for services

This would require tricky manipulation of ports etc.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: fix placement of new daemons (mds,rgw,rbd-m)
Sebastian Wagner [Tue, 11 Feb 2020 11:59:47 +0000 (12:59 +0100)]
mgr/cephadm: fix placement of new daemons (mds,rgw,rbd-m)

* Don't modify spec.count, as this is irritating to me.
* Place daemons on unused hosts
* Reduced code duplication

Fixes: https://tracker.ceph.com/issues/44019
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/orchestrator: minor change to improve type checking
Sebastian Wagner [Tue, 11 Feb 2020 11:57:15 +0000 (12:57 +0100)]
mgr/orchestrator: minor change to improve type checking

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: test_cephadm: simplify matching strings
Sebastian Wagner [Tue, 11 Feb 2020 11:56:50 +0000 (12:56 +0100)]
mgr/cephadm: test_cephadm: simplify matching strings

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge PR #33139 into master
Sage Weil [Tue, 11 Feb 2020 16:43:09 +0000 (10:43 -0600)]
Merge PR #33139 into master

* refs/pull/33139/head:
mgr/cephadm: catch exception in _check_hosts()
mgr/cephadm: do not crash module on exception in serve thread

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33175 into master
Sage Weil [Tue, 11 Feb 2020 16:42:58 +0000 (10:42 -0600)]
Merge PR #33175 into master

* refs/pull/33175/head:
mgr/cephadm: Add some more type annotations
mgr/orchestrator: unify StatelessServiceSpec and StatefulServiceSpec

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33189 into master
Sage Weil [Tue, 11 Feb 2020 16:42:46 +0000 (10:42 -0600)]
Merge PR #33189 into master

* refs/pull/33189/head:
mgr/cephadm: fix redeploy (etc) of crash containers
cephadm: do not use special unit, naming for crash agent
cephadm: 'crash' is a ceph daemon

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoqa/tests: reduced runs for nautilus, added runs for octopus 33214/head
Yuri Weinstein [Tue, 11 Feb 2020 16:37:15 +0000 (08:37 -0800)]
qa/tests: reduced runs for nautilus, added runs for octopus

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #33176 from jmolmo/bz_43972
Sebastian Wagner [Tue, 11 Feb 2020 15:40:19 +0000 (16:40 +0100)]
Merge pull request #33176 from jmolmo/bz_43972

mgr/rook: Fix error creating OSD's

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoqa/tasks/mgr/dashboard/test_orchestrator: support addr attribute in inventory 33211/head
Kiefer Chang [Tue, 11 Feb 2020 15:05:21 +0000 (23:05 +0800)]
qa/tasks/mgr/dashboard/test_orchestrator: support addr attribute in inventory

The missing attribute `addr` causes error when loading dummy data.

Fixes: https://tracker.ceph.com/issues/44054
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoMerge PR #33027 into master
Sage Weil [Tue, 11 Feb 2020 14:28:43 +0000 (08:28 -0600)]
Merge PR #33027 into master

* refs/pull/33027/head:
os/bluestore/BlueFS: reclaim unused too-granular extents first
os/bluestore/BlueFS: track bluefs owned extents that are too granular
os/bluestore/BlueFS: verify that fnodes respect the bluefs alloc_size
os/bluestore/BlueFS: align bluefs' owned extents to alloc_size

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge PR #33188 into master
Sage Weil [Tue, 11 Feb 2020 14:28:27 +0000 (08:28 -0600)]
Merge PR #33188 into master

* refs/pull/33188/head:
qa/workunits/cephtool/test.sh: delete test_erasure pool

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #33187 from dillaman/wip-44066
Mykola Golub [Tue, 11 Feb 2020 14:27:35 +0000 (16:27 +0200)]
Merge pull request #33187 from dillaman/wip-44066

qa/workunits/rbd: override CEPH_ARGS when initializing the site name

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33002 from dillaman/wip-43613
Mykola Golub [Tue, 11 Feb 2020 14:26:34 +0000 (16:26 +0200)]
Merge pull request #33002 from dillaman/wip-43613

rbd-mirror: initial snapshot-based mirroring bootstrap logic

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33054 from cbodley/wip-rgw-pubsub-syncstop
Casey Bodley [Tue, 11 Feb 2020 13:13:05 +0000 (08:13 -0500)]
Merge pull request #33054 from cbodley/wip-rgw-pubsub-syncstop

rgw: use new Stopped state for special handling of 'bucket sync disable'

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agomsg/async/dpdk: Fix build when DPDK enabled 33203/head
Jun Su [Tue, 11 Feb 2020 11:28:23 +0000 (19:28 +0800)]
msg/async/dpdk: Fix build when DPDK enabled

Signed-off-by: Jun Su <howard0su@gmail.com>
5 years agoMerge pull request #33199 from tchaikov/wip-crimson-do-with
Kefu Chai [Tue, 11 Feb 2020 11:35:02 +0000 (19:35 +0800)]
Merge pull request #33199 from tchaikov/wip-crimson-do-with

crimson/common: more friendly to seastar::do_with()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/common: more friendly to seastar::do_with() 33199/head
Kefu Chai [Tue, 11 Feb 2020 09:57:42 +0000 (17:57 +0800)]
crimson/common: more friendly to seastar::do_with()

so we don't need to do the box-unbox dance when callng
seastar::do_with() with multiple with'ed variables and
a continuation which returns `errator<...>::future`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33172 from tchaikov/wip-43582
Kefu Chai [Tue, 11 Feb 2020 06:18:37 +0000 (14:18 +0800)]
Merge pull request #33172 from tchaikov/wip-43582

ceph-monstore-tool: correct the key for storing mgr_command_descs

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33177 from tchaikov/wip-clang-pybind
Kefu Chai [Tue, 11 Feb 2020 04:45:58 +0000 (12:45 +0800)]
Merge pull request #33177 from tchaikov/wip-clang-pybind

pybind: customize compiler before checking cflags

Reviewed-by: Mark Kogan <mkogan@redhat.com>
5 years agoMerge PR #33135 into master
Sage Weil [Tue, 11 Feb 2020 02:57:42 +0000 (20:57 -0600)]
Merge PR #33135 into master

* refs/pull/33135/head:
mon: fix tell command registration
ceph.in: fix -h/help behavior for tell commands
ceph.in: remove '{osd,mds,mon} tell' deprecation warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33190 into master
Sage Weil [Tue, 11 Feb 2020 01:53:37 +0000 (19:53 -0600)]
Merge PR #33190 into master

* refs/pull/33190/head:
cephadm: report image name for stopped daemons
cephadm: record the image name to unit.image

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #33186 from yuriw/wip-yuriw-crontab-master
Yuri Weinstein [Tue, 11 Feb 2020 00:16:13 +0000 (16:16 -0800)]
Merge pull request #33186 from yuriw/wip-yuriw-crontab-master

qa/tests: removed all runs for luminous - EOL

5 years agoMerge PR #33179 into master
Sage Weil [Mon, 10 Feb 2020 23:14:48 +0000 (17:14 -0600)]
Merge PR #33179 into master

* refs/pull/33179/head:
mgr/orchestrator: Use `pickle` to pass exceptions across sub-interpreters

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33184 into master
Sage Weil [Mon, 10 Feb 2020 23:14:02 +0000 (17:14 -0600)]
Merge PR #33184 into master

* refs/pull/33184/head:
qa/suites/rados/multimon/tasks/mon_clock_with_skews: whitelist MOST_DOWN
qa/suites/rados/multimon/tasks/mon_clock_with_skews: disable ntpd etc

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33043 into master
Sage Weil [Mon, 10 Feb 2020 20:49:35 +0000 (14:49 -0600)]
Merge PR #33043 into master

* refs/pull/33043/head:
doc/releases: octopus draft notes

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #32965 from Dmole/patch-3
Jason Dillaman [Mon, 10 Feb 2020 20:41:13 +0000 (15:41 -0500)]
Merge pull request #32965 from Dmole/patch-3

doc: quick-rbd.rst de-duplicate

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #33181 into master
Sage Weil [Mon, 10 Feb 2020 19:29:08 +0000 (13:29 -0600)]
Merge PR #33181 into master

* refs/pull/33181/head:
qa/workunits/cephadm/test_cephadm: fix typo

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agodoc/releases: octopus draft notes 33043/head
Sage Weil [Mon, 3 Feb 2020 15:31:36 +0000 (09:31 -0600)]
doc/releases: octopus draft notes

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: fix redeploy (etc) of crash containers 33189/head
Sage Weil [Mon, 10 Feb 2020 16:06:21 +0000 (10:06 -0600)]
mgr/cephadm: fix redeploy (etc) of crash containers

When deploying a crash container, the crash keyring is the crash keyring,
and there is not additional crash_keyring for the implicit crash
container.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: do not use special unit, naming for crash agent
Sage Weil [Mon, 10 Feb 2020 16:05:29 +0000 (10:05 -0600)]
cephadm: do not use special unit, naming for crash agent

Use the normal unit file, with crash.$hostname as the name.  This makes
the crash agent behave like all of the other services instead of being
special.  The exception is that the crash agent is still implicitly
deployed alongside other containers.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: 'crash' is a ceph daemon
Sage Weil [Mon, 10 Feb 2020 15:22:24 +0000 (09:22 -0600)]
cephadm: 'crash' is a ceph daemon

- we can run ceph -v inside
- we need to mount the crash dir

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33131 into master
Sage Weil [Mon, 10 Feb 2020 18:17:45 +0000 (12:17 -0600)]
Merge PR #33131 into master

* refs/pull/33131/head:
mgr/orch: 'ceph orchestrator ...' -> 'ceph orch ...'

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33162 into master
Sage Weil [Mon, 10 Feb 2020 18:17:17 +0000 (12:17 -0600)]
Merge PR #33162 into master

* refs/pull/33162/head:
cephadm: KillMode=none in unit file
cephadm: clean up unit string syntax a bit

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agocephadm: report image name for stopped daemons 33190/head
Sage Weil [Mon, 10 Feb 2020 18:02:28 +0000 (12:02 -0600)]
cephadm: report image name for stopped daemons

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: record the image name to unit.image
Sage Weil [Mon, 10 Feb 2020 17:57:16 +0000 (11:57 -0600)]
cephadm: record the image name to unit.image

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephtool/test.sh: delete test_erasure pool 33188/head
Sage Weil [Mon, 10 Feb 2020 17:20:07 +0000 (11:20 -0600)]
qa/workunits/cephtool/test.sh: delete test_erasure pool

Other parts of this script leave OSDs reweighted, which can make this test
fail to go fully clean.

 0   ssd 0.08789         osd.0          up  0.63213 1.00000
 1   ssd 0.08789         osd.1          up  0.63213 1.00000
 2   ssd 0.08789         osd.2          up  1.00000 1.00000

35.0 raw ([2,1,2147483647], p2) up ([2,1,2147483647], p2) acting ([2,1,2], p2)

Fix by just deleting this pool when we're done.

Fixes: https://tracker.ceph.com/issues/44067
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33185 from tchaikov/wip-44063
Kefu Chai [Mon, 10 Feb 2020 17:01:25 +0000 (01:01 +0800)]
Merge pull request #33185 from tchaikov/wip-44063

pybind/mgr: bump six to 1.14

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoqa/workunits/rbd: override CEPH_ARGS when initializing the site name 33187/head
Jason Dillaman [Mon, 10 Feb 2020 16:34:49 +0000 (11:34 -0500)]
qa/workunits/rbd: override CEPH_ARGS when initializing the site name

The mirroring site name is stored in the MON config which requires
higher privledges than the standard "client.mirror" user.

Fixes: https://tracker.ceph.com/issues/44066
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoqa/tests: removed all runs for luminous - EOL 33186/head
Yuri Weinstein [Mon, 10 Feb 2020 16:20:59 +0000 (08:20 -0800)]
qa/tests: removed all runs for luminous - EOL

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agodoc: quick-rbd.rst de-duplicate 32965/head
Tim [Wed, 29 Jan 2020 15:10:09 +0000 (10:10 -0500)]
doc: quick-rbd.rst de-duplicate

Remove code duplication from the dependency.

Signed-off-by: Tim <elatllat@gmail.com>
5 years agopybind/mgr: bump six to 1.14 33185/head
Kefu Chai [Mon, 10 Feb 2020 15:30:34 +0000 (23:30 +0800)]
pybind/mgr: bump six to 1.14

otherwise some packages which uses six.ensure_text will fail, as it
was introduced by 1.12. and 1.14 is the latest stable version of
six. so let's use it instead.

Fixes: https://tracker.ceph.com/issues/44063
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest/pybind: fix expectations for mirror snapshots 33002/head
Jason Dillaman [Mon, 10 Feb 2020 15:16:59 +0000 (10:16 -0500)]
test/pybind: fix expectations for mirror snapshots

When snapshot-based mirroring is enabled, the primary image
should always have at least one mirror-based snapshot to help
distinguish it from an incomplete non-primary image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #33137 into master
Sage Weil [Mon, 10 Feb 2020 14:54:51 +0000 (08:54 -0600)]
Merge PR #33137 into master

* refs/pull/33137/head:
mon/PGMap: fix digest summary of PGs by state
mon/PGMap: fix compat encoding of num_pg_by_state

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomon: fix tell command registration 33135/head
Sage Weil [Sat, 8 Feb 2020 15:25:01 +0000 (09:25 -0600)]
mon: fix tell command registration

Pass full cmddesc, not just prefix.

Broken by 3394b70ba18cffa49317141ff444ba9990d6170b

Fixes: https://tracker.ceph.com/issues/44050
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph.in: fix -h/help behavior for tell commands
Sage Weil [Sat, 8 Feb 2020 14:49:50 +0000 (08:49 -0600)]
ceph.in: fix -h/help behavior for tell commands

- add "Tell $type commands" heading
- 'ceph tell mon.a -h' now works
- 'ceph tell mon.a prefix -h' also works

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