]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoosd:remove unused fileds. 26021/head
Jianpeng Ma [Fri, 18 Jan 2019 05:35:39 +0000 (13:35 +0800)]
osd:remove unused fileds.

Session::received_map_epoch only used by OSD::dispatch_op_fast. But this
func removed in 3cc48278bf0ee5c9535, So remvoe related code.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
6 years agoMerge PR #25900 into master
Sage Weil [Fri, 18 Jan 2019 03:02:59 +0000 (21:02 -0600)]
Merge PR #25900 into master

* refs/pull/25900/head:
qa/tasks/ceph.py: bracket addrvecs in mon_host etc
vstart.sh: bracket addrvec on mon_host for msgr2-only mode
unittest_addrs: entity_addr_t: strengthen tests slightly
common/ceph_argparse: make parse_ip_port_vec handle list of addrs or addrvecs
common/ceph_argparse: parse_ip_port_vec returns addrvecs, not addrds
msg/msg_types: entity_addrvec_t: require brackets for size >1
msg/msg_types: entity_addrvec_t: allow brackets when parsing addrvec to match output
msg/msg_types: entity_addrvec_t: allow only ',' as an addrvec separator
msg/msg_types: entity_addr_t: we should not parse an addrvec
msg/msg_types: entity_addr_t: fix empty string parse cases
msg/msg_types: entity_addr_t: is_ipv6() and is_ipv4()

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge PR #25998 into master
Sage Weil [Fri, 18 Jan 2019 00:51:33 +0000 (18:51 -0600)]
Merge PR #25998 into master

* refs/pull/25998/head:
msg/Dispatcher: remove force_new arg from ms_get_authorizer()
crimson/net: drop authenticator retry
msg/simple: remove forced authorizer refresh

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge PR #25937 into master
Sage Weil [Fri, 18 Jan 2019 00:51:16 +0000 (18:51 -0600)]
Merge PR #25937 into master

* refs/pull/25937/head:
qa: specify filestore for misc tests
osd/objectstore: change osd_objectstore default to bluestore

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #25693 from shun-s/silence-mon-load-metadata
Xie Xingguo [Fri, 18 Jan 2019 00:49:23 +0000 (08:49 +0800)]
Merge pull request #25693 from shun-s/silence-mon-load-metadata

MDSMonitor: silence unable to load metadata

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
6 years agoMerge PR #25849 into master
Sage Weil [Thu, 17 Jan 2019 17:04:30 +0000 (11:04 -0600)]
Merge PR #25849 into master

* refs/pull/25849/head:
qa/suites/rados/upgrade: one mon per node, and enable-msgr2 at end
qa/rados/thrash-old-clients: avoid msgr2
mon: make bootstrap rank check more robust
mon: clean up probe debug output a bit
msg/async: use v1 for v1 <-> [v2,v1] peers
msg/async/AsyncMessenger: drop single-use _send_to
mon/HealthMonitor: raise MON_MSGR2_NOT_ENABLED if mons not bound to msgr2
doc/rados/operations/health-checks: document MON_* health warnings
mon/MonMapMonitor: add 'mon enable-msgr2' command
mon: respawn if rank addr changes
mon/MonMap: calc_addr_mons() after setting rank addrvec

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoqa/suites/rados/upgrade: one mon per node, and enable-msgr2 at end 25849/head
Sage Weil [Wed, 16 Jan 2019 23:27:37 +0000 (17:27 -0600)]
qa/suites/rados/upgrade: one mon per node, and enable-msgr2 at end

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/rados/thrash-old-clients: avoid msgr2
Sage Weil [Thu, 17 Jan 2019 03:42:31 +0000 (21:42 -0600)]
qa/rados/thrash-old-clients: avoid msgr2

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25654 from tspmelo/wip-missing-i18n
Lenz Grimmer [Thu, 17 Jan 2019 15:33:43 +0000 (16:33 +0100)]
Merge pull request #25654 from tspmelo/wip-missing-i18n

mgr/dashboard: Add missing frontend I18N

Reviewed-by: Sebastian Krah <skrah@suse.com>
6 years agoMerge pull request #25997 from zmc/wip-db-graf-validate
Lenz Grimmer [Thu, 17 Jan 2019 15:25:56 +0000 (16:25 +0100)]
Merge pull request #25997 from zmc/wip-db-graf-validate

mgr/dashboard: Fix /api/grafana/validation

Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agomsg/Dispatcher: remove force_new arg from ms_get_authorizer() 25998/head
Sage Weil [Wed, 16 Jan 2019 21:45:32 +0000 (15:45 -0600)]
msg/Dispatcher: remove force_new arg from ms_get_authorizer()

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25870 from votdev/validate_ip_addr
Lenz Grimmer [Thu, 17 Jan 2019 12:08:48 +0000 (13:08 +0100)]
Merge pull request #25870 from votdev/validate_ip_addr

mgr/dashboard: Improve RGW address parser

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
6 years agoMerge pull request #25959 from xiexingguo/wip-memory-leak
Xie Xingguo [Thu, 17 Jan 2019 10:23:23 +0000 (18:23 +0800)]
Merge pull request #25959 from xiexingguo/wip-memory-leak

crush: fix memory leak

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25941 from xiexingguo/wip-warn-enable-upmap
Xie Xingguo [Thu, 17 Jan 2019 10:22:28 +0000 (18:22 +0800)]
Merge pull request #25941 from xiexingguo/wip-warn-enable-upmap

mgr/balancer: blame if upmap won't actually work

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25836 from votdev/improve_rgw_status_endpoint
Lenz Grimmer [Thu, 17 Jan 2019 08:05:34 +0000 (09:05 +0100)]
Merge pull request #25836 from votdev/improve_rgw_status_endpoint

mgr/dashboard: Improve exception handling in /api/rgw/status

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agoMerge pull request #25950 from gregsfortytwo/wip-githubmap
Gregory Farnum [Thu, 17 Jan 2019 05:09:29 +0000 (21:09 -0800)]
Merge pull request #25950 from gregsfortytwo/wip-githubmap

Wip githubmap

6 years agoMerge pull request #25751 from batrick/stackstringstream-reset
Kefu Chai [Thu, 17 Jan 2019 02:43:35 +0000 (10:43 +0800)]
Merge pull request #25751 from batrick/stackstringstream-reset

common: reinit StackStringStream on clear

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMDSMon: silence unable to load metadata 25693/head
Song Shun [Mon, 24 Dec 2018 12:49:24 +0000 (20:49 +0800)]
MDSMon: silence unable to load metadata

  silence unable to load metadata

Signed-off-by: Song Shun <song.shun3@zte.com.cn>
6 years agocrimson/net: drop authenticator retry
Sage Weil [Wed, 16 Jan 2019 21:44:06 +0000 (15:44 -0600)]
crimson/net: drop authenticator retry

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/simple: remove forced authorizer refresh
Sage Weil [Wed, 16 Jan 2019 21:39:53 +0000 (15:39 -0600)]
msg/simple: remove forced authorizer refresh

This synchronous check has always been kludgey; remove it and just fault
instead, just like we did with 794a8f9cf51cf176636d114ccfbbf68fbc304083
in AsyncMessenger.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25994 into master
Patrick Donnelly [Wed, 16 Jan 2019 20:43:35 +0000 (12:43 -0800)]
Merge PR #25994 into master

* refs/pull/25994/head:
qa: silence read-only WRN for damage testing

Reviewed-by: Jeff Layton <jlayton@redhat.com>
6 years agomgr/dashboard: Fix /api/grafana/validation 25997/head
Zack Cerza [Wed, 16 Jan 2019 20:36:23 +0000 (13:36 -0700)]
mgr/dashboard: Fix /api/grafana/validation

If the Grafana URL contains a trailing slash, this endpoint ends up
returning a 404, disabling the integration entirely. Fix that.

Signed-off-by: Zack Cerza <zack@redhat.com>
6 years agoqa: silence read-only WRN for damage testing 25994/head
Patrick Donnelly [Wed, 16 Jan 2019 18:52:09 +0000 (10:52 -0800)]
qa: silence read-only WRN for damage testing

Fixes: http://tracker.ceph.com/issues/37944
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #25934 into master
Sage Weil [Wed, 16 Jan 2019 19:12:35 +0000 (13:12 -0600)]
Merge PR #25934 into master

* refs/pull/25934/head:
msg/msg_type: entity_addr_t: fix legacy decode
msg/msg_types: make set_sockaddr() work with AF_UNSPEC (i.e., zeroed)
msg/msg_types: make set_sockaddr() a bit more robust
msg/async: fix IP inference

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoqa: specify filestore for misc tests 25937/head
Vikhyat Umrao [Tue, 23 Oct 2018 22:51:00 +0000 (15:51 -0700)]
qa: specify filestore for misc tests

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/objectstore: change osd_objectstore default to bluestore
Vikhyat Umrao [Wed, 17 Oct 2018 17:52:52 +0000 (10:52 -0700)]
osd/objectstore: change osd_objectstore default to bluestore
Fixes: http://tracker.ceph.com/issues/36494
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
6 years agoMerge PR #25975 into master
Patrick Donnelly [Wed, 16 Jan 2019 18:17:50 +0000 (10:17 -0800)]
Merge PR #25975 into master

* refs/pull/25975/head:
doc: complete documentation for ceph fs administration commands

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25964 from jmolmo/get_config_replaced
Sebastian Wagner [Wed, 16 Jan 2019 15:50:06 +0000 (16:50 +0100)]
Merge pull request #25964 from jmolmo/get_config_replaced

mgr/ansible: Replace deprecated <get_config> calls

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoMerge PR #25966 into master
Sage Weil [Wed, 16 Jan 2019 14:44:34 +0000 (08:44 -0600)]
Merge PR #25966 into master

* refs/pull/25966/head:
doc: add mimic 13.2.3 and 13.2.4 to releases chart

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agodoc: complete documentation for ceph fs administration commands 25975/head
Patrick Donnelly [Wed, 16 Jan 2019 01:39:50 +0000 (17:39 -0800)]
doc: complete documentation for ceph fs administration commands

Fixes: http://tracker.ceph.com/issues/24580
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoqa/tasks/ceph.py: bracket addrvecs in mon_host etc 25900/head
Sage Weil [Thu, 10 Jan 2019 22:25:00 +0000 (16:25 -0600)]
qa/tasks/ceph.py: bracket addrvecs in mon_host etc

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agovstart.sh: bracket addrvec on mon_host for msgr2-only mode
Sage Weil [Thu, 10 Jan 2019 22:22:47 +0000 (16:22 -0600)]
vstart.sh: bracket addrvec on mon_host for msgr2-only mode

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agounittest_addrs: entity_addr_t: strengthen tests slightly
Sage Weil [Thu, 10 Jan 2019 20:27:22 +0000 (14:27 -0600)]
unittest_addrs: entity_addr_t: strengthen tests slightly

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/ceph_argparse: make parse_ip_port_vec handle list of addrs or addrvecs
Sage Weil [Thu, 10 Jan 2019 20:18:55 +0000 (14:18 -0600)]
common/ceph_argparse: make parse_ip_port_vec handle list of addrs or addrvecs

This helper is only used for mon_host.

We want to be able to list addrs or addrvecs.  It is slight wonky because
you could parse something like

 "1.2.3.4,5.6.7.8"

as either a list of addrs or a list of addrvecs.  Since the addr parse
takes a default type, it is preferred, so first try parsing as an addr
before proceeding.  Addrvecs that are size >1 must have brackets, so we
will always parse "[1.2.3.4,5.6.7.8]" unambiguously (since "[1.2.3.4"
won't parse as an addr).

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/ceph_argparse: parse_ip_port_vec returns addrvecs, not addrds
Sage Weil [Thu, 10 Jan 2019 18:32:42 +0000 (12:32 -0600)]
common/ceph_argparse: parse_ip_port_vec returns addrvecs, not addrds

No functional change yet.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: entity_addrvec_t: require brackets for size >1
Sage Weil [Thu, 10 Jan 2019 19:53:55 +0000 (13:53 -0600)]
msg/msg_types: entity_addrvec_t: require brackets for size >1

Allowing us to parse "1.2.3.4,5.6.7.8" means we can't unambiguously
differentiate between one addrvec and a list of addrvecs, which we'll
want/need to do later.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: entity_addrvec_t: allow brackets when parsing addrvec to match output
Sage Weil [Thu, 10 Jan 2019 19:26:00 +0000 (13:26 -0600)]
msg/msg_types: entity_addrvec_t: allow brackets when parsing addrvec to match output

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: entity_addrvec_t: allow only ',' as an addrvec separator
Sage Weil [Thu, 10 Jan 2019 18:31:56 +0000 (12:31 -0600)]
msg/msg_types: entity_addrvec_t: allow only ',' as an addrvec separator

This will allow us to list addrvecs using [ ;] as separators.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: entity_addr_t: we should not parse an addrvec
Sage Weil [Thu, 10 Jan 2019 20:14:36 +0000 (14:14 -0600)]
msg/msg_types: entity_addr_t: we should not parse an addrvec

Just a sanity check to ensure the addrvec's leading '[' prevents us from
parsing the first addr.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: entity_addr_t: fix empty string parse cases
Sage Weil [Thu, 10 Jan 2019 19:12:34 +0000 (13:12 -0600)]
msg/msg_types: entity_addr_t: fix empty string parse cases

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: entity_addr_t: is_ipv6() and is_ipv4()
Sage Weil [Thu, 10 Jan 2019 19:06:19 +0000 (13:06 -0600)]
msg/msg_types: entity_addr_t: is_ipv6() and is_ipv4()

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_type: entity_addr_t: fix legacy decode 25934/head
Sage Weil [Wed, 16 Jan 2019 13:13:14 +0000 (07:13 -0600)]
msg/msg_type: entity_addr_t: fix legacy decode

If we decode a zeroed sockaddr, we should end up with a TYPE_NONE
entity_addr_t, not v1::/0.

This was obscured by unit test TestAddrvecEncodeAddrDecode3, which
took an addrvec with all v2 addrs, decoded to an addr variable that
previously had v1:1.2.3.4:/0, and asserted the result was not v1::/0.
The test passed before because the set_sockaddr() failed on AF_UNSPEC
and the addr kept v1:1.2.3.4, but with the previous commit it failed
because it equaled v1::/0.  In reality, addr should get - (addr TYPE_NONE).

The TestEmptyAddrvecEncodeAddrDecode test case is similarly adjusted.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25970 from jtlayton/wip-rook
Sebastian Wagner [Wed, 16 Jan 2019 13:49:03 +0000 (14:49 +0100)]
Merge pull request #25970 from jtlayton/wip-rook

Fix rook spec and have service_describe provide rados_config_location field for nfs services

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agomgr/dashboard: Add missing frontend I18N 25654/head
Tiago Melo [Thu, 20 Dec 2018 13:23:36 +0000 (12:23 -0100)]
mgr/dashboard: Add missing frontend I18N

Fixes: http://tracker.ceph.com/issues/36719
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #25376 from rhcs-dashboard/about-modal
Lenz Grimmer [Wed, 16 Jan 2019 11:20:16 +0000 (12:20 +0100)]
Merge pull request #25376 from rhcs-dashboard/about-modal

mgr/dashboard: About modal proposed changes

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #25978 from falcon78921/wip-submitting-patches-doc
Kefu Chai [Wed, 16 Jan 2019 10:42:02 +0000 (18:42 +0800)]
Merge pull request #25978 from falcon78921/wip-submitting-patches-doc

SubmittingPatches: added inline markup to important references

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25865 from Devp00l/wip-issue-37841
Lenz Grimmer [Wed, 16 Jan 2019 10:38:45 +0000 (11:38 +0100)]
Merge pull request #25865 from Devp00l/wip-issue-37841

mgr/dashboard: RbdMirroringService test suite fails in dev mode

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Improve exception handling in /api/rgw/status 25836/head
Volker Theile [Tue, 8 Jan 2019 14:24:59 +0000 (15:24 +0100)]
mgr/dashboard: Improve exception handling in /api/rgw/status

In some cases the exception message was not forwarded to the caller.

Signed-off-by: Volker Theile <vtheile@suse.com>
6 years agomgr/dashboard: About modal proposed changes 25376/head
Kanika Murarka [Sun, 2 Dec 2018 17:49:54 +0000 (23:19 +0530)]
mgr/dashboard: About modal proposed changes

Fixes: http://tracker.ceph.com/issues/35693
Signed-off-by: Kanika Murarka <kmurarka@redhat.com>
6 years agoMerge pull request #25939 from cyx1231st/wip-crimson-msgr-fix-segfault
Kefu Chai [Wed, 16 Jan 2019 07:15:14 +0000 (15:15 +0800)]
Merge pull request #25939 from cyx1231st/wip-crimson-msgr-fix-segfault

crimson/net: fix misc issues for segment-fault and test-failures

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoSubmittingPatches: added inline markup to important references 25978/head
James McClune [Wed, 16 Jan 2019 03:42:05 +0000 (22:42 -0500)]
SubmittingPatches: added inline markup to important references

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agomgr/balancer: blame if upmap won't actually work 25941/head
xie xingguo [Mon, 14 Jan 2019 06:39:18 +0000 (14:39 +0800)]
mgr/balancer: blame if upmap won't actually work

With automatic balancing on, and if mode is set to upmap,
balancer will fail silently if min_compat_client is lower than
luminous.
You can't figure out that unless you take a closer look at the
mgr log, which is super annoying..

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #25940 from xiexingguo/wip-balancer-pools-support
Xie Xingguo [Wed, 16 Jan 2019 00:52:29 +0000 (08:52 +0800)]
Merge pull request #25940 from xiexingguo/wip-balancer-pools-support

mgr/balancer: auto balance a list of pools

Reviewed-by: Sage Weil <sage@redhat.com>
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 agodoc: add mimic 13.2.3 and 13.2.4 to releases chart 25966/head
Nathan Cutler [Tue, 15 Jan 2019 17:40:16 +0000 (18:40 +0100)]
doc: add mimic 13.2.3 and 13.2.4 to releases chart

Signed-off-by: Nathan Cutler <ncutler@suse.com>
6 years agomgr/ansible: Replace deprecated <get_config> calls 25964/head
Juan Miguel Olmo Martínez [Tue, 15 Jan 2019 17:04:06 +0000 (18:04 +0100)]
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>
6 years agomon: make bootstrap rank check more robust
Sage Weil [Tue, 15 Jan 2019 16:42:18 +0000 (10:42 -0600)]
mon: make bootstrap rank check more robust

If we search for myaddrs, then we will detect our rank properly if we were
[a,b] and the a addr got removed.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon: clean up probe debug output a bit
Sage Weil [Tue, 15 Jan 2019 14:53:31 +0000 (08:53 -0600)]
mon: clean up probe debug output a bit

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async: use v1 for v1 <-> [v2,v1] peers
Sage Weil [Tue, 15 Jan 2019 16:38:29 +0000 (10:38 -0600)]
msg/async: use v1 for v1 <-> [v2,v1] peers

If *peers* are communicating, i.e. there may be bidirectional connection
attempts, we must use the same protocol version from both ends or else
we will get very confused.

Fix this by forcing the use of v1 when we

- are bound to a v1 endpoint only (people can't connect to us via v2)
- we are connecting to a *peer*

If it is a non-peer, then connections are uni-directional.  If we both
have v2, we will both use v2.

If we ever switch to [v2,v1], it will be as part of a restart.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async/AsyncMessenger: drop single-use _send_to
Sage Weil [Tue, 15 Jan 2019 16:24:10 +0000 (10:24 -0600)]
msg/async/AsyncMessenger: drop single-use _send_to

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/HealthMonitor: raise MON_MSGR2_NOT_ENABLED if mons not bound to msgr2
Sage Weil [Wed, 9 Jan 2019 03:53:45 +0000 (21:53 -0600)]
mon/HealthMonitor: raise MON_MSGR2_NOT_ENABLED if mons not bound to msgr2

If the ms_bind_msgr2 option is enabled, and all mons are nautilus,
raise a health alert if any mons aren't bound to msgr2 addresses.

Whitelist tests that mon_bind_addrvec=false or mon_bind_msgr2=false.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc/rados/operations/health-checks: document MON_* health warnings
Sage Weil [Wed, 9 Jan 2019 03:38:42 +0000 (21:38 -0600)]
doc/rados/operations/health-checks: document MON_* health warnings

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/MonMapMonitor: add 'mon enable-msgr2' command
Sage Weil [Tue, 8 Jan 2019 22:54:21 +0000 (16:54 -0600)]
mon/MonMapMonitor: add 'mon enable-msgr2' command

This switches any monitor listening on v1:...:6789 only to v2 (on
3300) + v1 (on 6789).  It should be run after upgrading all monitors
to nautilus.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon: respawn if rank addr changes
Sage Weil [Tue, 8 Jan 2019 22:53:13 +0000 (16:53 -0600)]
mon: respawn if rank addr changes

If the address for our rank change, then respawn!

Signed-off-by: Sage Weil <sage@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 agocommon: restore constructor fmtflags on clear 25751/head
Patrick Donnelly [Wed, 2 Jan 2019 18:07:45 +0000 (10:07 -0800)]
common: restore constructor fmtflags on clear

This is to prevent fmtflags changes from a previous use (e.g. debug message)
leaking into the the next (i.e. the next debug message).

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agocommon: use better name reset for clear method
Patrick Donnelly [Mon, 7 Jan 2019 17:46:10 +0000 (09:46 -0800)]
common: use better name reset for clear method

Reset is more analogous to re-initilization which is the intent.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomsg/msg_types: make set_sockaddr() work with AF_UNSPEC (i.e., zeroed)
Sage Weil [Tue, 15 Jan 2019 14:24:48 +0000 (08:24 -0600)]
msg/msg_types: make set_sockaddr() work with AF_UNSPEC (i.e., zeroed)

Signed-off-by: Sage Weil <sage@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 agocrush: fix memory leak 25959/head
xie xingguo [Tue, 15 Jan 2019 08:23:26 +0000 (16:23 +0800)]
crush: fix memory leak

If we remove the last item of bucket, there should still be
one final entry in the __weights__ field of __weight_set__.
Free the corresponding memory before we __null__ the pointer.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
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 agocrimson/net: fix potential parallel write in SocketConnection 25939/head
Yingxin Cheng [Mon, 14 Jan 2019 02:43:05 +0000 (10:43 +0800)]
crimson/net: fix potential parallel write in SocketConnection

All the write/flush in SocketConnection should be serialized, or nasty
segment-fault could happen in seastar which is hard to diagnose.

This fix serializes the writes in `handle_keepalive2()` with other
writes in the open state.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocommon/pick_address: #include "ceph_context.h"
Kefu Chai [Mon, 14 Jan 2019 10:05:00 +0000 (18:05 +0800)]
common/pick_address: #include "ceph_context.h"

pick_address.cc reference cct->_conf, so it should include the
definition of of CephContext explicitly instead of relying on the fact
that some headers it includes include its definition.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocommon/ip_addr: do not support numa preference if WITH_SEASTAR
Kefu Chai [Mon, 14 Jan 2019 10:08:03 +0000 (18:08 +0800)]
common/ip_addr: do not support numa preference if WITH_SEASTAR

in pick_address.cc, set_val_or_die() is called to set the "public_addr"
and/or "cluster_addr". but since the sharded ConfigProxy cannot
set_val_or_die() synchronously, we cannot do it this way.

we need to fix pick_addresses() so it works with seastar later. either
by making the involved function return future<>, or making the set_val()
call non-blocking or synchronous if we can go with 1:1 mapping
threading model.

but at this moment, let's just disable this feature in crimson-osd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agotest/crimson: enable unittest_seastar_messenger
Kefu Chai [Sat, 5 Jan 2019 13:18:18 +0000 (21:18 +0800)]
test/crimson: enable unittest_seastar_messenger

so we can at least compile it, even it fails sometimes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/net: fix unittest_seastar_messenger failure
Yingxin Cheng [Mon, 14 Jan 2019 02:30:28 +0000 (10:30 +0800)]
crimson/net: fix unittest_seastar_messenger failure

unittest_seastar_messenger is failed since updated the seastar repo.
std::system_error (error system:22, Invalid argument) will be raised
from `listener->accept()`, which will be re-raised and not be captured.

This fix is to print error logs for the unexpected exceptions in
`SocketMessenger::start()` and not raise them again.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
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 agomsg/msg_types: make set_sockaddr() a bit more robust
Sage Weil [Tue, 15 Jan 2019 02:48:36 +0000 (20:48 -0600)]
msg/msg_types: make set_sockaddr() a bit more robust

We should keep the unused parts of u zeroed.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async: fix IP inference
Sage Weil [Sat, 12 Jan 2019 12:47:59 +0000 (06:47 -0600)]
msg/async: fix IP inference

socket_addr is *our* socket address; target_addr is the remote peer's
socket address.  We are inferring the remote's IP address here.

Fixes: http://tracker.ceph.com/issues/37882
Signed-off-by: Sage Weil <sage@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 ago.githubmap: remove erroneous jlayton entry 25950/head
Greg Farnum [Mon, 14 Jan 2019 21:28:39 +0000 (13:28 -0800)]
.githubmap: remove erroneous jlayton entry

He's jtlayton on github!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
6 years ago.githubmap: switch Gregory Farnum to Greg
Greg Farnum [Mon, 14 Jan 2019 21:28:20 +0000 (13:28 -0800)]
.githubmap: switch Gregory Farnum to Greg

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
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>