]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 #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 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 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 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 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/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>
5 years agodoc/cephadm/install: revamp install docs
Sage Weil [Sun, 15 Mar 2020 16:10:50 +0000 (11:10 -0500)]
doc/cephadm/install: revamp install docs

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc: reorganize cephadm docs
Sage Weil [Sun, 15 Mar 2020 13:45:46 +0000 (08:45 -0500)]
doc: reorganize cephadm docs

- reorganized cephadm into a top-level item with a series of sub-items.
- condensed the 'install' page so that it doesn't create a zillion items
in the toctree on the left
- started updating the cephadm/install sequence (incomplete)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm/administration: update docs on customizing SSH config
Sage Weil [Sat, 14 Mar 2020 14:33:01 +0000 (09:33 -0500)]
doc/cephadm/administration: update docs on customizing SSH config

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm/administration: add a note about the 'removed' dir
Sage Weil [Sat, 14 Mar 2020 14:16:38 +0000 (09:16 -0500)]
doc/cephadm/administration: add a note about the 'removed' dir

(and other paths)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/balancer: tolerate pgs outside of target weight map 34014/head
Sage Weil [Tue, 17 Mar 2020 20:03:32 +0000 (15:03 -0500)]
mgr/balancer: tolerate pgs outside of target weight map

We build a target weight map based on the primary crush weights, and
ignore weights that are 0.  However, it's possible that existing PGs are
on other OSDs that have weight 0 because the weight-set weight is >0.
That leads to a KeyError exception when we

                     pgs_by_osd[osd] += 1

and the key isn't present.  Fix by simply populating those keys as we
encounter OSDs.  Drop the old initialization loop.  The net of this is
we may have OSDs outside of target_by_root (won't matter, as far as I can
tell) and we won't have keys for osds with weight 0 (also won't matter,
as far as I can tell).

Fixes: https://tracker.ceph.com/issues/42721
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephadm/test_cephadm: --skip-monitoring-stack 34013/head
Sage Weil [Tue, 17 Mar 2020 19:53:58 +0000 (14:53 -0500)]
qa/workunits/cephadm/test_cephadm: --skip-monitoring-stack

We're deploying these things manually later, and they use fixed ports.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33974 into octopus
Sage Weil [Tue, 17 Mar 2020 19:52:28 +0000 (14:52 -0500)]
Merge PR #33974 into octopus

* refs/pull/33974/head:
use quay octopus tip until 15.2 tag is available
update default container images

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33442 into octopus
Sage Weil [Tue, 17 Mar 2020 17:05:46 +0000 (12:05 -0500)]
Merge PR #33442 into octopus

* refs/pull/33442/head:
cephadm: add allow_ptrace option to enable SYS_PTRACE

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33997 into octopus
Sage Weil [Tue, 17 Mar 2020 17:05:12 +0000 (12:05 -0500)]
Merge PR #33997 into octopus

* refs/pull/33997/head:
mon/MgrMonitor: make 'mgr fail' work with no arguments

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #34000 into octopus
Sage Weil [Tue, 17 Mar 2020 17:05:00 +0000 (12:05 -0500)]
Merge PR #34000 into octopus

* refs/pull/34000/head:
mgr/dashboard: adapt create_osds interface change

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agouse quay octopus tip until 15.2 tag is available 33974/head
Sage Weil [Tue, 17 Mar 2020 15:05:17 +0000 (10:05 -0500)]
use quay octopus tip until 15.2 tag is available

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agopython-common: reduce output of ServiceSpec.to_json() 34005/head
Sebastian Wagner [Tue, 17 Mar 2020 14:23:14 +0000 (15:23 +0100)]
python-common: reduce output of ServiceSpec.to_json()

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agopython-common,mgr/cephadm: move assert_valid_host to service_spec
Sebastian Wagner [Tue, 17 Mar 2020 14:08:50 +0000 (15:08 +0100)]
python-common,mgr/cephadm: move assert_valid_host to service_spec

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: add HostAssignment.validate()
Sebastian Wagner [Tue, 17 Mar 2020 14:00:12 +0000 (15:00 +0100)]
mgr/cephadm: add HostAssignment.validate()

Fixes: https://tracker.ceph.com/issues/44607
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/dashboard: adapt create_osds interface change 34000/head
Kiefer Chang [Tue, 17 Mar 2020 08:07:45 +0000 (16:07 +0800)]
mgr/dashboard: adapt create_osds interface change

Support the parameter change of create_osds since
https://github.com/ceph/ceph/pull/33922.

Fixes: https://tracker.ceph.com/issues/44632
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agomon/MgrMonitor: make 'mgr fail' work with no arguments 33997/head
Sage Weil [Tue, 17 Mar 2020 02:05:21 +0000 (21:05 -0500)]
mon/MgrMonitor: make 'mgr fail' work with no arguments

Fail the active mgr so you don't have to check ceph -s and cut&paste it or
do some jq shenanigans with 'mgr dump'.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: add allow_ptrace option to enable SYS_PTRACE 33442/head
Sage Weil [Mon, 16 Mar 2020 16:06:08 +0000 (11:06 -0500)]
cephadm: add allow_ptrace option to enable SYS_PTRACE

In any environments it is helpful to have SYS_PTRACE so that you can
gdb attach or strace a daemon.

Leave this off by default so that the container is more secure.

Enable this in teuthology and vstart.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoupdate default container images
Sage Weil [Sat, 14 Mar 2020 21:35:07 +0000 (16:35 -0500)]
update default container images

- For tests, use bleeding-edge octopus branch
- For production defaults, use ceph/ceph:v15.2 tag
- For bootstrap, grab cephadm script from latest octopus branch

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: limit number of times check host is performed in the serve loop 33866/head
Daniel-Pivonka [Thu, 5 Mar 2020 18:42:25 +0000 (13:42 -0500)]
mgr/cephadm: limit number of times check host is performed in the serve loop

we only need this to happen every 10 min on hosts

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
5 years agoMerge PR #33961 into octopus
Sage Weil [Mon, 16 Mar 2020 22:37:13 +0000 (17:37 -0500)]
Merge PR #33961 into octopus

* refs/pull/33961/head:
cephadm: add-repo: add --version
cephadm: rename distro args in repo methods

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33952 into octopus
Sage Weil [Mon, 16 Mar 2020 22:36:43 +0000 (17:36 -0500)]
Merge PR #33952 into octopus

* refs/pull/33952/head:
qa/workunits/cephadm: --skip-mon-network when using 127.0.0.1
cephadm: add tests
qa/tasks/cephadm: pass -v to bootstrap
mgr/cephadm: only try to place mons on hosts matching public_network
mgr/cephadm: keep track of host networks, ips
cephadm: automatically infer mon public_network, if we can
cephadm: add list-networks command

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33990 into octopus
Sage Weil [Mon, 16 Mar 2020 22:36:33 +0000 (17:36 -0500)]
Merge PR #33990 into octopus

* refs/pull/33990/head:
mgr/orch: add --all-available-devices to 'orch apply osd'

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33955 into octopus
Sage Weil [Mon, 16 Mar 2020 22:36:17 +0000 (17:36 -0500)]
Merge PR #33955 into octopus

* refs/pull/33955/head:
mgr/cephadm: respect 'unmanaged' flag in spec
mgr/orch: orch ls: show <no spec> or <unmanaged> as appropriate
mgr/orch: orch ls: rename SPEC -> PLACEMENT
mgr/orch: add 'unmanaged' property to ServiceSpec
mgr/orch: combine 'orch daemon add <type> ...' into one command
mgr/orch: combine 'orch apply <type> [<placement>]' into one command

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33936 into octopus
Sage Weil [Mon, 16 Mar 2020 20:17:48 +0000 (15:17 -0500)]
Merge PR #33936 into octopus

* refs/pull/33936/head:
cephadm: bootstrap: deploy monitoring stack by default

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
5 years agomgr/orch: add --all-available-devices to 'orch apply osd' 33990/head
Sage Weil [Mon, 16 Mar 2020 14:13:11 +0000 (09:13 -0500)]
mgr/orch: add --all-available-devices to 'orch apply osd'

Provide a super-simple "use any avaialable device" command for
'orch apply osd'.  This will work for many (maybe even most?) users.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephadm: --skip-mon-network when using 127.0.0.1 33952/head
Sage Weil [Mon, 16 Mar 2020 19:38:15 +0000 (14:38 -0500)]
qa/workunits/cephadm: --skip-mon-network when using 127.0.0.1

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: add tests
Sage Weil [Mon, 16 Mar 2020 19:37:54 +0000 (14:37 -0500)]
cephadm: add tests

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/tasks/cephadm: pass -v to bootstrap
Sage Weil [Sat, 14 Mar 2020 13:30:43 +0000 (08:30 -0500)]
qa/tasks/cephadm: pass -v to bootstrap

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: only try to place mons on hosts matching public_network
Sage Weil [Fri, 13 Mar 2020 14:11:31 +0000 (09:11 -0500)]
mgr/cephadm: only try to place mons on hosts matching public_network

Only try to schedule new mons on hosts that match the configured
public_network, if any.  If we do not have one configured, then don't
try to place new mons at all.

Note that there are other restrictions that ceph-mon supports that we
aren't considering, here: public_network_interface in particular, which
might further limit which IPs we consider binding to.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: keep track of host networks, ips
Sage Weil [Fri, 13 Mar 2020 14:09:54 +0000 (09:09 -0500)]
mgr/cephadm: keep track of host networks, ips

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: automatically infer mon public_network, if we can
Sage Weil [Fri, 13 Mar 2020 12:31:13 +0000 (07:31 -0500)]
cephadm: automatically infer mon public_network, if we can

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: add list-networks command
Sage Weil [Fri, 13 Mar 2020 12:38:46 +0000 (07:38 -0500)]
cephadm: add list-networks command

Summarize CIDR networks and our IPs in them.  Result looks like this:

{
    "10.3.64.0/24": [
        "10.3.64.23",
        "10.3.64.27"
    ],
    "10.88.0.0/16": [
        "10.88.0.1"
    ],
    "192.168.122.0/24": [
        "192.168.122.1"
    ]
}

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: bootstrap: deploy monitoring stack by default 33936/head
Sage Weil [Thu, 12 Mar 2020 23:33:53 +0000 (18:33 -0500)]
cephadm: bootstrap: deploy monitoring stack by default

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33979 into octopus 33995/head
Sage Weil [Mon, 16 Mar 2020 17:34:16 +0000 (12:34 -0500)]
Merge PR #33979 into octopus

* refs/pull/33979/head:
cephadm: implement 'install' command

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agolibrbd: defer event socket completion until after callback issued 33994/head
Jason Dillaman [Mon, 16 Mar 2020 17:17:17 +0000 (13:17 -0400)]
librbd: defer event socket completion until after callback issued

A change post-Nautilus fixed an issue where multiple threads could
concurrently invoke callbacks to librbd clients. However, it also
introduced the potential that a callback hasn't yet fired by the
time the event socket is completed. This resulted in a crash of
fio under high-throughput testing since it expected both a callback
and the event socket completion, in that order.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #33988 from dillaman/wip-44391
Mykola Golub [Mon, 16 Mar 2020 17:18:35 +0000 (19:18 +0200)]
Merge pull request #33988 from dillaman/wip-44391

rbd-mirror: hold lock while updating local image name

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agocephadm: add-repo: add --version 33961/head
Sage Weil [Fri, 13 Mar 2020 22:49:25 +0000 (17:49 -0500)]
cephadm: add-repo: add --version

Instead of --release octopus, which would get the latest octopus
version (whatever it might be), or possibly a repo with many build versions
inside, you can instead do --version 15.2.1 to get a repo with a
specific version and that version only.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: respect 'unmanaged' flag in spec 33955/head
Sage Weil [Fri, 13 Mar 2020 18:58:01 +0000 (13:58 -0500)]
mgr/cephadm: respect 'unmanaged' flag in spec

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: orch ls: show <no spec> or <unmanaged> as appropriate
Sage Weil [Fri, 13 Mar 2020 18:52:50 +0000 (13:52 -0500)]
mgr/orch: orch ls: show <no spec> or <unmanaged> as appropriate

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: orch ls: rename SPEC -> PLACEMENT
Sage Weil [Fri, 13 Mar 2020 15:14:04 +0000 (10:14 -0500)]
mgr/orch: orch ls: rename SPEC -> PLACEMENT

More accurate, I think.  We only ever show placement here.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: add 'unmanaged' property to ServiceSpec
Sage Weil [Fri, 13 Mar 2020 18:49:51 +0000 (13:49 -0500)]
mgr/orch: add 'unmanaged' property to ServiceSpec

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: implement 'install' command 33979/head
Sage Weil [Sun, 15 Mar 2020 13:51:51 +0000 (08:51 -0500)]
cephadm: implement 'install' command

This was present, but a no-op.

By default, install cephadm.

Optionally take a list of packages to install instead (e.g., ceph-common).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agorbd-mirror: hold lock while updating local image name 33988/head
Jason Dillaman [Mon, 16 Mar 2020 13:13:56 +0000 (09:13 -0400)]
rbd-mirror: hold lock while updating local image name

There is a potential for an independently scheduled status update to
request the local image name from the bootstrap state machine during its
initialization.

Fixes: https://tracker.ceph.com/issues/44391
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #33987 from tchaikov/wip-octopus-formatting
Kefu Chai [Mon, 16 Mar 2020 13:04:41 +0000 (21:04 +0800)]
Merge pull request #33987 from tchaikov/wip-octopus-formatting

doc/releases/octopus.rst: formatting tweaks

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33980 into octopus
Sage Weil [Mon, 16 Mar 2020 12:44:59 +0000 (07:44 -0500)]
Merge PR #33980 into octopus

* refs/pull/33980/head:
cephadm: bootstrap: allow --output-dir
cephadm: do not infer image for bootstrap
cephadm: write output files to /etc/ceph by default
cephadm: verify the output files' containing directory exists

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agodoc/releases/octopus.rst: use note directive for notes 33987/head
Kefu Chai [Mon, 16 Mar 2020 09:44:04 +0000 (17:44 +0800)]
doc/releases/octopus.rst: use note directive for notes

so the note stands out in the text

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodoc/releases/octopus.rst: add '$' as prompt
Kefu Chai [Mon, 16 Mar 2020 09:32:56 +0000 (17:32 +0800)]
doc/releases/octopus.rst: add '$' as prompt

to help the BashSession lexer to render the text starting with "#" as comments

see https://pygments.org/docs/lexers/#lexers-for-various-shells

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodoc/releases/octopus: decrease the indent level
Kefu Chai [Mon, 16 Mar 2020 09:30:10 +0000 (17:30 +0800)]
doc/releases/octopus: decrease the indent level

for less and better horizontal spacing

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodoc/_static/css: fine tune the spacing
Kefu Chai [Mon, 16 Mar 2020 09:26:06 +0000 (17:26 +0800)]
doc/_static/css: fine tune the spacing

* `ul.simple > li` is also used in front page, where the items are too
  sparse now. so we need to restore the default spacing.
* `ul.simple > li > ul > li:last-child` is used to control the spacing
  between nested unordered list. we need have more spacing there.
* `div.section > ul > li > p` is added to decrease the spacing of nested
  list items.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33971 from tchaikov/octopus-doc-release
Kefu Chai [Mon, 16 Mar 2020 03:11:15 +0000 (11:11 +0800)]
Merge pull request #33971 from tchaikov/octopus-doc-release

doc/releases/octopus.rst: format tweaks

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33968 into octopus
Sage Weil [Mon, 16 Mar 2020 02:26:20 +0000 (21:26 -0500)]
Merge PR #33968 into octopus

* refs/pull/33968/head:
mgr/cephadm: do not include 'osd' service in 'orch ls' output

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33970 into octopus
Sage Weil [Mon, 16 Mar 2020 02:01:50 +0000 (21:01 -0500)]
Merge PR #33970 into octopus

* refs/pull/33970/head:
python-common: 'all:true' -> '*'

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33973 into octopus
Sage Weil [Mon, 16 Mar 2020 02:01:07 +0000 (21:01 -0500)]
Merge PR #33973 into octopus

* refs/pull/33973/head:
mgr/orch,cephadm: elevate --force flag for daemons to interface
cephadm: backup data when we remove stateful daemons (mon, osd, prometheus)
cephadm: do not zap disk after removing an OSD daemon

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33935 into octopus
Sage Weil [Sun, 15 Mar 2020 19:38:30 +0000 (14:38 -0500)]
Merge PR #33935 into octopus

* refs/pull/33935/head:
mgr/cephadm: fix host connection exception
doc/cephadm: use ssh-copy-id

Reviewed-by: Joshua Schmid <jschmid@suse.de>