]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoceph_test_msgr: fix server->client addr discovery 26306/head
Sage Weil [Wed, 6 Feb 2019 22:01:01 +0000 (16:01 -0600)]
ceph_test_msgr: fix server->client addr discovery

The client's myaddr will be an ANY address, but the internel connection table
will use a v1: or v2: address.  Use the get_peer_addrs() to figure out how to
connect instead.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/{async,simple}: make learned_addr a bit smarter
Sage Weil [Wed, 6 Feb 2019 12:23:16 +0000 (06:23 -0600)]
msg/{async,simple}: make learned_addr a bit smarter

Only set type ANY if we are a pure client; otherwise, preserve the
type.  Also, only populate the addr if we have a blank ip (sometimes
we already know it from learn_addr_unknowns).

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async: very protocol type when looking up existing connections
Sage Weil [Tue, 5 Feb 2019 11:08:00 +0000 (05:08 -0600)]
msg/async: very protocol type when looking up existing connections

Since we register client connections as any:, we may have either a ProtocolV1 or V2
connection.  This happens when clients have an imprecise mon search list and connect
to the same mon via both v1 and v2, for example when you do something like

 ceph -m 'v2:127.0.0.1:40648/0,v1:127.0.0.1:40649/0' -s

If we do encounter the other protocol type than what we expect, just mark it down and
proceed.  This is only a temporarily case that happens during mon discovery, the client
is always prepared to retry, and it doesn't actually matter which one succeeds since
it will return a monmap and the client will adapt accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/LogEntry: use as_legacy_addr()
Sage Weil [Mon, 4 Feb 2019 11:42:38 +0000 (05:42 -0600)]
common/LogEntry: use as_legacy_addr()

...just in case addrs has an any addr.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: add entity_addrvec_t::as_legacy_addr()
Sage Weil [Mon, 4 Feb 2019 11:41:42 +0000 (05:41 -0600)]
msg/msg_types: add entity_addrvec_t::as_legacy_addr()

Return either the actual legacy addr, or an any addr as a legacy addr.  If
neither is available, lie and return a v2 (or other) addr as a legacy adr.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async/AsyncMessenger: drop weird assert
Sage Weil [Mon, 4 Feb 2019 11:34:11 +0000 (05:34 -0600)]
msg/async/AsyncMessenger: drop weird assert

I'm not sure what this was intended for originally...

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/Messenger: be less verbose
Sage Weil [Mon, 4 Feb 2019 11:30:12 +0000 (05:30 -0600)]
msg/Messenger: be less verbose

This message has been annoying me

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/simple: learn client addr as type any
Sage Weil [Mon, 4 Feb 2019 11:23:43 +0000 (05:23 -0600)]
msg/simple: learn client addr as type any

Just like AsyncMessenger.  Best to be consistent!

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/simple: set_addr_unknowns(): use front(), not legacy_addr()
Sage Weil [Mon, 4 Feb 2019 11:09:32 +0000 (05:09 -0600)]
msg/simple: set_addr_unknowns(): use front(), not legacy_addr()

We may be passed an any: address.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: drop any: prefix
Sage Weil [Mon, 4 Feb 2019 10:57:51 +0000 (04:57 -0600)]
msg/msg_types: drop any: prefix

If it can be any type of address, then simply don't specify the type.  This
is less confusing for humans.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoremove all Messenger::get_myaddr() users
Sage Weil [Sun, 3 Feb 2019 19:48:21 +0000 (13:48 -0600)]
remove all Messenger::get_myaddr() users

Use get_myaddrs() instead and join the glorious future.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agotest/crimson: fix DummyAuthAuthorizer
Sage Weil [Sun, 3 Feb 2019 19:16:29 +0000 (13:16 -0600)]
test/crimson: fix DummyAuthAuthorizer

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/MonClient: kill get_myaddr()
Sage Weil [Sun, 3 Feb 2019 19:11:01 +0000 (13:11 -0600)]
mon/MonClient: kill get_myaddr()

Not used, and wrong.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async/ProtocolV1: use legacy v1 address, not any, in protocol
Sage Weil [Wed, 6 Feb 2019 23:04:10 +0000 (17:04 -0600)]
msg/async/ProtocolV1: use legacy v1 address, not any, in protocol

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/Messenger: add get_myaddr_legacy()
Sage Weil [Sun, 3 Feb 2019 18:08:18 +0000 (12:08 -0600)]
msg/Messenger: add get_myaddr_legacy()

This returns a legacy v1 address out of a v1 or any address.  It's
intended to be used in contexts where we *always* want a v1 address,
like SimpleMessenger.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: add entity_addr_t::is_any()
Sage Weil [Sun, 3 Feb 2019 18:03:11 +0000 (12:03 -0600)]
msg/msg_types: add entity_addr_t::is_any()

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async: msgr2: send entity type and peer_address in Tag::HELLO frame
Ricardo Dias [Wed, 30 Jan 2019 22:15:29 +0000 (22:15 +0000)]
msg/async: msgr2: send entity type and peer_address in Tag::HELLO frame

Signed-off-by: Ricardo Dias <rdias@suse.com>
6 years agomsg/async: identify client using any: addr
Sage Weil [Mon, 28 Jan 2019 08:15:23 +0000 (02:15 -0600)]
msg/async: identify client using any: addr

The client can speak v1 or v2, so it is misleading to identify it with a v1 or v2
address (it is either).  This avoid some kludgey workarounds.

We also are a bit more precise about what target_addr means.  It is only used by
the client to indicate which of the peer_addrs we are connecting to, or by a
peer to identify which the peer_addrs we *would* reconnect to.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26198 from Exotelis/mobile-navigation
Lenz Grimmer [Thu, 7 Feb 2019 10:05:50 +0000 (11:05 +0100)]
Merge pull request #26198 from Exotelis/mobile-navigation

mgr/dashboard: Add description to menu items on mobile navigation

6 years agoMerge pull request #25346 from p-na/wip-pna-prettier-modified
Lenz Grimmer [Thu, 7 Feb 2019 10:04:31 +0000 (11:04 +0100)]
Merge pull request #25346 from p-na/wip-pna-prettier-modified

mgr/dashboard: Fix modified files only (frontend)

Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #26308 from liu-chunmei/ceph_seastar_io_read
Kefu Chai [Thu, 7 Feb 2019 08:28:23 +0000 (16:28 +0800)]
Merge pull request #26308 from liu-chunmei/ceph_seastar_io_read

test/crimson: fix build failure of test_alien_echo.

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26253 from tchaikov/wip-remove-random-cache
Kefu Chai [Thu, 7 Feb 2019 02:47:21 +0000 (10:47 +0800)]
Merge pull request #26253 from tchaikov/wip-remove-random-cache

common/random_cache: remove unused RandomCache

Reviewed-By: Neha Ojha <nojha@redhat.com>
6 years agocrimson: fix build error for test_alien_echo. 26308/head
chunmei Liu [Thu, 7 Feb 2019 00:28:10 +0000 (16:28 -0800)]
crimson: fix build error for test_alien_echo.

Signed-off-by: chunmei Liu <chunmei.liu@intel.com>
6 years agoMerge pull request #25575 from ThoreKr/doc-pool-stats-master
Neha Ojha [Wed, 6 Feb 2019 23:10:11 +0000 (15:10 -0800)]
Merge pull request #25575 from ThoreKr/doc-pool-stats-master

doc: Add mention of ceph osd pool stats

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26189 from s0nea/wip-dashboard-osd-menu-button
Lenz Grimmer [Wed, 6 Feb 2019 19:45:36 +0000 (20:45 +0100)]
Merge pull request #26189 from s0nea/wip-dashboard-osd-menu-button

mgr/dashboard: Group buttons together into one menu on OSD page

Reviewed-by: Sebastian Krah <skrah@suse.com>
6 years agoMerge pull request #26296 from ricardoasmarques/fix-iscsi-docs-url
Lenz Grimmer [Wed, 6 Feb 2019 18:58:30 +0000 (19:58 +0100)]
Merge pull request #26296 from ricardoasmarques/fix-iscsi-docs-url

Fix iSCSI docs URL

Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #26058 from rhcs-dashboard/37917-sso-404-page
Lenz Grimmer [Wed, 6 Feb 2019 18:57:27 +0000 (19:57 +0100)]
Merge pull request #26058 from rhcs-dashboard/37917-sso-404-page

mgr/dashboard: SSO - UserDoesNotExist page

Reviewed-by: Kanika Murarka <kmurarka@redhat.com>
6 years agoMerge pull request #26290 from dzafman/wip-38027-38195
David Zafman [Wed, 6 Feb 2019 16:41:40 +0000 (08:41 -0800)]
Merge pull request #26290 from dzafman/wip-38027-38195

Wip 38027 38195: osd/osd-backfill-space.sh fails

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #25918 from rjfd/wip-dashboard-nfs-backend
Lenz Grimmer [Wed, 6 Feb 2019 15:41:49 +0000 (16:41 +0100)]
Merge pull request #25918 from rjfd/wip-dashboard-nfs-backend

mgr/dashboard: NFS Ganesha management REST API

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #26177 from liewegas/wip-stricter-osd-gate
Kefu Chai [Wed, 6 Feb 2019 11:02:34 +0000 (19:02 +0800)]
Merge pull request #26177 from liewegas/wip-stricter-osd-gate

osd: refuse to start if we're > N+2 from recorded require_osd_release

Reviewed-By: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #26181 from iliul/fix-pybind-mgr-pep8
Kefu Chai [Wed, 6 Feb 2019 11:01:45 +0000 (19:01 +0800)]
Merge pull request #26181 from iliul/fix-pybind-mgr-pep8

pybind/mgr: PEP 8 code clean and fix typo

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26258 from liewegas/wip-disable-krb
Kefu Chai [Wed, 6 Feb 2019 11:00:01 +0000 (19:00 +0800)]
Merge pull request #26258 from liewegas/wip-disable-krb

build: disable kerberos for nautilus

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26259 from rzarzynski/wip-bl-freeze-alloc-unit
Kefu Chai [Wed, 6 Feb 2019 10:59:22 +0000 (18:59 +0800)]
Merge pull request #26259 from rzarzynski/wip-bl-freeze-alloc-unit

common: make CEPH_BUFFER_ALLOC_UNIT known at compile-time.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoFix iSCSI docs URL 26296/head
Ricardo Marques [Wed, 6 Feb 2019 10:04:55 +0000 (10:04 +0000)]
Fix iSCSI docs URL

Signed-off-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #26094 from sebastian-philipp/orchestrator-cli-command
Sebastian Wagner [Wed, 6 Feb 2019 09:57:45 +0000 (10:57 +0100)]
Merge pull request #26094 from sebastian-philipp/orchestrator-cli-command

mgr/orchestrator: make use of @CLICommand

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
6 years agoMerge pull request #26178 from dzafman/wip-38070
David Zafman [Tue, 5 Feb 2019 22:51:14 +0000 (14:51 -0800)]
Merge pull request #26178 from dzafman/wip-38070

mon: A PG with PG_STATE_REPAIR doesn't mean damaged data, PG_STATE_IN…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #26273 from yehudasa/wip-38174
Yehuda Sadeh [Tue, 5 Feb 2019 22:01:24 +0000 (14:01 -0800)]
Merge pull request #26273 from yehudasa/wip-38174

vstart.sh: fix params generation for monmaptool

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agotest: Ignore kill_daemons() error 26290/head
David Zafman [Tue, 5 Feb 2019 19:31:32 +0000 (11:31 -0800)]
test: Ignore kill_daemons() error

Workaround for: http://tracker.ceph.com/issues/38195

Signed-off-by: David Zafman <dzafman@redhat.com>
6 years agotest: Fix kill_daemon() to check after last large sleep
David Zafman [Mon, 4 Feb 2019 21:30:11 +0000 (13:30 -0800)]
test: Fix kill_daemon() to check after last large sleep

Signed-off-by: David Zafman <dzafman@redhat.com>
6 years agotest: Increase timeouts in osd-backfill-space.sh because of failure seen
David Zafman [Fri, 1 Feb 2019 23:02:57 +0000 (15:02 -0800)]
test: Increase timeouts in osd-backfill-space.sh because of failure seen

Fixes: http://tracker.ceph.com/issues/38027
Signed-off-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #26279 from idryomov/wip-krbd-bluestore
Ilya Dryomov [Tue, 5 Feb 2019 18:44:36 +0000 (19:44 +0100)]
Merge pull request #26279 from idryomov/wip-krbd-bluestore

qa: objectstore snippets for krbd

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agomgr/dashboard: ganesha: support no namespace 25918/head
Ricardo Dias [Tue, 5 Feb 2019 16:06:21 +0000 (16:06 +0000)]
mgr/dashboard: ganesha: support no namespace

Signed-off-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #25995 from tspmelo/wip-iscsi-ui
Lenz Grimmer [Tue, 5 Feb 2019 15:18:44 +0000 (16:18 +0100)]
Merge pull request #25995 from tspmelo/wip-iscsi-ui

mgr/dashboard: iSCSI management UI

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agomgr/orchestrator: fix broken `device ls` 26094/head
Sebastian Wagner [Tue, 5 Feb 2019 11:05:10 +0000 (12:05 +0100)]
mgr/orchestrator: fix broken `device ls`

* Added `InventoryDevice.from_ceph_volume_inventory`
* Improved documentation

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agomgr/dashboard: Use scss variable for media queries 26198/head
Sebastian Krah [Wed, 30 Jan 2019 10:47:19 +0000 (11:47 +0100)]
mgr/dashboard: Use scss variable for media queries

Uses the newly created scss breakpoint variables for every media query that was hardcoded so far.

Signed-off-by: Sebastian Krah <skrah@suse.com>
6 years agomgr/dashboard: Add description to menu items on mobile navigation
Sebastian Krah [Tue, 29 Jan 2019 15:30:03 +0000 (16:30 +0100)]
mgr/dashboard: Add description to menu items on mobile navigation

Adds the title of the icons as description right next to it if the resolution
of the browser is below 768px.
Adds a couple of scss variable which define the different breakpoints of
bootstrap. Those variables should be used in media query expressions.

Fixes: https://tracker.ceph.com/issues/37789
Signed-off-by: Sebastian Krah <skrah@suse.com>
6 years agomgr/dashboard: SSO - UserDoesNotExist page 26058/head
alfonsomthd [Tue, 5 Feb 2019 12:24:47 +0000 (13:24 +0100)]
mgr/dashboard: SSO - UserDoesNotExist page

* Added sso/404 page for use case when user logs in successfully
  in identity provider but the user does not exist in ceph.

* The page includes a link to perform a logout in IdP
  and return to login page.

Fixes: https://tracker.ceph.com/issues/37917
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
6 years agomgr/dashboard: Add iSCSI Form UI 25995/head
Tiago Melo [Tue, 15 Jan 2019 15:34:54 +0000 (15:34 +0000)]
mgr/dashboard: Add iSCSI Form UI

Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Add read-only UI for iSCSI
Tiago Melo [Fri, 14 Dec 2018 14:46:20 +0000 (14:46 +0000)]
mgr/dashboard: Add read-only UI for iSCSI

Signed-off-by: Ricardo Marques <rimarques@suse.com>
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: ganesha: notify ganesha daemons to reload configuration
Ricardo Dias [Tue, 5 Feb 2019 12:03:27 +0000 (12:03 +0000)]
mgr/dashboard: ganesha: notify ganesha daemons to reload configuration

Signed-off-by: Ricardo Dias <rdias@suse.com>
6 years agomgr/dashboard: ganesha: add LookupError when checking RGW connectivity
Ricardo Dias [Tue, 5 Feb 2019 12:02:59 +0000 (12:02 +0000)]
mgr/dashboard: ganesha: add LookupError when checking RGW connectivity

Signed-off-by: Ricardo Dias <rdias@suse.com>
6 years agomgr/dashboard: Fix TableComponent when changing columns afterViewInit
Tiago Melo [Fri, 18 Jan 2019 12:19:19 +0000 (12:19 +0000)]
mgr/dashboard: Fix TableComponent when changing columns afterViewInit

Angular was throwing an ExpressionChangedAfterItHasBeenCheckedError if you
changed columns information right after the table was initiated.

Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Set CdModal max-height
Tiago Melo [Wed, 16 Jan 2019 16:13:39 +0000 (16:13 +0000)]
mgr/dashboard: Set CdModal max-height

Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Enhance CdValidators.validateIf method
Tiago Melo [Tue, 15 Jan 2019 15:49:14 +0000 (15:49 +0000)]
mgr/dashboard: Enhance CdValidators.validateIf method

Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Add generic Select component
Tiago Melo [Tue, 15 Jan 2019 15:28:00 +0000 (15:28 +0000)]
mgr/dashboard: Add generic Select component

Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #26202 from smithfarm/wip-fix-s390x-rpm-build
Kefu Chai [Tue, 5 Feb 2019 11:41:48 +0000 (19:41 +0800)]
Merge pull request #26202 from smithfarm/wip-fix-s390x-rpm-build

rpm: package crypto libraries for all archs

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/pybind/rados: add binding for rados_notify2
Jeff Layton [Tue, 5 Feb 2019 10:59:17 +0000 (10:59 +0000)]
mgr/pybind/rados: add binding for rados_notify2

Add a new Ioctx.notify operation that we can call to send a rados
notification over an object.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
6 years agomgr/orchestrator: make use of @CLICommand
Sebastian Wagner [Tue, 22 Jan 2019 15:30:01 +0000 (16:30 +0100)]
mgr/orchestrator: make use of @CLICommand

Also Modified some command to allow multiple hosts
Also: Added more tests

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoqa: objectstore snippets for krbd 26279/head
Ilya Dryomov [Mon, 4 Feb 2019 19:43:38 +0000 (20:43 +0100)]
qa: objectstore snippets for krbd

krbd was being tested with filestore, up until recently when the
default for osd_objectstore was changed to bluestore.  This broke
rbd_simple_big.yaml because bluestore_block_size defaults to 10G.
Pick up the sepia setting of 90G from bluestore-bitmap.yaml.

Run fsx subsuite with both filestore and bluestore.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
6 years agoMerge pull request #26106 from yehudasa/wip-rgw-es-fixes
Yehuda Sadeh [Tue, 5 Feb 2019 01:54:43 +0000 (17:54 -0800)]
Merge pull request #26106 from yehudasa/wip-rgw-es-fixes

rgw: multiple es related fixes and improvements

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agovstart.sh: fix params generation for monmaptool 26273/head
Yehuda Sadeh [Tue, 5 Feb 2019 00:35:20 +0000 (16:35 -0800)]
vstart.sh: fix params generation for monmaptool

Fixes: http://tracker.ceph.com/issues/38174
This broke in the msgr21 case, due to bash globbing in cases where
the generated string somehow matched names of certain files in local
directory. Also need to pass params to the prun function separately,
otherwise everything is quoted together.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
6 years agoMerge PR #26111 into master
Patrick Donnelly [Mon, 4 Feb 2019 23:43:42 +0000 (15:43 -0800)]
Merge PR #26111 into master

* refs/pull/26111/head:
mds: broadcast quota message to client when disable quota

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge PR #26123 into master
Patrick Donnelly [Mon, 4 Feb 2019 23:39:52 +0000 (15:39 -0800)]
Merge PR #26123 into master

* refs/pull/26123/head:
mds: refactor MDSContext inheritance

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge pull request #26023 from jmolmo/inventory_pb_updated
Sebastian Wagner [Mon, 4 Feb 2019 22:00:00 +0000 (23:00 +0100)]
Merge pull request #26023 from jmolmo/inventory_pb_updated

mgr/ansible: Replace Ansible playbook used to retrieve storage devices data

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
6 years agoMerge pull request #26170 from ifed01/wip-ifed-fix-fsck-read
Yuri Weinstein [Mon, 4 Feb 2019 20:51:15 +0000 (12:51 -0800)]
Merge pull request #26170 from ifed01/wip-ifed-fix-fsck-read

os/bluestore: deep fsck fails on inspecting very large onodes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #26223 from majianpeng/remove-unused-function
Yuri Weinstein [Mon, 4 Feb 2019 20:50:45 +0000 (12:50 -0800)]
Merge pull request #26223 from majianpeng/remove-unused-function

osd: remove unused function.

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25278 from ZVampirEM77/wip-deleteobject-policy
Adam C. Emerson [Mon, 4 Feb 2019 18:08:20 +0000 (13:08 -0500)]
Merge pull request #25278 from ZVampirEM77/wip-deleteobject-policy

rgw: fix obj can still be deleted even if deleteobject policy is set
rgw: cleanup for RGWDeleteObj::verify_permission(

Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoMerge pull request #26244 from idryomov/wip-krbd-alloc-size
Ilya Dryomov [Mon, 4 Feb 2019 14:13:18 +0000 (15:13 +0100)]
Merge pull request #26244 from idryomov/wip-krbd-alloc-size

krbd: alloc_size map option and tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agorpm: package crypto libraries for all archs 26202/head
Nathan Cutler [Wed, 30 Jan 2019 10:51:58 +0000 (11:51 +0100)]
rpm: package crypto libraries for all archs

Since 318a8e3c079c937d4e006a9eb4f47c5349648360 we are now building at least the
openssl crypto plugin on all architectures, not just x86_64.

This fixes the non-x86_64 builds for master.

Fixes: 318a8e3c079c937d4e006a9eb4f47c5349648360
Signed-off-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #25309 from Devp00l/wip-prometheus-alerting
Tatjana Dehler [Mon, 4 Feb 2019 10:32:41 +0000 (11:32 +0100)]
Merge pull request #25309 from Devp00l/wip-prometheus-alerting

mgr/dashboard: Prometheus integration

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge PR #26256 into master
Sage Weil [Mon, 4 Feb 2019 05:59:54 +0000 (23:59 -0600)]
Merge PR #26256 into master

* refs/pull/26256/head:
msg/async/ProtocolV2: respect policy.resetcheck on cookie==0

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agocommon: make CEPH_BUFFER_ALLOC_UNIT known at compile-time. 26259/head
Radoslaw Zarzynski [Tue, 23 Oct 2018 09:31:31 +0000 (11:31 +0200)]
common: make CEPH_BUFFER_ALLOC_UNIT known at compile-time.

It sounds extremely unlikely that any platform Ceph targets can have
PAGE_SIZE lower than 4k. However, to handle these corner cases,
`bufferlist` was rounding to `CEPH_PAGE_SIZE` known at run-time only.
As a result, compilers were enforced to generate pretty inefficient
code like in `ceph::buffer::list::refill_append_space` (self is 1,10%):

```
       │         min(const _Tp& __a, const _Tp& __b)
       │         {
       │           // concept requirements
       │           __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
       │           //return __b < __a ? __b : __a;
       │           if (__b < __a)
  5,44 │       mov    _DYNAMIC+0x14a0,%rax
       │     _Z11round_up_toImjENSt13make_unsignedINSt11common_typeIJT_T0_EE4typeEE4typeES2_S3_():
       │       mov    $0x1000,%ecx
       │     _ZN4ceph6buffer4list19refill_append_spaceEj():
       │         size_t alen = round_up_to(need, CEPH_BUFFER_ALLOC_UNIT) -
       │           sizeof(raw_combined);
       │         buffer::hangable_ptr& new_back = \
       │           hangable_ptr::create(raw_combined::create(alen, 0, get_mempool()));
       │       mov    %rbp,%rdi
       │     _Z11round_up_toImjENSt13make_unsignedINSt11common_typeIJT_T0_EE4typeEE4typeES2_S3_():
  6,21 │       cmpl   $0x1000,(%rax)
  0,78 │       cmovbe (%rax),%ecx
       │       mov    %r12,%rax
       │       xor    %edx,%edx
  0,78 │       mov    %ecx,%ecx
 45,59 │       div    %rcx
```

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agobuild: disable kerberos for nautilus 26258/head
Sage Weil [Sun, 3 Feb 2019 20:27:49 +0000 (14:27 -0600)]
build: disable kerberos for nautilus

We can re-enable after we branch.  For N, though, there is no point in dragging
in the dependencies and implying there is something that works.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26240 from votdev/improve_get_module_option
Kefu Chai [Sun, 3 Feb 2019 17:37:02 +0000 (01:37 +0800)]
Merge pull request #26240 from votdev/improve_get_module_option

mgr: Use Py_BuildValue to create the argument tuple

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26233 from liewegas/wip-bluestore-disable-csum
Kefu Chai [Sun, 3 Feb 2019 17:24:08 +0000 (01:24 +0800)]
Merge pull request #26233 from liewegas/wip-bluestore-disable-csum

os/bluestore: add bluestore_ignore_data_csum option

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed By: Xie Xingguo <xie.xingguo@zte.com.cn>

6 years agoMerge pull request #25077 from rzarzynski/wip-bl-kill_append_buffer
Kefu Chai [Sun, 3 Feb 2019 17:22:11 +0000 (01:22 +0800)]
Merge pull request #25077 from rzarzynski/wip-bl-kill_append_buffer

common: drop append_buffer from bufferlist. Use simple carriage instead

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26245 from liewegas/wip-38150
Kefu Chai [Sun, 3 Feb 2019 17:20:55 +0000 (01:20 +0800)]
Merge pull request #26245 from liewegas/wip-38150

os/bluestore/KernelDevice: use flock(2) for block device lock

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
6 years agomsg/async/ProtocolV2: respect policy.resetcheck on cookie==0 26256/head
Sage Weil [Thu, 31 Jan 2019 22:52:09 +0000 (16:52 -0600)]
msg/async/ProtocolV2: respect policy.resetcheck on cookie==0

It's possible the accepting end knows the cookie but the connecting end
does not if the fault happens before it receives server_ident.  If the
next connection attempt is in the other direction, we need to avoid a
reset or the queued messages at the first site will get lost.

Fixes: http://tracker.ceph.com/issues/38118
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa: update krbd tests for zeroout 26244/head
Ilya Dryomov [Fri, 1 Feb 2019 09:35:33 +0000 (10:35 +0100)]
qa: update krbd tests for zeroout

Discard no longer guarantees zeroing, use BLKZEROOUT and "fallocate -z"
instead (blkdiscard(8) in xenial doesn't support -z).

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
6 years agocommon/random_cache: remove unused RandomCache 26253/head
Kefu Chai [Sun, 3 Feb 2019 05:24:10 +0000 (13:24 +0800)]
common/random_cache: remove unused RandomCache

the only consumer of it was KeyValueStore, which was removed in
19c39faead87655d174965d054de8bbbe4d79067 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoqa: krbd discard with alloc_size vs zeroout tests
Ilya Dryomov [Thu, 31 Jan 2019 17:54:24 +0000 (18:54 +0100)]
qa: krbd discard with alloc_size vs zeroout tests

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
6 years agoMerge pull request #26179 from xiexingguo/wip-37968
Xie Xingguo [Sat, 2 Feb 2019 09:24:42 +0000 (17:24 +0800)]
Merge pull request #26179 from xiexingguo/wip-37968

crush: fix upmap overkill

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26222 from tchaikov/wip-crimson-heartbeat
Kefu Chai [Sat, 2 Feb 2019 07:45:44 +0000 (15:45 +0800)]
Merge pull request #26222 from tchaikov/wip-crimson-heartbeat

crimson/osd: add heartbeat support

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agocmake: disable GCC-9 warnings 26222/head
Kefu Chai [Fri, 25 Jan 2019 09:06:29 +0000 (17:06 +0800)]
cmake: disable GCC-9 warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: add heartbeat support
Kefu Chai [Mon, 14 Jan 2019 08:59:09 +0000 (16:59 +0800)]
crimson/osd: add heartbeat support

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: move "_preboot" log to where it belongs to
Kefu Chai [Thu, 31 Jan 2019 05:43:46 +0000 (13:43 +0800)]
crimson/osd: move "_preboot" log to where it belongs to

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: bind and listen
Kefu Chai [Thu, 31 Jan 2019 04:34:04 +0000 (12:34 +0800)]
crimson/osd: bind and listen

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/net: add Messenger::try_bind()
Kefu Chai [Thu, 31 Jan 2019 10:07:20 +0000 (18:07 +0800)]
crimson/net: add Messenger::try_bind()

in case the server is just fine with any unused local port number, and it
will report it to monitor.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: s/client_msgr/public_msgr/
Kefu Chai [Thu, 31 Jan 2019 04:43:56 +0000 (12:43 +0800)]
crimson/osd: s/client_msgr/public_msgr/

because this messenger also serves requests from librados clients.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/common: add pick_address.cc to crimson-common
Kefu Chai [Thu, 31 Jan 2019 03:21:27 +0000 (11:21 +0800)]
crimson/common: add pick_address.cc to crimson-common

crimson-osd needs pick_address() for initializing the listening
addresses.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocommon/pick_address: add necessary includes
Kefu Chai [Thu, 31 Jan 2019 04:29:51 +0000 (12:29 +0800)]
common/pick_address: add necessary includes

* add needed forward declaration
* add necessary #includes
* move `#include "common/config.h"` to .cc, as it's not part of
interface.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocommon/pick_address: conditional compile for crimson
Kefu Chai [Thu, 31 Jan 2019 04:22:44 +0000 (12:22 +0800)]
common/pick_address: conditional compile for crimson

crimson can only update configuration async, so we cannot let
pick_addreses() call set_val_or_die() without chaning its function
signature.

for implementing crimson-osd, what we need is only a single
pick_addresses() variant, which returns entity_addrvec_t. so we just
enable it if WITH_SEASTAR is defined instead of adding a wrapper or
reimplement all pick_addresses() variants for crimson-osd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/mon: add get_fsid() to mon::Client
Kefu Chai [Wed, 30 Jan 2019 13:03:20 +0000 (21:03 +0800)]
crimson/mon: add get_fsid() to mon::Client

we need it for creating some messages. `MOSDPing`, for instance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: define OSDMapService interface
Kefu Chai [Wed, 30 Jan 2019 08:35:55 +0000 (16:35 +0800)]
crimson/osd: define OSDMapService interface

* define OSDMapService interface to decouple the consumers of
  this interface from its implementation -- the `OSD` class
* implement its methods in `OSD`

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: add editor variable settings
Kefu Chai [Wed, 30 Jan 2019 08:39:13 +0000 (16:39 +0800)]
crimson/osd: add editor variable settings

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: remove unused method
Kefu Chai [Wed, 30 Jan 2019 08:13:53 +0000 (16:13 +0800)]
crimson/osd: remove unused method

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomds: refactor MDSContext inheritance 26123/head
Patrick Donnelly [Wed, 23 Jan 2019 00:54:14 +0000 (16:54 -0800)]
mds: refactor MDSContext inheritance

This commit greatly simplifies things.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26250 from falcon78921/wip-doc-rados-typo
Xie Xingguo [Sat, 2 Feb 2019 00:26:50 +0000 (08:26 +0800)]
Merge pull request #26250 from falcon78921/wip-doc-rados-typo

doc: fixed typo in add-or-rm-mons.rst

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agodoc: fixed typo in add-or-rm-mons.rst 26250/head
James McClune [Fri, 1 Feb 2019 22:12:24 +0000 (17:12 -0500)]
doc: fixed typo in add-or-rm-mons.rst

Redundant use of the word "monitor"

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agocommon: drop decltype(_buffers) from include/buffers.h. 25077/head
Radoslaw Zarzynski [Sun, 18 Nov 2018 04:32:32 +0000 (05:32 +0100)]
common: drop decltype(_buffers) from include/buffers.h.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>