Commit Graph

105795 Commits

Author SHA1 Message Date
Sage Weil
65e54703a1 Merge PR #32260 into master
* refs/pull/32260/head:
	.organizationmap: Wido 42on -> 42on

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-15 13:08:35 -06:00
Paul Cuzner
462525582d cephadm: fix how uid/gid is determined
The uid/gid is determined by looking at file ownership. It
was looking at /etc/ceph, but on current builds this is owned by root so switched to using /var/lib/ceph which
is the homedir of the ceph account.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
2019-12-15 13:00:27 -06:00
Paul Cuzner
0c50249ae5 cephadm: add sample configuration for prometheus
Provides an example definition that sets up an
initial prometheus server with a scrape of itself.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
2019-12-15 13:00:27 -06:00
Paul Cuzner
bcf520a07e cephadm: support deployment of prometheus
Initial support to enable cephadm to deploy
monitoring containers like prometheus. This
patch adds support for prometheus. It is the callers
responsibility to provide a valid prometheus.yml
file passed within the --config-json parameter.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
2019-12-15 13:00:27 -06:00
Sage Weil
3023581812 .organizationmap: Wido 42on -> 42on
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-15 10:21:07 -06:00
Kefu Chai
1f8e3bd5e7 cmake: check version of librdkafka
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-15 22:16:08 +08:00
Sage Weil
cd780f109c Merge PR #32158 into master
* refs/pull/32158/head:
	cephadm: fix exception when no time sync is running
	cephadm: properly extract osd fsid during adoption
	cephadm: do ceph-volume activate+deactivate as part of systemd unit
	ceph-daemon: behave with no /etc/ceph/ceph.conf

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-14 19:43:08 -06:00
Sage Weil
3cbca1dce8 cephadm: fix exception when no time sync is running
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-14 18:12:49 -06:00
Sage Weil
3e4222cec0 cephadm: properly extract osd fsid during adoption
This needs to be passed to the deploy_daemon_units method so that we can
set up the pre and post c-v calls properly.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-14 18:12:49 -06:00
Sage Weil
b800c9a921 cephadm: do ceph-volume activate+deactivate as part of systemd unit
1- Do the activate as part of the unit on start, since it may include
setup that disappears on a reboot, like starting up the dmcrypted volume.

2- Do the matching deactivate step when the container stops, like shutting
down the dmcrypt volume.

Right now the OSD is the only thing that needs this special behavior.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-14 09:22:12 -06:00
Sage Weil
bf0e51a5b7 ceph-daemon: behave with no /etc/ceph/ceph.conf
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-14 09:22:12 -06:00
Sage Weil
2d915c8d0e Merge PR #32244 into master
* refs/pull/32244/head:
	qa/workunits/cephadm/test_cephadm.sh: re-enable `adopt` tests

Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-13 22:03:45 -06:00
Sage Weil
e69bbada0b mds/MDSDaemon: fix asok 'exit' and 'respawn' commands
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 20:16:52 -06:00
Sage Weil
a35e66c8db Merge PR #32253 into master
* refs/pull/32253/head:
	mgr/orchestrator: make hosts and label args consistent

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-13 20:13:55 -06:00
Sage Weil
a577292103 Merge PR #32209 into master
* refs/pull/32209/head:
	mgr/cephadm: Add unittest for service_action

Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-13 20:12:53 -06:00
Sage Weil
901ce4914d mgr/orchestrator: make hosts and label args consistent
- hosts is always n=N; labels is not
- hosts always before labels

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 16:50:26 -06:00
Sage Weil
257a539b25 Merge PR #32192 into master
* refs/pull/32192/head:
	common: handle return value from read(2)

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-13 14:41:14 -06:00
Sage Weil
d8162e1f53 Merge PR #32195 into master
* refs/pull/32195/head:
	osd/PeeringState.cc: skip peer_purged when discovering all missing

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
2019-12-13 14:40:13 -06:00
Sage Weil
124f1e3926 Merge PR #32203 into master
* refs/pull/32203/head:
	Revert "mgr/DaemonServer: safe-to-destroy - do not consider irrelevant pgs"

Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-13 14:39:40 -06:00
Sage Weil
1430c0ff54 Merge PR #32219 into master
* refs/pull/32219/head:
	common: move xattr -> os/filestore/os_xattr

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-13 14:39:20 -06:00
Sage Weil
dc7d0c2122 Merge PR #32250 into master
* refs/pull/32250/head:
	mgr/cephadm: fix temp file prefixes
	qa: fix lingering ceph-mgr-ssh -> ceph-mgr-cephadm refs

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-13 13:50:42 -06:00
Patrick Donnelly
cbc20ab664
Merge PR #32144 into master
* refs/pull/32144/head:
	doc: mention multimds suite in dev guide
	doc: clarify difference between fs and kcephfs suite

Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-13 11:29:04 -08:00
Patrick Donnelly
2e505307c3
Merge PR #32024 into master
* refs/pull/32024/head:
	stop: Unmount cephFS volumes

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-13 11:07:21 -08:00
Sage Weil
77bfea8863 mgr/cephadm: fix temp file prefixes
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 12:48:44 -06:00
Sage Weil
2184641d7f qa: fix lingering ceph-mgr-ssh -> ceph-mgr-cephadm refs
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 12:48:06 -06:00
Sage Weil
d4f4a2cbd8 qa/tasks/ceph_manager.py: do not use python to write a file
/usr/bin/python dne on el8, /usr/bin/python3 dne on el7.  But
all we need to do is write a file--we can do that with tee.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 12:44:42 -06:00
Neha Ojha
0852827258
Merge pull request #32226 from neha-ojha/wip-four-percent
doc/rados: Better block.db size recommendations for bluestore

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
2019-12-13 10:23:34 -08:00
Neha
36cdafbcca doc/rados: Better block.db size recommendations for bluestore
Signed-off-by: Neha Ojha <nojha@redhat.com>
2019-12-13 17:24:58 +00:00
Sage Weil
aaeabf97b1 test/pybind/test_rados: execute takes a bytes (not str) payload
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 11:14:30 -06:00
Sage Weil
056383ea02 qa/packages/packages: python[3]-ceph is no more
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 11:03:11 -06:00
Nathan Cutler
5f8476fbe7
Merge pull request #32040 from smithfarm/wip-rn-13-2-8-mimic
doc/releases: add release notes for mimic v13.2.8

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-12-13 17:49:43 +01:00
Sebastian Wagner
7222ba6f6a mgr/ansible: Added missing type annotations
As requested by mypy

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-12-13 17:30:19 +01:00
Sebastian Wagner
074adad5c4 mgr/orchestrator: Add __str__ to HostSpec
As requested by mypy

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-12-13 17:29:35 +01:00
Sebastian Wagner
c2387f0d12 mgr/ansible: Integrate mgr/ansible/tox into mgr/tox
Reason to make this switch is to be able to do proper refactorings
in the orchestrators.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-12-13 17:28:18 +01:00
Sage Weil
1393ff8c85 mgr/cephadm: remove redundant /dev when blinking device light
Fixes: https://tracker.ceph.com/issues/43223
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 10:24:03 -06:00
Nathan Cutler
d64d92a168 doc/releases: add Mimic v13.2.8 to releases timeline
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-12-13 17:12:53 +01:00
Yuri Weinstein
126e8e20b1 doc: clarify priority use
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2019-12-13 07:46:30 -08:00
Sage Weil
c36fa56dd5 Merge PR #32236 into master
* refs/pull/32236/head:
	pybind/mgr: add_tox_test: Add mypy to TOX_ENVS

Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-13 09:34:43 -06:00
Sage Weil
240154f114 qa: use python3 for venvs etc
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 08:47:28 -06:00
Michael Fritch
34a2bb4495
qa/workunits/cephadm/test_cephadm.sh: re-enable adopt tests
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-12-13 07:44:34 -07:00
Stephan Müller
3d78b2f5f9 mgr/dashboard: Avoid escaped quotes using TSLint
The problem was that the TSLint linting hasn't matched the
linting of prettier regarding the quotes of a string.

Explanation:
'\'' will be converted to "'" with prettier, but TSLint thrown an
error that it wanted the string to look like '\''.

Now TSLint will not error if it sees an single quote inside a double
quote to match the behavior of prettier.

Fixes: https://tracker.ceph.com/issues/38287
Signed-off-by: Stephan Müller <smueller@suse.com>
2019-12-13 15:43:45 +01:00
Stephan Müller
5fcf525a46 mgr/dashboard: Allow string descriptions in confirmation modal
Fixes: https://tracker.ceph.com/issues/38287
Signed-off-by: Stephan Müller <smueller@suse.com>
2019-12-13 15:43:45 +01:00
Stephan Müller
cb63899847 mgr/dashboard: Add binary min and max validators
Adds simple validators that resemble the min and max validators for
numbers.

As a binary size (the string) has first be converted into bytes
(the number) to validate against some other number and in case of an
error the other number want's to be converted into a size to display,
the whole process needs a bunch of conversion, but these validators take
care of all that.

Fixes: https://tracker.ceph.com/issues/38287
Signed-off-by: Stephan Müller <smueller@suse.com>
2019-12-13 15:43:45 +01:00
Stephan Müller
0341c785f9 mgr/dashboard: Make form modal more flexible
Now any input type is supported and the special binary type which will
use the cd-binary input and automatically format the binary size into
bytes when submitting.

Now any field can have custom validators and error messages.
The form will fallback on predefined error messages if not configured.
It will use the error messages provided by the binary min and max
validators. It still provides the error message for a required field.

Fixes: https://tracker.ceph.com/issues/38287
Signed-off-by: Stephan Müller <smueller@suse.com>
2019-12-13 15:43:45 +01:00
Laura Paduano
59caff1de2
Merge pull request #32005 from s0nea/wip-dashboard-reactivate-suites
mgr/dashboard: reactivate dashboard test suites

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
2019-12-13 15:40:31 +01:00
Sebastian Wagner
8fa350c527 pybind/mgr: add_tox_test: Add mypy to TOX_ENVS
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-12-13 15:34:38 +01:00
Stephan Müller
16bae1a3e3 mgr/dashboard: CephFS quota management
Now both CephFS quotas can be changed with a validation against the next
tree maximum in the file tree, that prevents setting the quotas in a way
that would not be usable.

Fixes: https://tracker.ceph.com/issues/38287
Signed-off-by: Stephan Müller <smueller@suse.com>
2019-12-13 15:15:34 +01:00
Mykola Golub
dce1b3609c rbd-mirror: fix race on namespace replayer initialization failure
Fixes: https://tracker.ceph.com/issues/43289
Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-12-13 15:16:17 +02:00
Laura Paduano
481e3208ef
Merge pull request #31851 from votdev/issue_42609_device_lights
mgr/dashboard: Add support for blinking enclosure LEDs

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
2019-12-13 13:20:25 +01:00
Kotresh HR
2da9e1f473 stop: Unmount cephFS volumes
When stop.sh is run while the cephFS is mounted,
mount processes are retained and can't be killed.
And also the mount and df commands hang after this.
This patch unmounts the mounted volumes cleanly.

Signed-off-by: Kotresh HR <khiremat@redhat.com>
2019-12-13 17:39:44 +05:30