Commit Graph

107970 Commits

Author SHA1 Message Date
Sage Weil
151f88d7f9 Merge PR #32677 into master
* refs/pull/32677/head:
	build/ops: make/install osd_support package
	mgr/osd_support: move docs to docs/mgr/osd_support.rst
	mgr/osd_support: new module for osd utility calls

Reviewed-by: Neha Ojha <nojha@redhat.com>
2020-02-19 14:50:40 -06:00
Sage Weil
5db4bddfaf Merge PR #33123 into master
* refs/pull/33123/head:
	qa/tasks/cephadm: deploy node-exporter
	mgr/orch: deploy node-exporter

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-02-19 14:50:20 -06:00
Sage Weil
d66cc42d7e Merge PR #33359 into master
* refs/pull/33359/head:
	mgr/dashboard/tests/test_orchestrator: disable service test
	mgr/cephadm: fix race between check_hosts and host rm
	mgr/volumes: fix remove_mds call
	mgr/rook: hackly describe_service -> list_daemons
	mgr/tests/test_orchestrator: fix ServiceDescription test
	mgr/test_orchestrator: describe_service -> list_daemons
	mgr/orch: resurrect ServiceDescription, 'orch ls'
	qa/tasks/mgr/dashboard/test_orchestrator: disable services test

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-02-19 12:58:51 -06:00
Sage Weil
1e2400fe3b mgr/dashboard/tests/test_orchestrator: disable service test
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 11:32:23 -06:00
Sage Weil
b28bb4a730 mgr/cephadm: fix race between check_hosts and host rm
Fixes: https://tracker.ceph.com/issues/44188
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 11:32:18 -06:00
Sage Weil
12c54dc299 mgr/volumes: fix remove_mds call
Fixes: https://tracker.ceph.com/issues/44176
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 11:02:04 -06:00
Sage Weil
3ad1e143f0 mgr/rook: hackly describe_service -> list_daemons
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 11:02:04 -06:00
Sage Weil
e0df409cd3 mgr/tests/test_orchestrator: fix ServiceDescription test
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 11:02:04 -06:00
Sage Weil
7c9efa6bdf mgr/test_orchestrator: describe_service -> list_daemons
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 11:01:13 -06:00
Sage Weil
6708387357 mgr/orch: resurrect ServiceDescription, 'orch ls'
This is a meta-service description that maps to multiple daemons.  Remove
the old useless properties, and add in size and running counts.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 11:01:13 -06:00
Sage Weil
93d53c05b0 qa/tasks/mgr/dashboard/test_orchestrator: disable services test
We need to either fill out the list_daemons APIs in the dashboard and test
that, or redesign and reimplement the services abstractions in the
orchestration layer.  Until then, disable this test.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 11:01:13 -06:00
Sebastian Wagner
6f76cde053
Merge pull request #33333 from sebastian-philipp/cephadm-mon-apply-host-no-network
mgr/cephadm: mon: Don't show traceback for user errors

Reviewed-by: Sage Weil <sage@redhat.com>
2020-02-19 16:49:17 +01:00
Sebastian Wagner
320972d6ec
Merge pull request #33310 from sebastian-philipp/cephadm-add-host-exception
mgr/cephadm: Convert HostNotFound to OrchestratorError

Reviewed-by: Sage Weil <sage@redhat.com>
2020-02-19 16:48:47 +01:00
Sage Weil
a7bdbe59fa Merge PR #33387 into master
* refs/pull/33387/head:
	spec: ceph-mgr: add missing python3-pyyaml

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2020-02-19 08:54:29 -06:00
Sage Weil
e8520eba52 qa/tasks/cephadm: deploy node-exporter
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 15:24:52 +01:00
Patrick Seidensal
97d73304ae mgr/orch: deploy node-exporter
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-02-19 14:51:10 +01:00
Laura Paduano
1e7c6420c6
Merge pull request #32895 from tspmelo/wip-sidebar-notification-v2
mgr/dashboard: Improve Notification sidebar

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
2020-02-19 13:58:28 +01:00
Sebastian Wagner
6f1a7c3459
Merge pull request #33410 from capri1989/docs-fix
doc/mgr/orchestrator.rst: updated current implementation status

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-02-19 13:39:43 +01:00
Sage Weil
651a4ee8e4 Merge PR #33249 into master
* refs/pull/33249/head:
	mgr/cephadm: move cutoff calc inside helper
	mgr/orch: clean up service_action, remove_service
	mgr/cephadm: move into DaemonCache class
	mgr/cephadm: fix tests
	mgr/cephadm: implete hacky 'refresh=True' path
	mgr/cephadm: raise health alert when scrape fails
	mgr/cephadm: persist cached daemon state
	mgr/orch: serialize DaemonDescription last_refresh
	mgr/cephadm: move _get_daemons() impl into list_daemons
	mgr/cephadm: replace remaining _get_daemons() with daemon cache
	mgr/cephadm: use daemon map for service|daemon removal
	mgr/cephadm: avoid _get_daemons for service|daemon actions
	mgr/cephadm: replace daemon_cache with an explicit set of dicts
	mgr/cephadm: move DaemonDescription construction into helper

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-02-19 06:33:59 -06:00
Kefu Chai
6045152e8d
Merge pull request #33408 from tchaikov/wip-crimson-editor-prop
crimson: add editor properties header

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2020-02-19 19:35:42 +08:00
Kai Wagner
1d003f61b6 doc/mgr/orchestrator.rst updated current implementation status
Signed-off-by: Kai Wagner <kwagner@suse.com>
2020-02-19 12:07:50 +01:00
Lenz Grimmer
b24230a74b
Merge pull request #33060 from votdev/issue_39252_rgw_beast
mgr/dashboard: RGW port autodetection does not support "Beast" RGW frontend

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2020-02-19 09:51:10 +00:00
Joshua Schmid
acc05bf06d
build/ops: make/install osd_support package
Signed-off-by: Joshua Schmid <jschmid@suse.de>
2020-02-19 10:33:26 +01:00
Joshua Schmid
c9b9e57967 mgr/osd_support: move docs to docs/mgr/osd_support.rst
Signed-off-by: Joshua Schmid <jschmid@suse.de>
2020-02-19 08:58:19 +01:00
Joshua Schmid
b5c5ef185d mgr/osd_support: new module for osd utility calls
it lets you start/stop and monitor osd draining processes

Signed-off-by: Joshua Schmid <jschmid@suse.de>
2020-02-19 08:58:19 +01:00
Sage Weil
138f40754a Merge PR #33395 into master
* refs/pull/33395/head:
	cephadm: error out on filestore OSDs

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-02-18 22:10:50 -06:00
Kefu Chai
73b03097f2
Merge pull request #33396 from liewegas/fix-cephadm-upgrade-test
qa/suites/rados/cephadm/upgrade: fix initial version

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-02-19 11:08:16 +08:00
Sage Weil
99c0813a6c Merge PR #32949 into master
* refs/pull/32949/head:
	cephadm: separate out require files in config-json
	cephadm: add alertmanager deployment feature

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
2020-02-18 20:56:54 -06:00
Sebastian Wagner
932fd0bb61 spec: ceph-mgr: add missing python3-pyyaml
Remove stray req from the -k8events package, since the base ceph-mgr now
requires it.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-02-18 20:03:57 -06:00
Sage Weil
34b78df480 Merge PR #33370 into master
* refs/pull/33370/head:
	mgr/orchestrator_cli: sort host list

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
2020-02-18 19:44:01 -06:00
Sage Weil
c605c90700 mgr/cephadm: move cutoff calc inside helper
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:50:01 -06:00
Sage Weil
16011f5cbf mgr/orch: clean up service_action, remove_service
Standardize on service_name argument that looks like 'mgr', 'mds.fsname',
'mds', or some other daemon name prefix.  Avoid the ambiguously-named
service_type+service_name combinations.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:50:01 -06:00
Sage Weil
390fd4098f mgr/cephadm: move into DaemonCache class
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:50:01 -06:00
Sage Weil
a0c7decb03 mgr/cephadm: fix tests
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:50:01 -06:00
Sage Weil
031516fa72 mgr/cephadm: implete hacky 'refresh=True' path
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:50:00 -06:00
Sage Weil
a383992345 mgr/cephadm: raise health alert when scrape fails
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:50:00 -06:00
Sage Weil
e7037db99f mgr/cephadm: persist cached daemon state
- load cached state on startup
- persist state after a scrape only
- scrape everything after startup

Note that we modify our in-memory cache when we add or remove a service
and then immediately trigger a scrape, but we do not invalidate the
persisted state, since it's simpler (and presumably a good idea) to
simply re-scrape everything after a mgr restart.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:50:00 -06:00
Sage Weil
66775ece9a mgr/orch: serialize DaemonDescription last_refresh
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:50:00 -06:00
Sage Weil
47b3a64ed4 mgr/cephadm: move _get_daemons() impl into list_daemons
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:50:00 -06:00
Sage Weil
a991745418 mgr/cephadm: replace remaining _get_daemons() with daemon cache
New function _get_daemons_by_type() returns immediately with a result
from the cache.

Remove the with_daemons decorator.

Push daemon list fetch into _add_new_daemon.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:49:56 -06:00
Sage Weil
782a71e32c mgr/cephadm: use daemon map for service|daemon removal
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:43:02 -06:00
Sage Weil
12d6b267bc mgr/cephadm: avoid _get_daemons for service|daemon actions
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:43:02 -06:00
Sage Weil
328a1fd05b mgr/cephadm: replace daemon_cache with an explicit set of dicts
- Cache DaemonDescription explicitly
- explicit timestamp for the host
- serve() scrapes inventory based on that timestamp

For the moment, persistence is broken, and --refresh is broken.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:43:02 -06:00
Sage Weil
f6be018668 mgr/cephadm: move DaemonDescription construction into helper
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 15:43:02 -06:00
Patrick Donnelly
1f0373ddc4
Merge PR #33390 into master
* refs/pull/33390/head:
	mds: remove dead get_commands code

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2020-02-18 12:04:52 -08:00
Sage Weil
958f11a7a7 Merge PR #33336 into master
* refs/pull/33336/head:
	osd: fix racy accesses to OSD::osdmap.

Reviewed-by: Sage Weil <sage@redhat.com>
2020-02-18 13:54:28 -06:00
Sage Weil
6fa842df98 qa/suites/ardos/cephadm/upgrade: fix initial version
Switch initial version to one with the renamed orchestrator module.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 13:27:26 -06:00
Sage Weil
8eb8dca192 cephadm: error out on filestore OSDs
We do not currently support filestore OSDs.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-18 12:50:49 -06:00
Volker Theile
d532d68878 mgr/dashboard: RGW port autodetection does not support "Beast" RGW frontend
* Improve regular expressions to support more configuration variations.
* Modify error message. It includes the config line to be parsed. This should help to debug errors much easier.
* If there are multiple (ssl_)ports/(ssl_)endpoints options, then the first found option will be returned.

Fixes: https://tracker.ceph.com/issues/39252

Signed-off-by: Volker Theile <vtheile@suse.com>
2020-02-18 17:06:02 +01:00
Patrick Donnelly
4712542df0
mds: remove dead get_commands code
Left over from #31255, d8c0bde04b.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2020-02-18 07:49:45 -08:00