]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agomgr/rook: populate rados_config_location field 25970/head
Jeff Layton [Tue, 15 Jan 2019 18:50:22 +0000 (13:50 -0500)]
mgr/rook: populate rados_config_location field

The dashboard ganesha management code requires the rados:// config
URL for the nfs-ganesha daemons. Ensure that we populate that.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
6 years agomgr/rook: lowercase the "RADOS" dict label
Jeff Layton [Tue, 15 Jan 2019 17:41:19 +0000 (12:41 -0500)]
mgr/rook: lowercase the "RADOS" dict label

rook is lowercasing this tag in the CRD in response to review comments.
Change the orchestrator accordingly.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
6 years agoMerge PR #25947 into master
Sage Weil [Tue, 15 Jan 2019 15:42:40 +0000 (09:42 -0600)]
Merge PR #25947 into master

* refs/pull/25947/head:
msg/Messenger: remove get_connection() and send_message()
ceph_test_msgr: remove final get_connection() user

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25649 from SUSE/wip-orchestrator-service-op
Sebastian Wagner [Tue, 15 Jan 2019 13:37:35 +0000 (14:37 +0100)]
Merge pull request #25649 from SUSE/wip-orchestrator-service-op

mgr/orchestrator: Add service_action method

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #25669 from sebastian-philipp/orchestrator-type-hinting
Sebastian Wagner [Tue, 15 Jan 2019 13:36:40 +0000 (14:36 +0100)]
Merge pull request #25669 from sebastian-philipp/orchestrator-type-hinting

mgr/orchestrator: Improve docstrings, add type hinting

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
6 years agoMerge pull request #25543 from rjfd/wip-mgr-cli-commands
Lenz Grimmer [Tue, 15 Jan 2019 10:59:54 +0000 (11:59 +0100)]
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>
6 years agoMerge pull request #25426 from Tinatinak/fix_bug25094_2
Lenz Grimmer [Tue, 15 Jan 2019 09:59:10 +0000 (10:59 +0100)]
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>
6 years agomgr/orchestrator_cli: Add service and service-instance start/stop/reload 25649/head
Tim Serong [Fri, 21 Dec 2018 06:06:57 +0000 (17:06 +1100)]
mgr/orchestrator_cli: Add service and service-instance start/stop/reload

Signed-off-by: Tim Serong <tserong@suse.com>
6 years agomgr/orchestrator: Add service_action method
Tim Serong [Thu, 20 Dec 2018 11:47:53 +0000 (22:47 +1100)]
mgr/orchestrator: Add service_action method

This is to facilitate service start/stop/reload (for example,
after altering NFS Ganesha configuration, we need to trigger
a service reload).

Signed-off-by: Tim Serong <tserong@suse.com>
6 years agoMerge pull request #25953 from falcon78921/wip-doc-24924
Xie Xingguo [Tue, 15 Jan 2019 06:05:34 +0000 (14:05 +0800)]
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>
6 years agodoc: fixed typo in CRUSH map docs 25953/head
James McClune [Tue, 15 Jan 2019 03:16:20 +0000 (22:16 -0500)]
doc: fixed typo in CRUSH map docs

Fixes: https://tracker.ceph.com/issues/24924
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agoMerge PR #22612 into master
Sage Weil [Tue, 15 Jan 2019 02:49:51 +0000 (20:49 -0600)]
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>
6 years agoMerge PR #25915 into master
Sage Weil [Tue, 15 Jan 2019 02:49:34 +0000 (20:49 -0600)]
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>
6 years agoMerge PR #25879 into master
Patrick Donnelly [Mon, 14 Jan 2019 23:40:30 +0000 (15:40 -0800)]
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>
6 years agoMerge PR #25921 into master
Patrick Donnelly [Mon, 14 Jan 2019 23:38:30 +0000 (15:38 -0800)]
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>
6 years agoMerge pull request #25948 from liewegas/wip-fix-locker-addr
Jason Dillaman [Mon, 14 Jan 2019 22:24:46 +0000 (17:24 -0500)]
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>
6 years agoMerge pull request #25881 from cbodley/wip-rgw-sanitize-v4
Ali Maredia [Mon, 14 Jan 2019 21:30:47 +0000 (16:30 -0500)]
Merge pull request #25881 from cbodley/wip-rgw-sanitize-v4

rgw: sanitize customer encryption keys from log output in v4 auth

6 years agocls/lock: always store v1 addr in locker_info_t 25948/head
Sage Weil [Mon, 14 Jan 2019 20:50:54 +0000 (14:50 -0600)]
cls/lock: always store v1 addr in locker_info_t

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #24446 from vico-research-and-consulting/master
Jason Dillaman [Mon, 14 Jan 2019 20:42:57 +0000 (15:42 -0500)]
Merge pull request #24446 from vico-research-and-consulting/master

common: fix for broken rbdmap parameter parsing

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agomsg/Messenger: remove get_connection() and send_message() 25947/head
Sage Weil [Mon, 14 Jan 2019 20:17:47 +0000 (14:17 -0600)]
msg/Messenger: remove get_connection() and send_message()

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph_test_msgr: remove final get_connection() user
Sage Weil [Mon, 14 Jan 2019 20:17:29 +0000 (14:17 -0600)]
ceph_test_msgr: remove final get_connection() user

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25754 into master
Sage Weil [Mon, 14 Jan 2019 20:11:14 +0000 (14:11 -0600)]
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>
6 years agoMerge PR #25932 into master
Sage Weil [Mon, 14 Jan 2019 20:08:25 +0000 (14:08 -0600)]
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>
6 years agoMerge PR #25888 into master
Patrick Donnelly [Mon, 14 Jan 2019 19:40:44 +0000 (11:40 -0800)]
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>
6 years agoMerge PR #25843 into master
Patrick Donnelly [Mon, 14 Jan 2019 19:37:24 +0000 (11:37 -0800)]
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>
6 years agoMerge PR #25814 into master
Patrick Donnelly [Mon, 14 Jan 2019 19:35:39 +0000 (11:35 -0800)]
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>
6 years agoMerge PR #25633 into master
Patrick Donnelly [Mon, 14 Jan 2019 19:32:01 +0000 (11:32 -0800)]
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>
6 years agoMerge PR #25787 into master
Patrick Donnelly [Mon, 14 Jan 2019 19:31:15 +0000 (11:31 -0800)]
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>
6 years agocommon: fix for broken rbdmap parameter parsing 24446/head
Marc Schoechlin [Fri, 5 Oct 2018 11:05:12 +0000 (13:05 +0200)]
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]>
6 years agoMerge pull request #25935 from trociny/wip-37883
Jason Dillaman [Mon, 14 Jan 2019 15:57:39 +0000 (10:57 -0500)]
Merge pull request #25935 from trociny/wip-37883

test/rbd_mirror: wait for release leader lock fully complete

6 years agoMerge pull request #25925 from markhpc/wip-rocksdb-pricache
Josh Durgin [Mon, 14 Jan 2019 15:57:33 +0000 (07:57 -0800)]
Merge pull request #25925 from markhpc/wip-rocksdb-pricache

kv/KeyValueDB: Move PriCache implementation to ShardedCache.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agomgr/rook: allow service describe and service ls to display nfs services 25633/head
Jeff Layton [Thu, 15 Nov 2018 18:19:22 +0000 (13:19 -0500)]
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>
6 years agomgr/rook: add support for adding NFS gateways
Jeff Layton [Thu, 15 Nov 2018 17:23:09 +0000 (12:23 -0500)]
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>
6 years agoMerge pull request #25876 from s0nea/wip-dashboard-rename-config-option-types
Lenz Grimmer [Mon, 14 Jan 2019 14:14:21 +0000 (15:14 +0100)]
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>
6 years agoMerge pull request #25943 from rhcs-dashboard/update-sso-doc
Lenz Grimmer [Mon, 14 Jan 2019 14:11:18 +0000 (15:11 +0100)]
Merge pull request #25943 from rhcs-dashboard/update-sso-doc

mgr/dashboard: updated SSO documentation

Reviewed-by: Ricardo Marques <rimarques@suse.com>
6 years agomgr/dashboard: updated SSO documentation 25943/head
alfonsomthd [Mon, 14 Jan 2019 13:24:56 +0000 (14:24 +0100)]
mgr/dashboard: updated SSO documentation

Added info about SAML request issuer value.

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
6 years agoqa/tasks/ceph: stop any split/merge activity before scrubbing 25932/head
Sage Weil [Sat, 12 Jan 2019 11:32:54 +0000 (05:32 -0600)]
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>
6 years agomgr/orchestrator_cli: add support for adding NFS gateways
Jeff Layton [Thu, 15 Nov 2018 17:22:38 +0000 (12:22 -0500)]
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>
6 years agomgr/orchestrator_cli: convert service add/rm commands to be type-specific
Jeff Layton [Thu, 20 Dec 2018 11:56:01 +0000 (06:56 -0500)]
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>
6 years agoMerge pull request #25927 from dillaman/wip-37867
Lenz Grimmer [Mon, 14 Jan 2019 12:10:53 +0000 (13:10 +0100)]
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>
6 years agomgr/rook: add decorator for add_stateless_service
Jeff Layton [Wed, 19 Dec 2018 15:21:40 +0000 (10:21 -0500)]
mgr/rook: add decorator for add_stateless_service

Signed-off-by: Jeff Layton <jlayton@redhat.com>
6 years agomgr/rook: add a context manager instead of open-coding exception handling
Jeff Layton [Wed, 19 Dec 2018 14:20:57 +0000 (09:20 -0500)]
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>
6 years agomgr/orchestrator: Improve docstrings, add type hinting 25669/head
Sebastian Wagner [Fri, 21 Dec 2018 14:48:02 +0000 (15:48 +0100)]
mgr/orchestrator: Improve docstrings, add type hinting

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoMerge pull request #25492 from sebastian-philipp/orchestrator-common-metaclass
Sebastian Wagner [Mon, 14 Jan 2019 11:03:33 +0000 (12:03 +0100)]
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>
6 years agomgr/dashboard: access_control: change CLI commands declaration 25543/head
Ricardo Dias [Thu, 13 Dec 2018 15:41:16 +0000 (15:41 +0000)]
mgr/dashboard: access_control: change CLI commands declaration

Signed-off-by: Ricardo Dias <rdias@suse.com>
6 years agomgr/mgr_module: @CLICommand decorator for declaring CLI commands
Ricardo Dias [Fri, 21 Dec 2018 10:47:52 +0000 (10:47 +0000)]
mgr/mgr_module: @CLICommand decorator for declaring CLI commands

Signed-off-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #25909 from votdev/issue_37862
Lenz Grimmer [Mon, 14 Jan 2019 10:16:25 +0000 (11:16 +0100)]
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>
6 years agoMerge pull request #23729 from daikk115/master
Abhishek L [Mon, 14 Jan 2019 10:00:27 +0000 (11:00 +0100)]
Merge pull request #23729 from daikk115/master

docs: Fixed swift client authentication fail

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoMerge pull request #25913 from s0nea/wip-dashboard-test_full_health-fix
Lenz Grimmer [Mon, 14 Jan 2019 09:27:47 +0000 (10:27 +0100)]
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>
6 years agoMerge pull request #25905 from s0nea/wip-dashboard-osd-add-flag-fix
Lenz Grimmer [Mon, 14 Jan 2019 09:27:29 +0000 (10:27 +0100)]
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>
6 years agoMerge pull request #25859 from xiexingguo/wip-async-no-force-renew-auth
Xie Xingguo [Mon, 14 Jan 2019 08:59:49 +0000 (16:59 +0800)]
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>
6 years agoMerge pull request #25930 from xiexingguo/wip-invalid-upmap-access
Xie Xingguo [Mon, 14 Jan 2019 08:38:53 +0000 (16:38 +0800)]
Merge pull request #25930 from xiexingguo/wip-invalid-upmap-access

osd/OSDMap: potential access violation fix

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25933 into master
Sage Weil [Sun, 13 Jan 2019 15:09:38 +0000 (09:09 -0600)]
Merge PR #25933 into master

* refs/pull/25933/head:
common/numa: remove stray debug output

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoosd/OSDMap: potential access violation fix 25930/head
xie xingguo [Sat, 12 Jan 2019 07:01:54 +0000 (15:01 +0800)]
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>
6 years agoMerge pull request #25931 from yangdongsheng/journal_import
Jason Dillaman [Sat, 12 Jan 2019 18:57:56 +0000 (13:57 -0500)]
Merge pull request #25931 from yangdongsheng/journal_import

rbd: fix a typo in error output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agocommon/numa: remove stray debug output 25933/head
Sage Weil [Sat, 12 Jan 2019 12:08:46 +0000 (06:08 -0600)]
common/numa: remove stray debug output

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25902 into master
Sage Weil [Sat, 12 Jan 2019 16:26:32 +0000 (10:26 -0600)]
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>
6 years agoMerge PR #25884 into master
Sage Weil [Sat, 12 Jan 2019 16:26:16 +0000 (10:26 -0600)]
Merge PR #25884 into master

* refs/pull/25884/head:
msg/async: better debug output

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge PR #25917 into master
Sage Weil [Sat, 12 Jan 2019 16:25:57 +0000 (10:25 -0600)]
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>
6 years agotest/rbd_mirror: wait for release leader lock fully complete 25935/head
Mykola Golub [Sat, 12 Jan 2019 15:55:25 +0000 (15:55 +0000)]
test/rbd_mirror: wait for release leader lock fully complete

Previously the wait context was completed at post_release_lock
stage, which still was not the end of the lock releasing process.

Fixes: https://tracker.ceph.com/issues/37883
Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge PR #25273 into master
Sage Weil [Sat, 12 Jan 2019 11:56:41 +0000 (05:56 -0600)]
Merge PR #25273 into master

* refs/pull/25273/head:
doc/rados/operations/health-checks: Add LARGE_OMAP_OBJECTS

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25828 into master
Sage Weil [Sat, 12 Jan 2019 11:45:45 +0000 (05:45 -0600)]
Merge PR #25828 into master

* refs/pull/25828/head:
osd, mgr, mds: make timeout of updating rotating keys configurable

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25886 into master
Sage Weil [Sat, 12 Jan 2019 11:44:00 +0000 (05:44 -0600)]
Merge PR #25886 into master

* refs/pull/25886/head:
qa/tasks/rebuild_mondb: use monmap to properly name the mons
ceph-monstore-tool: add --monmap <path> argument to rebuild command
ceph-mon: dump monmap to debug logs
Revert "mon/MonMap: no noname- mon name prefix when for_mkfs"
mon/MonMap: improve/fix initial monmap generation for mkfs
ceph-mon: make membership check with public_addr more robust
ceph-mon: make mkfs check whether I am in monmap more robust

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #25806 into master
Sage Weil [Sat, 12 Jan 2019 11:13:32 +0000 (05:13 -0600)]
Merge PR #25806 into master

* refs/pull/25806/head:
mgr: diskprediction_cloud Add nvme devcie support

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25662 from yangdongsheng/abort_on_full
Ilya Dryomov [Sat, 12 Jan 2019 09:29:56 +0000 (10:29 +0100)]
Merge pull request #25662 from yangdongsheng/abort_on_full

rbd: introduce abort_on_full option for rbd map

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
6 years agorbd: introduce abort_on_full option for rbd map 25662/head
Dongsheng Yang [Wed, 19 Dec 2018 08:16:35 +0000 (03:16 -0500)]
rbd: introduce abort_on_full option for rbd map

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
6 years agorbd: fix a typo in error output 25931/head
Dongsheng Yang [Sat, 12 Jan 2019 07:15:23 +0000 (02:15 -0500)]
rbd: fix a typo in error output

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
6 years agodoc/rados/operations/health-checks: Add LARGE_OMAP_OBJECTS 25273/head
Brad Hubbard [Tue, 27 Nov 2018 03:50:24 +0000 (13:50 +1000)]
doc/rados/operations/health-checks: Add LARGE_OMAP_OBJECTS

Document LARGE_OMAP_OBJECTS health check

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
6 years agomds: convert const char ptr to string_view 25921/head
Patrick Donnelly [Fri, 11 Jan 2019 20:30:53 +0000 (12:30 -0800)]
mds: convert const char ptr to string_view

Trivial refactor.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #25924 from neha-ojha/wip-fix-scrub-doc
Neha Ojha [Fri, 11 Jan 2019 23:05:02 +0000 (15:05 -0800)]
Merge pull request #25924 from neha-ojha/wip-fix-scrub-doc

doc/rados/configuration: add osd scrub {begin,end} week day

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agocommon/TrackedOp: use string_view interface
Patrick Donnelly [Fri, 11 Jan 2019 20:28:42 +0000 (12:28 -0800)]
common/TrackedOp: use string_view interface

Also, don't store pointers to strings outside. The interface was written to
optimize for string literals but this is structurally unsafe programming.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoqa/tasks/rebuild_mondb: use monmap to properly name the mons 25886/head
Sage Weil [Wed, 9 Jan 2019 22:05:40 +0000 (16:05 -0600)]
qa/tasks/rebuild_mondb: use monmap to properly name the mons

We used to rely on the monmap bootstrap code to magically create a valid
monmap with named mons because our old-style ceph.conf had mon_addr
values in each mon.foo section.  Instead, just feed it a real monmap
from pre-destruction.

In practice, a user can manually generate this monmap, or rename the
mons after the fact with --inject-monmap, or whatever.  Out of scope
for this test, so we just do the simplest thing to make the rebuild test
work.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph-monstore-tool: add --monmap <path> argument to rebuild command
Sage Weil [Thu, 10 Jan 2019 17:01:19 +0000 (11:01 -0600)]
ceph-monstore-tool: add --monmap <path> argument to rebuild command

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph-mon: dump monmap to debug logs
Sage Weil [Wed, 9 Jan 2019 16:11:39 +0000 (10:11 -0600)]
ceph-mon: dump monmap to debug logs

Verbosely during mkfs, at level 10 on normal startup.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/dashboard: incorporate RBD overall performance grafana dashboard 25927/head
Jason Dillaman [Fri, 11 Jan 2019 21:30:52 +0000 (16:30 -0500)]
mgr/dashboard: incorporate RBD overall performance grafana dashboard

Fixes: http://tracker.ceph.com/issues/37867
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agomonitoring/grafana: new RBD overview dashboard page
Jason Dillaman [Fri, 11 Jan 2019 17:34:39 +0000 (12:34 -0500)]
monitoring/grafana: new RBD overview dashboard page

This page pulls RBD stats from the Natuatilus prometheus exporter.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agodoc/rados/configuration: add osd scrub {begin,end} week day 25924/head
Neha Ojha [Fri, 11 Jan 2019 20:55:51 +0000 (12:55 -0800)]
doc/rados/configuration: add osd scrub {begin,end} week day

Signed-off-by: Neha Ojha <nojha@redhat.com>
6 years agorgw: sanitize customer encryption keys from log output in v4 auth 25881/head
Casey Bodley [Mon, 10 Dec 2018 17:38:01 +0000 (12:38 -0500)]
rgw: sanitize customer encryption keys from log output in v4 auth

Fixes: http://tracker.ceph.com/issues/37847
CVE-2018-16889

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24427 from thmour/thmour_api_purge
Jason Dillaman [Fri, 11 Jan 2019 19:43:08 +0000 (14:43 -0500)]
Merge pull request #24427 from thmour/thmour_api_purge

librbd: add trash purge api calls

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25908 from trociny/wip-dperf-bytes
Jason Dillaman [Fri, 11 Jan 2019 19:42:40 +0000 (14:42 -0500)]
Merge pull request #25908 from trociny/wip-dperf-bytes

mgr: change 'bytes' dynamic perf counters to COUNTER type

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agokv/KeyValueDB: Move PriCache implementation to ShardedCache. 25925/head
Mark Nelson [Fri, 11 Jan 2019 17:36:44 +0000 (11:36 -0600)]
kv/KeyValueDB: Move PriCache implementation to ShardedCache.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
6 years agomsg/async: better debug output 25884/head
Sage Weil [Wed, 9 Jan 2019 21:39:41 +0000 (15:39 -0600)]
msg/async: better debug output

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25887 from neha-ojha/wip-hide-flag
Neha Ojha [Fri, 11 Jan 2019 17:21:50 +0000 (09:21 -0800)]
Merge pull request #25887 from neha-ojha/wip-hide-flag

include/rados.h: hide CEPH_OSDMAP_PGLOG_HARDLIMIT from ceph -s

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
6 years agoqa/suites/rados/multimon/tasks/mon_recovery: whitelist PG_AVAILABILITY 25917/head
Sage Weil [Fri, 11 Jan 2019 15:42:51 +0000 (09:42 -0600)]
qa/suites/rados/multimon/tasks/mon_recovery: whitelist PG_AVAILABILITY

The mgr creates a pool for device health, and mons may be thrashing and
make peering slow.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agolibrbd: tweaked trash purge API 24427/head
Jason Dillaman [Thu, 10 Jan 2019 14:43:25 +0000 (09:43 -0500)]
librbd: tweaked trash purge API

Removed the internal usage of the public librbd API, avoided double-opening
image to determine data pool, and fixed issues with the unit test case.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agomon/ConfigMonitor: add 'config generate-minimal-conf' command 25915/head
Sage Weil [Fri, 11 Jan 2019 15:13:58 +0000 (09:13 -0600)]
mon/ConfigMonitor: add 'config generate-minimal-conf' command

Generate a minimal ceph.conf that should be sufficient for any client
or server-side node.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/dashboard: Fix test_full_health test 25913/head
Tatjana Dehler [Fri, 11 Jan 2019 14:08:59 +0000 (15:08 +0100)]
mgr/dashboard: Fix test_full_health test

Fixes: http://tracker.ceph.com/issues/37872
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
6 years agocommon/options: add FLAG_MINIMAL_CONF
Sage Weil [Fri, 11 Jan 2019 15:00:05 +0000 (09:00 -0600)]
common/options: add FLAG_MINIMAL_CONF

Mark a few auth options that would go in ceph.conf.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocls/rbd: reduce erroneous error messages when omap keys don't exist
Jason Dillaman [Thu, 10 Jan 2019 14:26:52 +0000 (09:26 -0500)]
cls/rbd: reduce erroneous error messages when omap keys don't exist

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agotest/librbd: fix librbrd test relative to trash purge
Julien Collet [Thu, 1 Nov 2018 09:02:40 +0000 (10:02 +0100)]
test/librbd: fix librbrd test relative to trash purge

Signed-off-by: Julien Collet <julien.collet@cern.ch>
6 years agolibrbd: add trash purge api calls
Theofilos Mouratidis [Wed, 3 Oct 2018 11:42:26 +0000 (13:42 +0200)]
librbd: add trash purge api calls

Add trash purge api calls and fix the docs of some other rbd trash functions

Signed-off-by: Theofilos Mouratidis <mtheofilos@gmail.com>
6 years agoMerge pull request #25529 from Songweibin/wip-fix-rbd-migration
Jason Dillaman [Fri, 11 Jan 2019 14:03:58 +0000 (09:03 -0500)]
Merge pull request #25529 from Songweibin/wip-fix-rbd-migration

librbd: disallow trash restoring when image being migrated

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25765 from Songweibin/wip-fix-migrate-parent
Jason Dillaman [Fri, 11 Jan 2019 14:03:39 +0000 (09:03 -0500)]
Merge pull request #25765 from Songweibin/wip-fix-migrate-parent

librbd/api: misc fix migration

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25834 from trociny/wip-21392
Jason Dillaman [Fri, 11 Jan 2019 14:02:19 +0000 (09:02 -0500)]
Merge pull request #25834 from trociny/wip-21392

rbd-mirror: create and export replication perf counters to mgr

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25896 from trociny/wip-37861
Jason Dillaman [Fri, 11 Jan 2019 14:01:49 +0000 (09:01 -0500)]
Merge pull request #25896 from trociny/wip-37861

rbd: fix delay time calculation for trash move

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25656 from tspmelo/wip-npm-update
Lenz Grimmer [Fri, 11 Jan 2019 13:11:36 +0000 (14:11 +0100)]
Merge pull request #25656 from tspmelo/wip-npm-update

mgr/dashboard: Update npm packages

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #25883 from dillaman/wip-37745
Mykola Golub [Fri, 11 Jan 2019 11:30:40 +0000 (13:30 +0200)]
Merge pull request #25883 from dillaman/wip-37745

librbd: keep access/modified timestamp updates out of IO path

Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agomgr/dashboard: Provide all four 'mandatory' flags 25905/head
Tatjana Dehler [Fri, 11 Jan 2019 06:12:07 +0000 (07:12 +0100)]
mgr/dashboard: Provide all four 'mandatory' flags

Fixes: https://tracker.ceph.com/issues/37857
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
6 years agomgr/dashboard: Confusing tilted time stamps in the CephFS performance graph 25909/head
Volker Theile [Fri, 11 Jan 2019 09:44:34 +0000 (10:44 +0100)]
mgr/dashboard: Confusing tilted time stamps in the CephFS performance graph

Fixes: https://tracker.ceph.com/issues/37862
Signed-off-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #25894 from Devp00l/wip-kv-table-update
Lenz Grimmer [Fri, 11 Jan 2019 09:29:39 +0000 (10:29 +0100)]
Merge pull request #25894 from Devp00l/wip-kv-table-update

mgr/dashboard: Hide empty fields and render all objects in KV-table

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>