Commit Graph

107699 Commits

Author SHA1 Message Date
Sage Weil
29c5cce968 qa/suites/rados/cephadm: deploy prometheus.a
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 13:59:36 -06:00
Sage Weil
0c7e828919 mgr/cephadm: implement prometheus add/update
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 13:59:36 -06:00
Sage Weil
e6d007e081 mgr/cephadm: teach _create_daemon how to provision prometheus
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 13:59:36 -06:00
Sage Weil
9c20e3961f mgr/orch: add prom hooks
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 13:59:36 -06:00
Sage Weil
8456ab721e doc/mgr/orchestrator_modules: update docs
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
7304516a05 mgr/orch: break out apply_$type() in orchestrator.py interface
Also clean up the method descriptions.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
0d689250d1 qa/tasks/cephadm: adapt to new cli
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
adec19e676 mgr/orch: add --force arg to 'daemon rm'
This is needed when removing mons.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
b9f9284774 mgr/orch: fix host set-addr prefix
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
e073d1ae8a mgr/orch: service action cleanup
- no 'service' prefix
- single name arg (type[.id...])

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
852251cea7 mgr/orch: prevent rm mon|mgr
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
96b0235d53 mgr/orch: service rm -> rm
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
dc5ba5c5b4 mgr/cephadm: add mon
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
62b0e42360 mgr/orch: add mon hook
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
86fda8c03d mgr/cephadm: add mgr
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
b3816342a4 mgr/orch: add 'daemon add mgr'
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
aac2d571f7 mgr/orch: orch * add -> orch daemon add *
Adjust help string too

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:38 -06:00
Sage Weil
88e78936cc mgr/volumes: use apply_mds
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:43:33 -06:00
Sage Weil
67d72bca89 mgr/orch: move to service_apply; remove update_foo()
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 09:00:58 -06:00
Sage Weil
b6f42a0661 mgr/rook: move to remove_service()
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 07:13:03 -06:00
Sage Weil
07a74f5705 mgr/orch: remove old remove_{osds,rgw,mds,nfs,...} methods
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 07:13:03 -06:00
Sage Weil
284cf17e67 mgr/orch: test remove_daemons and remove_service
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-13 07:13:02 -06:00
Nathan Cutler
e36d47a8c3
Merge pull request #33173 from smithfarm/wip-bri-basic-auth
backport-resolve-issue: use Basic Authentication instead of "access_token"

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
2020-02-13 14:00:58 +01:00
Nathan Cutler
fef7efeb8b
Merge pull request #33105 from smithfarm/wip-44014
backport-resolve-issue: populate tracker_description method

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
2020-02-13 14:00:00 +01:00
Kefu Chai
12e738f5a1
Merge pull request #32693 from CongMinYin/update-pmdk-version
cmake: Update pmdk version to 1.7

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-02-13 19:24:05 +08:00
Yin Congmin
6a102677e7 cmake: Update pmdk version to 1.7
nvml is renamed to pmdk and upgrading to 1.7 to fix gcc9 build issue

Signed-off-by: Yin, Congmin <congmin.yin@intel.com>
2020-02-14 01:50:07 +08:00
Sebastian Wagner
74125c74dd
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>
2020-02-13 11:32:46 +01:00
Sebastian Wagner
bd7f025ec2
Merge pull request #33212 from liewegas/wip-orch-newcli
mgr/orch: first phase of new cli

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-02-13 11:31:37 +01:00
Kefu Chai
8bb9c63861
Merge pull request #33250 from tchaikov/wip-seastar
crimson: pickup change to fix --cpuset support and cleanups

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2020-02-13 18:08:52 +08:00
Kefu Chai
12da789dc9
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>
2020-02-13 15:35:19 +08:00
Jan Fajerski
fec03c5639
Merge pull request #33246 from jan--f/c-v-batch-fix-has_common_vg
ceph-volume: use get_device_vgs in has_common_vg
2020-02-13 08:00:47 +01:00
Jan Fajerski
5b5002d8c4
Merge pull request #33223 from dsavineau/issue_44069
ceph-volume: fix is_ceph_device for lvm batch
2020-02-13 08:00:30 +01:00
Kefu Chai
36963dd7cc 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>
2020-02-13 14:53:55 +08:00
Kefu Chai
5f05a50bae 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>
2020-02-13 14:53:55 +08:00
Kefu Chai
71c0c491da seastar: pickup change to fix --cpuset support
Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-02-13 14:53:55 +08:00
Sage Weil
81bad666e0 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>
2020-02-12 19:09:05 -06:00
Sage Weil
92b49094e7 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 26f9fe54cb 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>
2020-02-12 13:59:23 -06:00
Sage Weil
1f5e59d294 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>
2020-02-12 13:59:23 -06:00
J. Eric Ivancich
210fb41806
Merge pull request #32562 from IlsooByun/fix_dm
rgw: do not remove delete marker when fixing versioned bucket
2020-02-12 14:47:44 -05:00
J. Eric Ivancich
59b3ccca7a
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>
2020-02-12 14:46:23 -05:00
Sage Weil
b94673a03b mgr/orch: add 'orch service rm'
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-12 11:14:17 -06:00
Sage Weil
e5c264fc2d mgr/orch,cephadm: orch daemon rm ...
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-12 11:14:17 -06:00
Sage Weil
aacc9a650f 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>
2020-02-12 11:14:17 -06:00
Sage Weil
4f4e043b3d vstart.sh: ceph orchestrator -> ceph orch
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-12 11:14:17 -06:00
Sage Weil
95ecaad0d5 mgr/orch: split out daemon_action from service_action
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-12 11:14:17 -06:00
Sage Weil
8817a232b7 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>
2020-02-12 11:13:41 -06:00
zdover23
2b6819f0c9
Merge pull request #32587 from zdover23/wip-doc-nautilus-osd-fix-10Jan2020
doc: emphasize the importance of require-osd-release nautilus
2020-02-13 02:59:28 +10:00
Jan Fajerski
60d80636e4 ceph-volume: add is_ceph_device unit tests
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2020-02-12 16:52:04 +01:00
Dimitri Savineau
a82582364c 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>
2020-02-12 10:44:00 -05:00
Sebastian Wagner
19122bba3d
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>
2020-02-12 16:32:34 +01:00