]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agodoc/releases/octopus: final notes
Sage Weil [Mon, 23 Mar 2020 13:20:57 +0000 (08:20 -0500)]
doc/releases/octopus: final notes

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #34042 into octopus 34105/head
Sage Weil [Sun, 22 Mar 2020 23:32:11 +0000 (18:32 -0500)]
Merge PR #34042 into octopus

* refs/pull/34042/head:
mgr/rook: list rgw services
mgr/rook: tolerate timestamps that are None
mgr/orch: add 'subcluster' property to RGWSpec
mgr/rook: do not create radosgw pools
mgr/rook: refactor apply/add for rgw
mgr/cephadm: configure rgw_frontends for rgw service
mgr/orch: accept port and ssl flags to 'apply rgw'
python-common/ceph/deployment/service_spec: add ssl to RGWSpec
mgr/rook: fix 'orch ps' for osds

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
5 years agoMerge PR #33959 into octopus
Sage Weil [Sun, 22 Mar 2020 15:56:31 +0000 (10:56 -0500)]
Merge PR #33959 into octopus

* refs/pull/33959/head:
qa: fix all the fsx.sh-invoking yaml files to install dependencies

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #34067 into octopus
Sage Weil [Sun, 22 Mar 2020 15:55:54 +0000 (10:55 -0500)]
Merge PR #34067 into octopus

* refs/pull/34067/head:
mgr/DaemonServer: add explicit check that acting matches for merge

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agomgr/DaemonServer: add explicit check that acting matches for merge 34067/head
Sage Weil [Thu, 19 Mar 2020 21:52:01 +0000 (16:52 -0500)]
mgr/DaemonServer: add explicit check that acting matches for merge

Add an explicit check that the PG acting for the source and target
match before merging.

Fixes: https://tracker.ceph.com/issues/44684
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #34040 from dillaman/wip-44396-partial-fix
Mykola Golub [Sat, 21 Mar 2020 08:22:45 +0000 (10:22 +0200)]
Merge pull request #34040 from dillaman/wip-44396-partial-fix

rbd-mirror: snapshot-based mirroring should use image sync throttler

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge PR #34098 into octopus
Sage Weil [Sat, 21 Mar 2020 02:15:23 +0000 (21:15 -0500)]
Merge PR #34098 into octopus

* refs/pull/34098/head:
cephadm: relabel /etc/ganesha mount

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/rook: list rgw services 34042/head
Sage Weil [Fri, 20 Mar 2020 21:11:24 +0000 (17:11 -0400)]
mgr/rook: list rgw services

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: tolerate timestamps that are None
Sage Weil [Fri, 20 Mar 2020 21:03:57 +0000 (17:03 -0400)]
mgr/rook: tolerate timestamps that are None

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: add 'subcluster' property to RGWSpec
Sage Weil [Thu, 19 Mar 2020 20:13:07 +0000 (16:13 -0400)]
mgr/orch: add 'subcluster' property to RGWSpec

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: do not create radosgw pools
Sage Weil [Fri, 20 Mar 2020 18:56:47 +0000 (14:56 -0400)]
mgr/rook: do not create radosgw pools

First, we don't know how big they should be or what they should look like.
The caller should already know that, and/or radosgw can create the pools
itself.

This depends on https://github.com/rook/rook/pull/5058

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: refactor apply/add for rgw
Sage Weil [Wed, 18 Mar 2020 21:20:12 +0000 (17:20 -0400)]
mgr/rook: refactor apply/add for rgw

A few caveats here:

- enforce that realm == zone, since that is all rook does at the moment.
- we force a (bad!) pool configuration, since rook requires that these
be present (instead of allowing radosgw or the caller to create the pools)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #34082 into octopus
Sage Weil [Fri, 20 Mar 2020 20:35:17 +0000 (15:35 -0500)]
Merge PR #34082 into octopus

* refs/pull/34082/head:
cephadm: switch grafana image to the ceph repo

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #34068 into octopus
Sage Weil [Fri, 20 Mar 2020 20:31:32 +0000 (15:31 -0500)]
Merge PR #34068 into octopus

* refs/pull/34068/head:
mgr/cephadm: clean up client.crash.* container_image settings after upgrade

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agocephadm: relabel /etc/ganesha mount 34098/head
Sage Weil [Fri, 20 Mar 2020 20:30:11 +0000 (15:30 -0500)]
cephadm: relabel /etc/ganesha mount

Fixes: https://tracker.ceph.com/issues/44701
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #34046 into octopus
Sage Weil [Fri, 20 Mar 2020 19:50:42 +0000 (14:50 -0500)]
Merge PR #34046 into octopus

* refs/pull/34046/head:
qa/suites/rados/cephadm/upgrade: update starting version
mgr/orch: 'ceph upgrade ...' -> 'ceph orch upgrade ...'

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #34092 into octopus
Sage Weil [Fri, 20 Mar 2020 18:14:25 +0000 (13:14 -0500)]
Merge PR #34092 into octopus

* refs/pull/34092/head:
doc/releases/octopus.rst: add note about ec recovery below min_size

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33719 from ukernel/wip-44416
Gregory Farnum [Fri, 20 Mar 2020 17:25:15 +0000 (10:25 -0700)]
Merge pull request #33719 from ukernel/wip-44416

mds: pass proper MutationImpl::LockOp to Locker::wrlock_start()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agorbd-mirror: leader watcher should not cancel get locker if locker is invalid 34040/head
Jason Dillaman [Fri, 20 Mar 2020 16:59:14 +0000 (12:59 -0400)]
rbd-mirror: leader watcher should not cancel get locker if locker is invalid

When a new leader acquires the lock, it will send out a lock acquired
notification along with periodic heartbeats. The get locker will attempt to
run immediately, but if a heartbeat arrives before it executes the heartbeat
will cancel the timer and reschedule it for the future. This process repeats
for each periodic heartbeat and the locker is never re-read from the OSD.

This is an issue only for namespace replayers due to the delayed fashion in
which the leader instance id is retrieved.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: snapshot sync request needs to check for interruption
Jason Dillaman [Fri, 20 Mar 2020 14:54:43 +0000 (10:54 -0400)]
rbd-mirror: snapshot sync request needs to check for interruption

If the sync request was locally canceled, we need to resume the paused
shut down logic instead of just notifying the image replayer state
machine of the change -- since it had already requested a shut down and
will not re-request it.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: request exclusive lock when moving to trash
Jason Dillaman [Thu, 19 Mar 2020 14:57:03 +0000 (10:57 -0400)]
librbd: request exclusive lock when moving to trash

Even if the image is in-use, moving it to the trash does not
remove any data. This also solves a race between snapshot-based
mirroring shutting down and being able to move a mirrored image
to the trash.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: basic integration with sync throttling
Jason Dillaman [Wed, 18 Mar 2020 19:01:32 +0000 (15:01 -0400)]
rbd-mirror: basic integration with sync throttling

snapshot-based mirroring did not have any throttling to prevent
too many concurrent syncs from running. Since each sync might need
to iterate over every object of an image, that could potentially
put an extreme burden on the remote cluster.

A future PR will add a more intelligent throttle based on the actual
number of objects needed to be scanned.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: don't prematurely finish snapshot replay loop
Jason Dillaman [Wed, 18 Mar 2020 18:47:50 +0000 (14:47 -0400)]
rbd-mirror: don't prematurely finish snapshot replay loop

The unlink step was being incorrectly skipped if a state machine
shut down was requested.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: pass InstanceWatcher to snapshot Replayer
Jason Dillaman [Fri, 13 Mar 2020 19:52:56 +0000 (15:52 -0400)]
rbd-mirror: pass InstanceWatcher to snapshot Replayer

The replayer will request image syncs via the instance watcher in the next
commit.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agodoc/releases/octopus.rst: add note about ec recovery below min_size 34092/head
Neha [Fri, 20 Mar 2020 17:13:56 +0000 (17:13 +0000)]
doc/releases/octopus.rst: add note about ec recovery below min_size

Signed-off-by: Neha Ojha <nojha@redhat.com>
5 years agomgr/cephadm: configure rgw_frontends for rgw service
Sage Weil [Wed, 18 Mar 2020 21:18:46 +0000 (17:18 -0400)]
mgr/cephadm: configure rgw_frontends for rgw service

This assumes the beast frontend.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: switch grafana image to the ceph repo 34082/head
Paul Cuzner [Fri, 20 Mar 2020 02:22:31 +0000 (15:22 +1300)]
cephadm: switch grafana image to the ceph repo

Pull the pre-built grafana image from the ceph org on
docker.io

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
5 years agoMerge PR #34034 into octopus
Sage Weil [Fri, 20 Mar 2020 13:12:50 +0000 (08:12 -0500)]
Merge PR #34034 into octopus

* refs/pull/34034/head:
cephadm: make add-repo --release and --version independent

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoqa/suites/rados/cephadm/upgrade: update starting version 34046/head
Sage Weil [Thu, 19 Mar 2020 13:29:25 +0000 (08:29 -0500)]
qa/suites/rados/cephadm/upgrade: update starting version

Need upgrade command to match!

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33540 into octopus
Sage Weil [Thu, 19 Mar 2020 19:56:27 +0000 (14:56 -0500)]
Merge PR #33540 into octopus

* refs/pull/33540/head:
doc/orchestrator: update rgw creation

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #34023 into octopus
Sage Weil [Thu, 19 Mar 2020 19:33:35 +0000 (14:33 -0500)]
Merge PR #34023 into octopus

* refs/pull/34023/head:
mgr/test_orchestrator: fix service filtering when using dummy data
mgr/dashboard: fix adding/removing host errors

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge PR #34044 into octopus
Sage Weil [Thu, 19 Mar 2020 18:47:29 +0000 (13:47 -0500)]
Merge PR #34044 into octopus

* refs/pull/34044/head:
remove ceph_test_rados_watch_notify

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge PR #34030 into octopus
Sage Weil [Thu, 19 Mar 2020 17:21:52 +0000 (12:21 -0500)]
Merge PR #34030 into octopus

* refs/pull/34030/head:
cephadm: env over last used
cephadm: fall back to default for infer_image
cephadm: remove outdated check
cephadm: consolidate default image logic
cephadm: only infer image for shell, run, inspect-image, pull, ceph-volume

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
5 years agodoc/orchestrator: update rgw creation 33540/head
Yehuda Sadeh [Tue, 25 Feb 2020 00:35:52 +0000 (16:35 -0800)]
doc/orchestrator: update rgw creation

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
5 years agomgr/cephadm: clean up client.crash.* container_image settings after upgrade 34068/head
Sage Weil [Thu, 19 Mar 2020 14:29:20 +0000 (09:29 -0500)]
mgr/cephadm: clean up client.crash.* container_image settings after upgrade

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #34027 into octopus 34060/head
Sage Weil [Thu, 19 Mar 2020 13:22:40 +0000 (08:22 -0500)]
Merge PR #34027 into octopus

* refs/pull/34027/head:
qa/workunits/cephadm/test_cephadm: mark services unmanaged for test
mgr/cephadm: do not reconfig unmanaged services
qa/workunits/cephadm/test_cephadm: output file for pub key

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agocephadm: make add-repo --release and --version independent 34034/head
Sage Weil [Wed, 18 Mar 2020 16:40:33 +0000 (11:40 -0500)]
cephadm: make add-repo --release and --version independent

Specify either --release name (to get the latest) or --version x.y.z to
get a specific version.

Adapt to updated locations on download.ceph.com so that we don't need to
know the release name for a specific x.y.z release.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #34045 into octopus
Sage Weil [Thu, 19 Mar 2020 13:07:05 +0000 (08:07 -0500)]
Merge PR #34045 into octopus

* refs/pull/34045/head:
mgr/progress: fix duration strings

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agocephadm: env over last used 34030/head
Sage Weil [Thu, 19 Mar 2020 12:54:34 +0000 (07:54 -0500)]
cephadm: env over last used

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #34035 from dillaman/wip-rbd-permissions
Mykola Golub [Thu, 19 Mar 2020 08:43:57 +0000 (10:43 +0200)]
Merge pull request #34035 from dillaman/wip-rbd-permissions

qa/workunits/rbd: use context managers to control Rados lifespan

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agomgr/orch: accept port and ssl flags to 'apply rgw'
Sage Weil [Mon, 16 Mar 2020 20:40:59 +0000 (16:40 -0400)]
mgr/orch: accept port and ssl flags to 'apply rgw'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: 'ceph upgrade ...' -> 'ceph orch upgrade ...'
Sage Weil [Thu, 19 Mar 2020 01:56:44 +0000 (20:56 -0500)]
mgr/orch: 'ceph upgrade ...' -> 'ceph orch upgrade ...'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: fall back to default for infer_image
Sage Weil [Wed, 18 Mar 2020 22:41:36 +0000 (17:41 -0500)]
cephadm: fall back to default for infer_image

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: remove outdated check
Sage Weil [Wed, 18 Mar 2020 20:09:41 +0000 (15:09 -0500)]
cephadm: remove outdated check

Either the user passed their own image or we filled in the (monitoring)
default--no need for this check.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: consolidate default image logic
Sage Weil [Wed, 18 Mar 2020 20:04:01 +0000 (15:04 -0500)]
cephadm: consolidate default image logic

Merge the _parse_args() logic into @default_image.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/progress: fix duration strings 34045/head
Sage Weil [Thu, 19 Mar 2020 00:04:14 +0000 (19:04 -0500)]
mgr/progress: fix duration strings

- simplify the code to just calculate the durations when we need them
(I'm not sure why we had those temporary strings!)
- use a nicer time delta format

Fixes: https://tracker.ceph.com/issues/44672
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoremove ceph_test_rados_watch_notify 34044/head
Sage Weil [Wed, 18 Mar 2020 21:29:55 +0000 (16:29 -0500)]
remove ceph_test_rados_watch_notify

This is an old test, we have good watch/notify coverage in the newer
tests, and it is buggy.

Fixes: https://tracker.ceph.com/issues/43861
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #34014 into octopus
Sage Weil [Wed, 18 Mar 2020 22:42:48 +0000 (17:42 -0500)]
Merge PR #34014 into octopus

* refs/pull/34014/head:
mgr/balancer: tolerate pgs outside of target weight map

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agoMerge PR #34001 into octopus
Sage Weil [Wed, 18 Mar 2020 22:42:10 +0000 (17:42 -0500)]
Merge PR #34001 into octopus

* refs/pull/34001/head:
mgr/cephadm: pytest: Enable SpecStore
mgr/orchestrator: add test for default implementation for apply()
python-common: validate ServiceSpec.service_type
fixup mgr/cephadm: Fix ceph orch apply -i
mgr/dashbaord: orchestrator service: Revert wait_api_result to a single completion
mgr/orchestrator: `orch daemon add` accepts a yaml
mgr/cephadm: apply_drivegroups() returns a single Completion
mgr/cephadm: remove `trivial_result()`
mgr/cephadm: Fix `ceph orch apply -i`

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agopython-common/ceph/deployment/service_spec: add ssl to RGWSpec
Sage Weil [Mon, 16 Mar 2020 17:54:27 +0000 (13:54 -0400)]
python-common/ceph/deployment/service_spec: add ssl to RGWSpec

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: only infer image for shell, run, inspect-image, pull, ceph-volume
Sage Weil [Wed, 18 Mar 2020 15:52:14 +0000 (10:52 -0500)]
cephadm: only infer image for shell, run, inspect-image, pull, ceph-volume

Use a decorators for infer, require, and default.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #34011 into octopus
Sage Weil [Wed, 18 Mar 2020 17:12:54 +0000 (12:12 -0500)]
Merge PR #34011 into octopus

* refs/pull/34011/head:
qa/suites/rados/verify/validater/valgrind: tolerate SLOW_OPS
qa/suites/rados/verify/validater/valgrind: less bluestore logging
qa/suites/rados/verify/validater: increase heartbeat grace
Revert "qa/suites/rados/verify: debug_ms = 1, osd_heartbeat_grace = 60"
Revert "qa/suites/rados/verify/validator/valgrind: debug refs = 5"
ceph_test_watch_notify: try notify 10x if ALLOW_TIMEOUTS is set
ceph_test_rados_api_misc: ShutdownRace timeout if ALLOW_TIMEOUTS is set
qa/suites/rados/verify: set ALLOW_TIMEOUTS for workunits

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoqa/workunits/rbd: use context managers to control Rados lifespan 34035/head
Jason Dillaman [Wed, 18 Mar 2020 16:54:16 +0000 (12:54 -0400)]
qa/workunits/rbd: use context managers to control Rados lifespan

There is a potential race between the expected exceptions being
thrown and Python shutting down racing with librados background
threads. Ensure that librados is properly shut down prior to
exiting Python.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #34032 from dillaman/wip-rbd-octopus-docs
Mykola Golub [Wed, 18 Mar 2020 16:45:43 +0000 (18:45 +0200)]
Merge pull request #34032 from dillaman/wip-rbd-octopus-docs

doc/releases/octopus: add additional RBD improvements

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agodoc/releases/octopus: add additional RBD improvements 34032/head
Jason Dillaman [Wed, 18 Mar 2020 16:16:28 +0000 (12:16 -0400)]
doc/releases/octopus: add additional RBD improvements

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoqa/workunits/cephadm/test_cephadm: mark services unmanaged for test 34027/head
Sage Weil [Wed, 18 Mar 2020 15:12:59 +0000 (10:12 -0500)]
qa/workunits/cephadm/test_cephadm: mark services unmanaged for test

We are deploying containers manually.  Mark them unmanaged so that we
do not fight against mgr/cephadm cleaning up orphan daemons.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: do not reconfig unmanaged services
Sage Weil [Wed, 18 Mar 2020 15:09:00 +0000 (10:09 -0500)]
mgr/cephadm: do not reconfig unmanaged services

Fixes: https://tracker.ceph.com/issues/44615
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33981 into octopus
Sage Weil [Wed, 18 Mar 2020 14:45:16 +0000 (09:45 -0500)]
Merge PR #33981 into octopus

* refs/pull/33981/head:
doc/install: edits
doc/cephadm: more edits
doc/cephadm/install: edits
doc/cephadm/adoption: improvements
doc/cephadm/install: a few edits
doc/cephadm/install: do not install ceph-common on host (by default)
doc/cephadm: drop os recs link
doc/cephadm/upgrade: improvements
doc/cephadm/upgrade: document upgrade
doc/cephadm/install: revamp install docs
doc: reorganize cephadm docs
doc/cephadm/administration: update docs on customizing SSH config
doc/cephadm/administration: add a note about the 'removed' dir

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #34018 from ajarr/octopus-subvolume-clone-cancel
Ramana Raja [Wed, 18 Mar 2020 13:52:06 +0000 (19:22 +0530)]
Merge pull request #34018 from ajarr/octopus-subvolume-clone-cancel

mgr/volumes: add FS subvolume clone cancel

Reviewed-by: Ramana Raja <rraja@redhat.com>
5 years agoqa/workunits/cephadm/test_cephadm: output file for pub key
Sage Weil [Wed, 18 Mar 2020 13:44:10 +0000 (08:44 -0500)]
qa/workunits/cephadm/test_cephadm: output file for pub key

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33866 into octopus
Sage Weil [Wed, 18 Mar 2020 13:14:19 +0000 (08:14 -0500)]
Merge PR #33866 into octopus

* refs/pull/33866/head:
mgr/cephadm: limit number of times check host is performed in the serve loop

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #34005 into octopus
Sage Weil [Wed, 18 Mar 2020 13:14:06 +0000 (08:14 -0500)]
Merge PR #34005 into octopus

* refs/pull/34005/head:
python-common: reduce output of ServiceSpec.to_json()
python-common,mgr/cephadm: move assert_valid_host to service_spec
mgr/cephadm: add HostAssignment.validate()

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #34013 into octopus
Sage Weil [Wed, 18 Mar 2020 13:13:56 +0000 (08:13 -0500)]
Merge PR #34013 into octopus

* refs/pull/34013/head:
qa/workunits/cephadm/test_cephadm: --skip-monitoring-stack

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: pytest: Enable SpecStore 34001/head
Sebastian Wagner [Wed, 18 Mar 2020 12:18:53 +0000 (13:18 +0100)]
mgr/cephadm: pytest: Enable SpecStore

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/orchestrator: add test for default implementation for apply()
Sebastian Wagner [Wed, 18 Mar 2020 12:02:12 +0000 (13:02 +0100)]
mgr/orchestrator: add test for default implementation for apply()

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agopython-common: validate ServiceSpec.service_type
Sebastian Wagner [Wed, 18 Mar 2020 10:25:50 +0000 (11:25 +0100)]
python-common: validate ServiceSpec.service_type

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agofixup mgr/cephadm: Fix ceph orch apply -i
Sebastian Wagner [Wed, 18 Mar 2020 10:25:11 +0000 (11:25 +0100)]
fixup mgr/cephadm: Fix ceph orch apply -i

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/test_orchestrator: fix service filtering when using dummy data 34023/head
Kiefer Chang [Wed, 18 Mar 2020 12:03:59 +0000 (20:03 +0800)]
mgr/test_orchestrator: fix service filtering when using dummy data

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agomgr/dashboard: fix adding/removing host errors
Kiefer Chang [Wed, 18 Mar 2020 07:21:35 +0000 (15:21 +0800)]
mgr/dashboard: fix adding/removing host errors

Send a HostSpec instance to the Orchestrator when adding a host.

Also, to be consistent with other components:
- Reword from Add/Remove hosts to Create/Delete hosts
- Display a modal when there is no Orchestrator backend enabled

Fixes: https://tracker.ceph.com/issues/44664
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agomgr/dashbaord: orchestrator service: Revert wait_api_result to a single completion
Sebastian Wagner [Wed, 18 Mar 2020 09:52:38 +0000 (10:52 +0100)]
mgr/dashbaord: orchestrator service: Revert wait_api_result to a single completion

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/orchestrator: `orch daemon add` accepts a yaml
Sebastian Wagner [Tue, 17 Mar 2020 11:11:36 +0000 (12:11 +0100)]
mgr/orchestrator: `orch daemon add` accepts a yaml

Fixes: https://tracker.ceph.com/issues/44622
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: apply_drivegroups() returns a single Completion
Sebastian Wagner [Tue, 17 Mar 2020 10:52:54 +0000 (11:52 +0100)]
mgr/cephadm: apply_drivegroups() returns a single Completion

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: remove `trivial_result()`
Sebastian Wagner [Tue, 17 Mar 2020 10:44:02 +0000 (11:44 +0100)]
mgr/cephadm: remove `trivial_result()`

Replaced with `@trivial_completion`, otherwise
`self._apply()` would have needed to accept a list
of specs.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: Fix `ceph orch apply -i`
Sebastian Wagner [Tue, 17 Mar 2020 10:33:20 +0000 (11:33 +0100)]
mgr/cephadm: Fix `ceph orch apply -i`

* We had two implementations for `ceph orcha apply`
* Remove yaml pasing in `mgr/cephadm`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #33994 from dillaman/wip-librbd-poll-event-race
Mykola Golub [Wed, 18 Mar 2020 08:08:25 +0000 (10:08 +0200)]
Merge pull request #33994 from dillaman/wip-librbd-poll-event-race

librbd: defer event socket completion until after callback issued

Reviewed-by: Dehao Shang <dehao.shang@intel.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agodoc: document `clone cancel` command 34018/head
Venky Shankar [Tue, 25 Feb 2020 07:29:54 +0000 (02:29 -0500)]
doc: document `clone cancel` command

Fixes: http://tracker.ceph.com/issues/44208
Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agotest: add `clone cancel` tests
Venky Shankar [Tue, 4 Feb 2020 10:02:56 +0000 (05:02 -0500)]
test: add `clone cancel` tests

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agomgr/volumes: introduce "clone cancel" volume command
Venky Shankar [Tue, 14 Jan 2020 09:20:50 +0000 (04:20 -0500)]
mgr/volumes: introduce "clone cancel" volume command

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agomgr/volumes: allow canceling a single asynchronous job for a volume
Venky Shankar [Tue, 14 Jan 2020 09:19:42 +0000 (04:19 -0500)]
mgr/volumes: allow canceling a single asynchronous job for a volume

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agomgr/volumes: helper for looking up a clone entry index
Venky Shankar [Tue, 14 Jan 2020 09:10:22 +0000 (04:10 -0500)]
mgr/volumes: helper for looking up a clone entry index

... this would be used when canceling a clone operation to
find the clone index for a given clone.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agomgr/volumes: periodically check if clone operations should be canceled
Venky Shankar [Wed, 8 Jan 2020 06:07:03 +0000 (01:07 -0500)]
mgr/volumes: periodically check if clone operations should be canceled

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agomgr/volumes: periodically check if copy operations should be canceled
Venky Shankar [Wed, 8 Jan 2020 06:00:20 +0000 (01:00 -0500)]
mgr/volumes: periodically check if copy operations should be canceled

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agomgr/volumes: introduce 'canceled' state in clone op state machine
Venky Shankar [Tue, 14 Jan 2020 09:13:16 +0000 (04:13 -0500)]
mgr/volumes: introduce 'canceled' state in clone op state machine

When fetching the next execution state, -EINTR jumps to 'canceled'
state signifying a canceled (interrupted) operation. Also include
a helper routine to check if a given state machine is in initial
state.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agoqa/suites/rados/verify/validater/valgrind: tolerate SLOW_OPS 34011/head
Sage Weil [Tue, 17 Mar 2020 23:10:37 +0000 (18:10 -0500)]
qa/suites/rados/verify/validater/valgrind: tolerate SLOW_OPS

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/verify/validater/valgrind: less bluestore logging
Sage Weil [Tue, 17 Mar 2020 21:36:46 +0000 (16:36 -0500)]
qa/suites/rados/verify/validater/valgrind: less bluestore logging

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/verify/validater: increase heartbeat grace
Sage Weil [Tue, 17 Mar 2020 21:35:21 +0000 (16:35 -0500)]
qa/suites/rados/verify/validater: increase heartbeat grace

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoRevert "qa/suites/rados/verify: debug_ms = 1, osd_heartbeat_grace = 60"
Sage Weil [Tue, 17 Mar 2020 21:34:49 +0000 (16:34 -0500)]
Revert "qa/suites/rados/verify: debug_ms = 1, osd_heartbeat_grace = 60"

This reverts commit 4f742f200df6c91db87bfee1109c37fad3c0548b.

This was in the wrong file.. see valgrind.yaml

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoRevert "qa/suites/rados/verify/validator/valgrind: debug refs = 5"
Sage Weil [Tue, 17 Mar 2020 21:34:08 +0000 (16:34 -0500)]
Revert "qa/suites/rados/verify/validator/valgrind: debug refs = 5"

This reverts commit 65e81e6eb4f136bf21b67e5de10ab49f028f9e95.

This slows things down too much with valgrind.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph_test_watch_notify: try notify 10x if ALLOW_TIMEOUTS is set
Sage Weil [Tue, 17 Mar 2020 16:51:56 +0000 (11:51 -0500)]
ceph_test_watch_notify: try notify 10x if ALLOW_TIMEOUTS is set

See https://tracker.ceph.com/issues/44062

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph_test_rados_api_misc: ShutdownRace timeout if ALLOW_TIMEOUTS is set
Sage Weil [Tue, 17 Mar 2020 16:52:32 +0000 (11:52 -0500)]
ceph_test_rados_api_misc: ShutdownRace timeout if ALLOW_TIMEOUTS is set

See https://tracker.ceph.com/issues/44582

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/verify: set ALLOW_TIMEOUTS for workunits
Sage Weil [Tue, 17 Mar 2020 16:45:17 +0000 (11:45 -0500)]
qa/suites/rados/verify: set ALLOW_TIMEOUTS for workunits

When running under valgrind (and thrashing) things can be slow.  Tell
tests in case they need to tolerate timeouts.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/install: edits 33981/head
Sage Weil [Tue, 17 Mar 2020 13:58:57 +0000 (08:58 -0500)]
doc/install: edits

Based on review by Alexandra Settle <asettle@suse.com>

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm: more edits
Sage Weil [Tue, 17 Mar 2020 13:54:47 +0000 (08:54 -0500)]
doc/cephadm: more edits

Based on review by Alexandra Settle <asettle@suse.com>

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm/install: edits
Sage Weil [Tue, 17 Mar 2020 13:45:10 +0000 (08:45 -0500)]
doc/cephadm/install: edits

Based on review from Alexandra Settle <asettle@suse.com>

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm/adoption: improvements
Sage Weil [Tue, 17 Mar 2020 13:23:26 +0000 (08:23 -0500)]
doc/cephadm/adoption: improvements

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm/install: a few edits
Sage Weil [Mon, 16 Mar 2020 16:37:04 +0000 (11:37 -0500)]
doc/cephadm/install: a few edits

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm/install: do not install ceph-common on host (by default)
Sage Weil [Mon, 16 Mar 2020 13:12:36 +0000 (08:12 -0500)]
doc/cephadm/install: do not install ceph-common on host (by default)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm: drop os recs link
Sage Weil [Mon, 16 Mar 2020 02:27:57 +0000 (21:27 -0500)]
doc/cephadm: drop os recs link

This mostly doesn't quite apply to cephadm because we use containers.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm/upgrade: improvements
Sage Weil [Mon, 16 Mar 2020 02:25:07 +0000 (21:25 -0500)]
doc/cephadm/upgrade: improvements

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm/upgrade: document upgrade
Sage Weil [Sun, 15 Mar 2020 21:38:42 +0000 (16:38 -0500)]
doc/cephadm/upgrade: document upgrade

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