Commit Graph

93836 Commits

Author SHA1 Message Date
Juan Miguel Olmo Martínez
77f20e725c
mgr/ansible: Replace deprecated <get_config> calls
Changes needed to replace the obsolete get_config by the new get_module_option manager module method

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
2019-01-15 18:04:06 +01:00
Lenz Grimmer
80945c8b95
Merge pull request #25543 from rjfd/wip-mgr-cli-commands
mgr: modules CLI commands declaration using @CLICommand decorator

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-01-15 11:59:54 +01:00
Lenz Grimmer
4ac642c56a
Merge pull request #25426 from Tinatinak/fix_bug25094_2
mgr/dashboard: Filter out tasks depending on permissions

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
2019-01-15 10:59:10 +01:00
Xie Xingguo
c55dc78903
Merge pull request #25953 from falcon78921/wip-doc-24924
doc: fixed typo in CRUSH map docs

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-01-15 14:05:34 +08:00
James McClune
c44d31167a doc: fixed typo in CRUSH map docs
Fixes: https://tracker.ceph.com/issues/24924
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
2019-01-14 22:16:20 -05:00
Sage Weil
0334cc19fa Merge PR #22612 into master
* refs/pull/22612/head:
	kv/RocksDBStore: Don't use sync mode when disableWAL is set.

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-14 20:49:51 -06:00
Sage Weil
f1505a081a Merge PR #25915 into master
* refs/pull/25915/head:
	mon/ConfigMonitor: add 'config generate-minimal-conf' command
	common/options: add FLAG_MINIMAL_CONF

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-01-14 20:49:34 -06:00
Patrick Donnelly
f0eb0e350b
Merge PR #25879 into master
* refs/pull/25879/head:
	client: define template to declare ref
	client: use message smart ptr instead of raw ptr
	client: make map lookup optimizations
	client: do not clear message payload
	client: clean up variable name
	*: use std::string_view instead of char ptr

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-14 15:40:30 -08:00
Patrick Donnelly
43415424d1
Merge PR #25921 into master
* refs/pull/25921/head:
	mds: convert const char ptr to string_view
	common/TrackedOp: use string_view interface

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-14 15:38:30 -08:00
Jason Dillaman
cdbc9ebad1
Merge pull request #25948 from liewegas/wip-fix-locker-addr
cls/lock: always store v1 addr in locker_info_t

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-01-14 17:24:46 -05:00
Ali Maredia
b5bd434598
Merge pull request #25881 from cbodley/wip-rgw-sanitize-v4
rgw: sanitize customer encryption keys from log output in v4 auth
2019-01-14 16:30:47 -05:00
Sage Weil
4372688e28 cls/lock: always store v1 addr in locker_info_t
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-14 14:50:58 -06:00
Jason Dillaman
0d18c2864d
Merge pull request #24446 from vico-research-and-consulting/master
common: fix for broken rbdmap parameter parsing

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-01-14 15:42:57 -05:00
Sage Weil
5478320ae7 Merge PR #25754 into master
* refs/pull/25754/head:
	msg/async/Protocol: send keepalive on connection race winner

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2019-01-14 14:11:14 -06:00
Sage Weil
ff67c66ee6 Merge PR #25932 into master
* refs/pull/25932/head:
	qa/tasks/ceph: stop any split/merge activity before scrubbing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-01-14 14:08:25 -06:00
Patrick Donnelly
20323cc294
Merge PR #25888 into master
* refs/pull/25888/head:
	common/HeartbeatMap: no health check if heartbeat_file is empty

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-01-14 11:40:44 -08:00
Patrick Donnelly
d6ee4aa0fa
Merge PR #25843 into master
* refs/pull/25843/head:
	qa: fix damage expectation setting
	qa: fix loop variable reference

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2019-01-14 11:37:24 -08:00
Patrick Donnelly
9f8f00d487
Merge PR #25814 into master
* refs/pull/25814/head:
	common/StackStringStream: optimize xsputn() and overflow()

Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-01-14 11:35:39 -08:00
Patrick Donnelly
a2b05b8334
Merge PR #25633 into master
* refs/pull/25633/head:
	mgr/rook: allow service describe and service ls to display nfs services
	mgr/rook: add support for adding NFS gateways
	mgr/orchestrator_cli: add support for adding NFS gateways
	mgr/orchestrator_cli: convert service add/rm commands to be type-specific
	mgr/rook: add decorator for add_stateless_service
	mgr/rook: add a context manager instead of open-coding exception handling

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-01-14 11:32:01 -08:00
Patrick Donnelly
efdd71dcbb
Merge PR #25787 into master
* refs/pull/25787/head:
	mount.fuse.ceph: Fix ambiguous shebang

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-01-14 11:31:15 -08:00
Marc Schoechlin
fca5ef8aba common: fix for broken rbdmap parameter parsing
This improves the broken parameter parsing discussed in #36327

Test expression for the parsing function:

PARAMS="options='lock_on_read,queue_depth=1024',id=archiv,keyring=/etc/ceph/ceph.client.archiv.keyring"
echo -e " ORIGINAL PARAM: >>>$PARAMS<<<\nCONVERTED PARAM: >>>$(create_cmd_params "$PARAMS")<<<"

PARAMS="id=archiv,keyring=/etc/ceph/ceph.client.archiv.keyring,options='lock_on_read,queue_depth=1024'"
echo -e " ORIGINAL PARAM: >>>$PARAMS<<<\nCONVERTED PARAM: >>>$(create_cmd_params "$PARAMS")<<<"

PARAMS=""
echo -e " ORIGINAL PARAM: >>>$PARAMS<<<\nCONVERTED PARAM: >>>$(create_cmd_params "$PARAMS")<<<"

PARAMS=",keyring=/etc/ceph/ceph.client.archiv.keyring,options='lock_on_read,queue_depth=1024',id=archiv,"
echo -e " ORIGINAL PARAM: >>>$PARAMS<<<\nCONVERTED PARAM: >>>$(create_cmd_params "$PARAMS")<<<"

PARAMS="'keyring'=/etc/ceph/ceph.client.archiv.keyring,options='lock_on_read,queue_depth=1024',id=archiv,"
echo -e " ORIGINAL PARAM: >>>$PARAMS<<<\nCONVERTED PARAM: >>>$(create_cmd_params "$PARAMS")<<<"

PARAMS="--keyring=/etc/ceph/ceph.client.archiv.keyring,options='lock_on_read,queue_depth=1024',id=archiv, # a comment"
echo -e " ORIGINAL PARAM: >>>$PARAMS<<<\nCONVERTED PARAM: >>>$(create_cmd_params "$PARAMS")<<<"

Fixes: https://tracker.ceph.com/issues/36327
Signed-off-by: Marc Schoechlin <ms@256bit.org]>
2019-01-14 14:29:59 -05:00
Jason Dillaman
bc26dc3173
Merge pull request #25935 from trociny/wip-37883
test/rbd_mirror: wait for release leader lock fully complete
2019-01-14 10:57:39 -05:00
Josh Durgin
384cfa2a2f
Merge pull request #25925 from markhpc/wip-rocksdb-pricache
kv/KeyValueDB: Move PriCache implementation to ShardedCache.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-01-14 07:57:33 -08:00
Jeff Layton
0909fdb60e mgr/rook: allow service describe and service ls to display nfs services
Extend the _service_ls routine and the rook backend so that it can
properly display ceph NFS gateways as well.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
2019-01-14 10:36:51 -05:00
Jeff Layton
651100128e mgr/rook: add support for adding NFS gateways
Add the necessary machinery to the rook orchestrator to allow it to
request a cluster of nfs-ganesha gateways.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
2019-01-14 10:36:46 -05:00
Lenz Grimmer
385e767f5f
Merge pull request #25876 from s0nea/wip-dashboard-rename-config-option-types
mgr/dashboard: config option type names update

Reviewed-by: Stephan Müller <smueller@suse.com>
2019-01-14 15:14:21 +01:00
Lenz Grimmer
3623aed68c
Merge pull request #25943 from rhcs-dashboard/update-sso-doc
mgr/dashboard: updated SSO documentation

Reviewed-by: Ricardo Marques <rimarques@suse.com>
2019-01-14 15:11:18 +01:00
alfonsomthd
2ac3dc17c5 mgr/dashboard: updated SSO documentation
Added info about SAML request issuer value.

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2019-01-14 14:24:56 +01:00
Sage Weil
54c5202b74 qa/tasks/ceph: stop any split/merge activity before scrubbing
If there are leftover merges at the end of the run they can take a long
time to get through, blowing our timeout for (waiting for pgs to become
active and to stop splitting/merge) and scrubbing pgs.  Stop all of that
at the end of the run so that we don't have to wait so long.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-14 06:51:21 -06:00
Jeff Layton
ca972cefbd mgr/orchestrator_cli: add support for adding NFS gateways
Add necessary commands to orchestrator_cli to allow it to deploy a
cluster of NFS servers. Note that we have to be able to specify the pool
and an optional namespace for the recovery backend objects.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
2019-01-14 07:11:41 -05:00
Jeff Layton
d07effa132 mgr/orchestrator_cli: convert service add/rm commands to be type-specific
When adding services, we often need different sets of arguments
depending on the service type. Convert the "service add" and "service
rm" commands into separate commands for each service type.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
2019-01-14 07:11:36 -05:00
Lenz Grimmer
c70a3d8e30
Merge pull request #25927 from dillaman/wip-37867
mgr/dashboard: incorporate RBD overall performance grafana dashboard

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Kanika Murarka <kmurarka@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
2019-01-14 13:10:53 +01:00
Jeff Layton
09dc84aaa9 mgr/rook: add decorator for add_stateless_service
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2019-01-14 07:05:03 -05:00
Jeff Layton
fa4f63be66 mgr/rook: add a context manager instead of open-coding exception handling
Suggested-by: Sebastian Wagner <sebastian.wagner@suse.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2019-01-14 07:05:03 -05:00
Sebastian Wagner
b0d0c669f7
Merge pull request #25492 from sebastian-philipp/orchestrator-common-metaclass
pybind/mgr: Unified bits of volumes and orchestrator

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
2019-01-14 12:03:33 +01:00
Ricardo Dias
fdb34f80f4
mgr/dashboard: access_control: change CLI commands declaration
Signed-off-by: Ricardo Dias <rdias@suse.com>
2019-01-14 10:48:28 +00:00
Ricardo Dias
a5e9eb0189
mgr/mgr_module: @CLICommand decorator for declaring CLI commands
Signed-off-by: Ricardo Dias <rdias@suse.com>
2019-01-14 10:48:28 +00:00
Lenz Grimmer
f3b7d14bb1
Merge pull request #25909 from votdev/issue_37862
mgr/dashboard: Confusing tilted time stamps in the CephFS performance graph

Reviewed-by: Stephan Müller <smueller@suse.com>
2019-01-14 11:16:25 +01:00
Abhishek L
f9374b92fb
Merge pull request #23729 from daikk115/master
docs: Fixed swift client authentication fail

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
2019-01-14 11:00:27 +01:00
Lenz Grimmer
73abdcfd82
Merge pull request #25913 from s0nea/wip-dashboard-test_full_health-fix
mgr/dashboard: Fix test_full_health test

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-01-14 10:27:47 +01:00
Lenz Grimmer
9cbf2d9e09
Merge pull request #25905 from s0nea/wip-dashboard-osd-add-flag-fix
mgr/dashboard: Provide all four 'mandatory' OSD flags

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
2019-01-14 10:27:29 +01:00
Xie Xingguo
96a20b7899
Merge pull request #25859 from xiexingguo/wip-async-no-force-renew-auth
msg/async: do not force updating rotating keys inline

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-14 16:59:49 +08:00
Xie Xingguo
1c845f3c32
Merge pull request #25930 from xiexingguo/wip-invalid-upmap-access
osd/OSDMap: potential access violation fix

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-14 16:38:53 +08:00
Sage Weil
b59d74023b Merge PR #25933 into master
* refs/pull/25933/head:
	common/numa: remove stray debug output

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-13 09:09:38 -06:00
xie xingguo
df2e01f496 osd/OSDMap: potential access violation fix
Seems we'll continue to access the iterator after it is invalidated
by the __erase__ method.
Also this is more efficient considering there could be some extreme
ec-pool (e.g., 8 + 2) consumers..

Fixes: http://tracker.ceph.com/issues/37881
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-01-13 09:17:07 +08:00
Jason Dillaman
82994c464d
Merge pull request #25931 from yangdongsheng/journal_import
rbd: fix a typo in error output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-01-12 13:57:56 -05:00
Sage Weil
cda6699b76 common/numa: remove stray debug output
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-12 10:32:46 -06:00
Sage Weil
b73ef78363 Merge PR #25902 into master
* refs/pull/25902/head:
	qa/standalone/mon/mon-handle-forward: fix grep path and check return results
	mon/MonClient: be less aggressive/paranoid about reopening mon connections

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-12 10:26:32 -06:00
Sage Weil
42c9ee9eb6 Merge PR #25884 into master
* refs/pull/25884/head:
	msg/async: better debug output

Reviewed-by: Ricardo Dias <rdias@suse.com>
2019-01-12 10:26:16 -06:00
Sage Weil
d0bf18379c Merge PR #25917 into master
* refs/pull/25917/head:
	qa/suites/rados/multimon/tasks/mon_recovery: whitelist PG_AVAILABILITY

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-01-12 10:25:57 -06:00