Commit Graph

109387 Commits

Author SHA1 Message Date
Sage Weil
1410de00a3 Merge PR #33926 into octopus
* refs/pull/33926/head:
	python: fixate mypy requirement to mypy==0.770

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-12 13:01:56 -05:00
Sage Weil
ff7e2c7cfe Merge PR #33874 into octopus
* refs/pull/33874/head:
	qa/suites/powercycle: install build deps for building xfstest

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2020-03-12 12:34:35 -05:00
Sage Weil
75190d2153 Merge PR #33813 into octopus
* refs/pull/33813/head:
	osd/PGStateUtils: initialize NamedState::enter_time.
	osd/PGStatueUtils: remove unused member variable

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-12 12:34:07 -05:00
Sage Weil
0195e65bbe Merge PR #33814 into octopus
* refs/pull/33814/head:
	osd/OSDMap: stop encoding osd_state with >8 bits wide states only for old client

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: yanjun <yan.jun8@zte.com.cn>
2020-03-12 12:33:56 -05:00
Sage Weil
d1736aeb14 Merge PR #33064 into octopus
* refs/pull/33064/head:
	cephadm: add version to `command_ls` output
	cephadm: add type checking to `update_filewalld`
	cephadm: allow prepare-host to start an enabled service
	cephadm: add type checking for `check_host` and `prepare_host`
	cephadm: generalize logic for checking and enabling units
	cephadm: add 'CEPH_CONF' to the NFS ganesha container envs
	cephadm: trim nfs.json sample
	qa/workunits/cephadm/test_cephadm.sh: systemctl stop nfs-server
	qa/workunits/cephadm/test_cephadm.sh: make pgs available
	cephadm: add some log lines
	cephadm: check port in use
	cephadm: add/remove nfs ganesha grace
	cephadm: update firewalld with nfs service
	qa/workunits/cephadm/test_cephadm.sh: add nfs-ganesha test
	cephadm: add ganasha.conf
	cephadm: add NFSGanesha deployment type
	cephadm: consolidate list of supported daemons
	cephadm: use keyword instead of positional args

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-12 12:29:14 -05:00
Sage Weil
0a4cb0940f Merge PR #33855 into octopus
* refs/pull/33855/head:
	mgr/cephadm: reconfigure ceph daemons when monmap changes

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-12 12:28:43 -05:00
Sage Weil
cfc811d160 Merge PR #33829 into octopus
* refs/pull/33829/head:
	cephadm: log when we infer the image
	cephadm: Avoid `inspect` call by using ceph label
	cephadm: Infer ceph image

Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-12 11:33:14 -05:00
Lenz Grimmer
1857746562
Merge pull request #33919 from LenzGr/octopus-documentation
documentation: Updated Dashboard Features, improved flow

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2020-03-12 17:28:34 +01:00
Sage Weil
281b106dc6 Merge PR #33871 into octopus
* refs/pull/33871/head:
	qa/suites/rados/verify: debug_ms = 1, osd_heartbeat_grace = 60

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2020-03-12 11:17:53 -05:00
Sebastian Wagner
c64a2b4b35 python-common: remove all_hosts from PlacementSpec
replace it with `PlacementSpec(host_pattern='*')`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-12 17:12:10 +01:00
Sage Weil
8251598d81 Merge PR #33890 into octopus
* refs/pull/33890/head:
	doc/install: rethink docs install page (similar to PR#33613)
	doc/install: Rethink doc/install

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-12 10:40:43 -05:00
Sebastian Wagner
daf726347b doc/cephadm: Fix toc of Drive Groups
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-12 16:36:09 +01:00
Sebastian Wagner
e34b60869d python: fixate mypy requirement to mypy==0.770
I don't like suprises when upstream publishes a new mypy version.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-12 16:27:45 +01:00
Tiago Melo
77ddc6cb50 mgr/dashboard: Append "Modal" to all modal components names
Fixes: https://tracker.ceph.com/issues/44547

Signed-off-by: Tiago Melo <tmelo@suse.com>
2020-03-12 14:25:11 -01:00
Tiago Melo
0204865db6 mgr/dashboard: Use ModalComponent in all modals
Fixes: https://tracker.ceph.com/issues/44547

Signed-off-by: Tiago Melo <tmelo@suse.com>
2020-03-12 14:25:02 -01:00
Mykola Golub
e80e13511e
Merge pull request #33902 from dillaman/wip-test-rbd-integration
test/cli-integration: fixed spacing issue for RBD formatted tables

Reviewed-by: Mykola Golub <mgolub@suse.com>
2020-03-12 17:01:07 +02:00
Sage Weil
2367faac8b mgr/cephadm: reconfigure ceph daemons when monmap changes
This keeps ceph.conf fresh.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-12 10:00:24 -05:00
Mykola Golub
421d579ff9
Merge pull request #33898 from dillaman/wip-44567
qa/workunits/rbd: wait for nbd map to close after unmap

Reviewed-by: Mykola Golub <mgolub@suse.com>
2020-03-12 16:52:56 +02:00
Joshua Schmid
e2d940ef96 mgr/cephadm: fix dump output by formatting to json first
Signed-off-by: Joshua Schmid <jschmid@suse.de>
2020-03-12 15:46:53 +01:00
Michael Fritch
d02bfa32df
cephadm: add version to command_ls output
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:09:00 -06:00
Michael Fritch
e00bc7a4bc
cephadm: add type checking to update_filewalld
fixes mypy errors:
cephadm:1682: error: Incompatible types in assignment (expression has type "str", variable has type "int")
cephadm:1683: error: List item 3 has incompatible type "int"; expected "str"
cephadm:1686: error: List item 3 has incompatible type "int"; expected "str"
Found 3 errors in 1 file (checked 1 source file)

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:09:00 -06:00
Michael Fritch
f49d7e2c1e
cephadm: allow prepare-host to start an enabled service
the service might be enabled, but not running

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:09:00 -06:00
Michael Fritch
1244c65306
cephadm: add type checking for check_host and prepare_host
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:59 -06:00
Michael Fritch
803b6d7f44
cephadm: generalize logic for checking and enabling units
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:59 -06:00
Michael Fritch
93533e8a5f
cephadm: add 'CEPH_CONF' to the NFS ganesha container envs
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:59 -06:00
Michael Fritch
8f4ee1c9af
cephadm: trim nfs.json sample
we only need to specify the rados pool and config object url

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:59 -06:00
Michael Fritch
8543e2e50b
qa/workunits/cephadm/test_cephadm.sh: systemctl stop nfs-server
stop any running nfs servers before attempting a deploy of nfs-ganesha

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:59 -06:00
Michael Fritch
606b79b19f
qa/workunits/cephadm/test_cephadm.sh: make pgs available
allow rados obj. create to succeed during a single node test

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:59 -06:00
Michael Fritch
2c13694bed
cephadm: add some log lines
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:58 -06:00
Michael Fritch
f13f25669d
cephadm: check port in use
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:58 -06:00
Michael Fritch
26590f7399
cephadm: add/remove nfs ganesha grace
container unit pre-start/post-stop for ganesha grace db

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:58 -06:00
Michael Fritch
0b0046074b
cephadm: update firewalld with nfs service
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:03:18 -06:00
Michael Fritch
71ee086368
qa/workunits/cephadm/test_cephadm.sh: add nfs-ganesha test
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:03:18 -06:00
Michael Fritch
563990173c
cephadm: add ganasha.conf
also allows for any arbitrary nfs conf to be deployed by adding items to
the `files` dict of the config-json

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:03:18 -06:00
Michael Fritch
a09206420f
cephadm: add NFSGanesha deployment type
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:03:18 -06:00
Michael Fritch
177e85f3fa
cephadm: consolidate list of supported daemons
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:03:18 -06:00
Michael Fritch
cbb79b4c35
cephadm: use keyword instead of positional args
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:03:18 -06:00
Mykola Golub
ef4c3ec399 mgr/rbd_support: fix recursive non-global level schedule listing
For the case when the non-global level does not have a schedule
and a higher level is used as the parent, it wrongly listed
schedules from all branches under the parent, instead of only the
interested one.

Signed-off-by: Mykola Golub <mgolub@suse.com>
2020-03-12 13:40:25 +00:00
Lenz Grimmer
727305b353 mgr/dashboard: Updated octopus image on 404 page
Replaced the image of the Nautilus octopus with another octopus
in preparation for the "Octopus" release.

The image was taken from Museums Victoria
(https://collections.museumvictoria.com.au/species/8696) and is
licensed under the Creative Commons "Attribution 4.0 International"
(CC BY 4.0) license.

Deleted older, now obsolete images from the assets directory.

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

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
2020-03-12 14:37:30 +01:00
Lenz Grimmer
8571ce4fd2 doc: Improved Dashboard installation workflow
Moved the "Accessing the Dashboard" section in front of
the paragraphs that talk about enabling additional services.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
2020-03-12 14:21:11 +01:00
Lenz Grimmer
4009e9db90 doc: Updated dashboard feature overview for Octopus
Added new Dashboard features added for the Octopus
release.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
2020-03-12 14:19:52 +01:00
Sebastian Wagner
2ec87d059e mgr/orch: Cleanup python imports of the interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-12 14:15:07 +01:00
Sebastian Wagner
7cd32bcd6e mgr/orch: Properly handle NotImplementedError
They are masked as RuntimeError by the mgr.

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

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-12 14:15:07 +01:00
Sebastian Wagner
52cafe317c pybind/mgr: Rm PersistentStoreDict
`PersistentStoreDict` works great, except that is
too expensive to be used.

In addition, no one makes use of it.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-12 14:15:06 +01:00
Sage Weil
97c7dcf60c cephadm: log when we infer the image
This is similar to how we log when we infer the fsid.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-12 07:42:56 -05:00
Ricardo Marques
9993fb40de cephadm: Avoid inspect call by using ceph label
Signed-off-by: Ricardo Marques <rimarques@suse.com>
2020-03-12 07:38:11 -05:00
Ricardo Marques
3b3c70c64b cephadm: Infer ceph image
Fixes: https://tracker.ceph.com/issues/44440

Signed-off-by: Ricardo Marques <rimarques@suse.com>
2020-03-12 07:38:11 -05:00
Sage Weil
161a8330c4 Merge PR #33897 into octopus
* refs/pull/33897/head:
	mgr/PyModule: initialize options on standby class too
	Revert "pybind/mgr/mgr_module: fix standby module logging options"

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-12 07:37:10 -05:00
Jianpeng Ma
a5e2eb3201 osd/PGStateUtils: initialize NamedState::enter_time.
This bug introduce by d96c907.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2020-03-12 20:24:39 +08:00
Jianpeng Ma
fb7ab55dae osd/PGStatueUtils: remove unused member variable
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2020-03-12 20:24:39 +08:00