Commit Graph

110057 Commits

Author SHA1 Message Date
Sebastian Wagner
446ede26f3 mgr/orch: remove orch spec dump
as this is now a subset of `orch ls`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-26 12:02:56 +01:00
Sebastian Wagner
9335b7e564 python-common: reorder RGWSpec arguments
to match the argumens from `ServiceSpec`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-26 11:57:25 +01:00
Sebastian Wagner
e39088c30e python-common: prevent ServiceSpec of wrong type
Some Python foo to make sure, we don't have an object
like `ServiceSpec('rgw')` of type `ServiceSpec`. Now we have:

>>> type(ServiceSpec('rgw')) == type(RGWSpec('rgw'))

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-26 11:57:25 +01:00
Sebastian Wagner
672ee984ec pybind/mgr: tox.ini: omit cov report
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-26 11:57:25 +01:00
Sebastian Wagner
372d2aca35 mgr/cephadm: test describe_service
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-26 11:57:25 +01:00
Sebastian Wagner
24e375a536 mgr/orch: ServiceDescription: change json representation
In order to match the new paradigm

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-26 11:57:25 +01:00
Sebastian Wagner
b4c88196ff mgr/orch: ServiceDescription: Make spec a requirement
Because, a ServiceDescription is superset of a spec

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-26 11:57:25 +01:00
Kefu Chai
19479643ad
Merge pull request #34187 from liewegas/fix-44759
osd/PeeringState: drop mimic assert

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-26 18:29:22 +08:00
Jianpeng Ma
3ea296fe92 os/bluestore: remove unused func.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2020-03-26 18:03:38 +08:00
Kefu Chai
20efbfb507
Merge pull request #31453 from oneoneonepig/patch-2
doc: add sudo in ceph status command

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-26 17:19:28 +08:00
Yan, Zheng
4b79a2ecce
Merge pull request #29443 from simon-rock/metatool_dev
tool: add cephfs-meta-injection to show and amend info of inode
2020-03-26 17:10:28 +08:00
Yan, Zheng
baff8b366d
Merge pull request #33198 from simon-rock/simon_work_get_dirfrag_bound
mds: optimize function, get_force_dirfrag_bound_set
2020-03-26 17:06:08 +08:00
Yan, Zheng
96b3a8a5ee
Merge pull request #33643 from simon-rock/simon_destructor_of_session
mds : core dump if the resource is not released
2020-03-26 17:02:29 +08:00
Yan, Zheng
04d2989373
Merge pull request #31668 from shenhang/deny_reconnect_on_reboot
mds: short reboot time
2020-03-26 16:59:01 +08:00
Yan, Zheng
f4c6234972
Merge pull request #33570 from shenhang/modifyactiverequest
mds: Using begin() and empty() to iterate the xlist
2020-03-26 16:53:13 +08:00
Kefu Chai
5db7ab2028
Merge pull request #33923 from systemcrash/patch-1
doc: fix spelling and grammar issues in ceph-deploy-osd.rst

Reviewed-by: Varsha Rao <varao@redhat.com>
2020-03-26 16:47:17 +08:00
Kefu Chai
a16df762ae
Merge pull request #31055 from smithfarm/wip-42357
tests: qa/tasks/ceph.py: fail if any osd role doesn't get a device

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-26 16:41:07 +08:00
Kefu Chai
633a8319fd
Merge pull request #33366 from jmolmo/rook_blinking_lights
mgr/rook: Blinking lights

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-26 16:19:52 +08:00
Thomas Bechtold
cb8d906af5 qa: Add a tox env that can test importing files
While switching to python3, we need to make sure that we can import
the qa/tasks (and others, but this starts with qa/tasks) on a python3
environment.
To test this, we need to install teuthology into the test
venv. Currently, teuthology is not py3 ready so this will fail.

To test the current state of the qa/tasks directory with the ongoing
work for python3 within teuthology, you can now do:

TEUTHOLOGY_GIT=git+https://github.com/kshtsk/teuthology.git@wip-py3-compat \
    tox -eimport-tasks

This is using the current branch from
https://github.com/ceph/teuthology/pull/1362 which does the work to
make teuthology python3 ready.

NOTE: This tox env is not activated by default. It's currently failing
but it provides a way to iterate over the failures and once we have
them fixed, we can activate the tox env during make-check.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
2020-03-26 16:16:31 +08:00
Jianpeng Ma
d0c8fe7e69 os/bluestore: remove incorrectly comments.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2020-03-26 15:50:28 +08:00
Juan Miguel Olmo Martínez
a35c1b2593
mgr/rook: Blinking lights
Blinking lights implementation

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
2020-03-26 08:45:08 +01:00
Kefu Chai
b0bdbc3414 qa/tasks/mgr: partial revert of 'import with full path'
this change partially reverts #34139

using relative import helps with readability and ease the pain to write
down the full parent module name

in #34139, all relative imports were replaced with full path, because we
were using following code to verify if the code is python3 compatible:

```
  mod_spec = importlib.util.spec_from_file_location(mod_name, path)
  mod = importlib.util.module_from_spec(mod_spec)
  mod_spec.loader.exec_module(mod)
```

but this does not work with submodule which can import using relative
import without specifying the name of the package and its parent module.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-03-26 14:37:06 +08:00
Kefu Chai
867bc60644
Merge pull request #34184 from cbodley/wip-qa-rgw-test-multi-fix
qa/rgw: multisite test fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-26 11:44:56 +08:00
Sage Weil
8d514b53a2 Merge PR #33581 into master
* refs/pull/33581/head:
	mgr/cephadm: add watch_url to NFS bootstrap config
	mgr/cephadm: check for an existing NFS config object
	mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs
	mon: allow `auth caps` for `mgr` profile
	mgr/cephadm: add deployment example to NFS docs
	mgr/cephadm: add utils.py
	mgr/cephadm: create/update keyring during nfs config
	mgr/cephadm: pass NFSServiceSpec instead of pool/namespace args
	mgr/cephadm: add nfs apply test
	mgr/cephadm: fix nfs redeploy/reconfig
	mgr/cephadm: ensure nfs uses the correct entity
	mgr/cephadm: fix service name for nfs type
	mgr/cephadm: apply nfs service spec
	mgr/cephadm: don't create a unique nfs daemon name
	mgr/cephadm: update docs
	mgr/cephadm: add minimal caps for nfs client keyring
	mgr/cephadm: add logging to NFSGanesha class
	mgr/cephadm: create empty nfs rados config obj
	mgr/cephadm: add nfs tests
	mgr/cephadm: add a minimal ganesha.conf
	mgr/cephadm: deploy nfs-ganesha service
	mgr/cephadm: split out `config-and-keyrings` json
	mgr/orchestrator: rearrange interface to match impl. order

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-25 21:18:45 -05:00
Sage Weil
7be352e7c0 Merge PR #34181 into master
* refs/pull/34181/head:
	mgr/cephadm: bind grafana to all interfaces

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-25 21:18:10 -05:00
Sage Weil
3b5258545e Merge PR #34182 into master
* refs/pull/34182/head:
	mgr/cephadm: fix 'orch ps --refresh'

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-25 21:17:18 -05:00
Xie Xingguo
b7a959c1cf
Merge pull request #33910 from xiexingguo/wip-44532-2
osd/PeeringState: do not trim pg log past last_update_ondisk

Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
Reviewed-by: Samuel Just <sjust@redhat.com>
2020-03-26 08:10:22 +08:00
Nathan Cutler
8fe460e756 doc: do not encourage readers to run multiple clusters on same HW
This material was first added on December 22, 2012 by
46d0334456

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2020-03-25 23:56:15 +01:00
Michael Fritch
ff9265104f
mgr/cephadm: add watch_url to NFS bootstrap config
watch for changes to the per-daemon RADOS conf file

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:15 -06:00
Michael Fritch
75b988f314
mgr/cephadm: check for an existing NFS config object
assume an existing NFS config if the named rados object already exists

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:15 -06:00
Michael Fritch
fdf90bf530
mgr/cephadm: combine get_daemon_name and get_rados_user funcs
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:14 -06:00
Michael Fritch
ef8a46a3b1
mon: allow auth caps for mgr profile
cephadm orchestrator needs to update the caps during reconfig/redeploy

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:14 -06:00
Michael Fritch
77440d91c1
mgr/cephadm: add deployment example to NFS docs
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:14 -06:00
Michael Fritch
322eea8099
mgr/cephadm: add utils.py
move `name_to_config_section` and `assert_valid_host` into utils.py

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:14 -06:00
Michael Fritch
084fd4a91a
mgr/cephadm: create/update keyring during nfs config
the keyring might already exist from a prior config/reconfig/redeploy.

attempt to get_or_create the keyring first and than update the keyring
caps afterward

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:14 -06:00
Michael Fritch
8bb79a5f27
mgr/cephadm: pass NFSServiceSpec instead of pool/namespace args
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:14 -06:00
Michael Fritch
78ce6d4318
mgr/cephadm: add nfs apply test
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:14 -06:00
Michael Fritch
107885801b
mgr/cephadm: fix nfs redeploy/reconfig
search for the `NFSServiceSpec` instead of passing empty
`cephadm_args` during `_create_daemon`

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:14 -06:00
Michael Fritch
fd6322f7ec
mgr/cephadm: ensure nfs uses the correct entity
mon entity needs to start with `client.`

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:13 -06:00
Michael Fritch
d9f04ec1d7
mgr/cephadm: fix service name for nfs type
the `nfs` service was incorrectly reported as `mds`

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:13 -06:00
Michael Fritch
76f27894ca
mgr/cephadm: apply nfs service spec
orch apply nfs <svc_id> [<placement>]

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:13 -06:00
Michael Fritch
81823176af
mgr/cephadm: don't create a unique nfs daemon name
only one nfs daemon will be deployed per host

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:13 -06:00
Michael Fritch
530c62d76d
mgr/cephadm: update docs
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:13 -06:00
Michael Fritch
94600c69e2
mgr/cephadm: add minimal caps for nfs client keyring
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:13 -06:00
Michael Fritch
26ea33ad4b
mgr/cephadm: add logging to NFSGanesha class
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:13 -06:00
Michael Fritch
9103f4758b
mgr/cephadm: create empty nfs rados config obj
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:13 -06:00
Michael Fritch
b2b6e016d1
mgr/cephadm: add nfs tests
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:12 -06:00
Michael Fritch
2606cc3543
mgr/cephadm: add a minimal ganesha.conf
we only need to specify the rados pool and config object url

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:12 -06:00
Michael Fritch
770816dc9f
mgr/cephadm: deploy nfs-ganesha service
orch daemon add nfs <svc_arg> <pool> [<namespace>] [<placement>]

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:12 -06:00
Michael Fritch
3be6081028
mgr/cephadm: split out config-and-keyrings json
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-25 16:26:12 -06:00