]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agocmake: silence -Wsign-compare in libfmt
Kefu Chai [Mon, 14 Jan 2019 03:26:25 +0000 (11:26 +0800)]
cmake: silence -Wsign-compare in libfmt

* silence -Wsign-compare in libfmt
* silence -Wattributes in seastar

to silence warnings like:

/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/seastar/fmt/include/fmt/format.h:
In instantiation of 'constexpr bool fmt::v5::internal::find(Ptr, Ptr, T,
Ptr&) [with bool IS_CONSTEXPR = false; T = char; Ptr = const wchar_t*]':
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/seastar/fmt/include/fmt/format.h:2154:32:
required from 'constexpr void
fmt::v5::internal::parse_format_string(fmt::v5::basic_string_view<Char>,
Handler&&)::writer::operator()(const Char*, const Char*) [with bool
IS_CONSTEXPR = false; Char = wchar_t; Handler =
fmt::v5::format_handler<fmt::v5::arg_formatter<fmt::v5::back_insert_range<fmt::v5::internal::basic_buffer<wchar_t>
> >, wchar_t,
fmt::v5::basic_format_context<std::back_insert_iterator<fmt::v5::internal::basic_buffer<wchar_t>
>, wchar_t> >&]'
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/seastar/fmt/include/fmt/format.h:2164:3:
required from 'constexpr void
fmt::v5::internal::parse_format_string(fmt::v5::basic_string_view<Char>,
Handler&&) [with bool IS_CONSTEXPR = false; Char = wchar_t; Handler =
fmt::v5::format_handler<fmt::v5::arg_formatter<fmt::v5::back_insert_range<fmt::v5::internal::basic_buffer<wchar_t>
> >, wchar_t,
fmt::v5::basic_format_context<std::back_insert_iterator<fmt::v5::internal::basic_buffer<wchar_t>
>, wchar_t> >&]'
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/seastar/fmt/include/fmt/format.h:3346:39:
required from 'typename Context::iterator fmt::v5::vformat_to(typename
ArgFormatter::range, fmt::v5::basic_string_view<Char>,
fmt::v5::basic_format_args<Context>) [with ArgFormatter =
fmt::v5::arg_formatter<fmt::v5::back_insert_range<fmt::v5::internal::basic_buffer<wchar_t>
> >; Char = wchar_t; Context =
fmt::v5::basic_format_context<std::back_insert_iterator<fmt::v5::internal::basic_buffer<wchar_t>
>, wchar_t>; typename Context::iterator =
std::back_insert_iterator<fmt::v5::internal::basic_buffer<wchar_t> >;
typename ArgFormatter::range =
fmt::v5::back_insert_range<fmt::v5::internal::basic_buffer<wchar_t> >]'
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/seastar/fmt/include/fmt/format.h:3457:64:
required from here

/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/seastar/fmt/include/fmt/format.h:2120:14:
error: comparison of integer expressions of different signedness: 'const
wchar_t' and 'char' [-Werror=sign-compare]
     if (*out == value)
         ~~~~~^~~~~~~~
cc1plus: all warnings being treated as errors

where libfmt compares a wchar_t with a literal '}', which is char.
because the former is unsigned, and the latter is of a signed type,
GCC is annoyed. but since both of them are ASCII, and when performing
comparison, the signed one is converted to unsigned, then result of
comparison is correct per-se. hence, it's safe to silence this very
warning.

and warning like:

/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/seastar/src/core/future-util.cc:61:5:
required from 'seastar::future<> seastar::sleep_abortable(typename
Clock::duration, seastar::abort_source&) [with Clock =
std::chrono::_V2::steady_clock; typename Clock::duration =
std::chrono::duration<long int, std::ratio<1, 1000000000> >]'
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/seastar/src/core/future-util.cc:68:105:
required from here
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/seastar/src/core/future-util.cc:48:28:
error: 'seastar::sleep_abortable(typename Clock::duration,
seastar::abort_source&)::sleeper::sleeper(typename Clock::duration,
seastar::abort_source&) [with Clock = std::chrono::_V2::steady_clock;
typename Clock::duration = std::chrono::duration<long int, std::ratio<1,
1000000000> >]::<lambda()>' declared with greater visibility than the
type of its field 'seastar::sleep_abortable(typename Clock::duration,
seastar::abort_source&)::sleeper::sleeper(typename Clock::duration,
seastar::abort_source&) [with Clock = std::chrono::_V2::steady_clock;
typename Clock::duration = std::chrono::duration<long int, std::ratio<1,
1000000000> >]::<lambda()>::<this capture>' [-Werror=attributes]
                 : tmr([this] { done.set_value(); }) {
                            ^
Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoseastar: pick up the cmake fix
Kefu Chai [Fri, 11 Jan 2019 12:55:01 +0000 (20:55 +0800)]
seastar: pick up the cmake fix

to pick up the fix for seastar/issues/576

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson: set default keyring path
Kefu Chai [Thu, 10 Jan 2019 13:12:25 +0000 (21:12 +0800)]
crimson: set default keyring path

otherwise crimson-osd won't be able to load the keyring

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson: add entity_addrvec_t interfaces to Messenger
Kefu Chai [Wed, 9 Jan 2019 15:51:44 +0000 (23:51 +0800)]
crimson: add entity_addrvec_t interfaces to Messenger

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/monc: add subcription helpers
Kefu Chai [Fri, 4 Jan 2019 12:56:25 +0000 (20:56 +0800)]
crimson/monc: add subcription helpers

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/monc: add start() method
Kefu Chai [Fri, 21 Dec 2018 10:30:37 +0000 (18:30 +0800)]
crimson/monc: add start() method

to boot strap mon::Client once seastar and msgr is ready. this allows us
to allocate mon::Client on stack.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agotest/crimson/monc: start/stop perf counter
Kefu Chai [Fri, 21 Dec 2018 10:34:22 +0000 (18:34 +0800)]
test/crimson/monc: start/stop perf counter

in CephContext::CephContext(), we assume that
ceph::common::local_perf_coll() is ready when a CephContext is to be
contructed. so we need to prepare start it before creating CephContext.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/monc: set name using a setter
Kefu Chai [Wed, 28 Nov 2018 13:00:33 +0000 (21:00 +0800)]
crimson/monc: set name using a setter

* set entity_name using a setter not pass it to constructor, because
  the entity_name is retrieved in seastar's app.run() by ConfigProxy,
  while it'd be simpler if we can instantiate mon::Client in main()
  as a local variable, instead of managing it on heap using a smart
  pointer. so we cannot pass the entity_name as a parameter of ctor.
* also cleanup the #include's, as they are included already in the
  header.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson: pass entity_name and cluster to ctor of ConfigProxy
Kefu Chai [Wed, 28 Nov 2018 12:55:44 +0000 (20:55 +0800)]
crimson: pass entity_name and cluster to ctor of ConfigProxy

as we always need to set entity_name and cluster before start using
ConfigProxy, and we do not read these settings from config file,
this makes these two setting special. so it'd be simpler to just
pass them as parameters of constructor.

and more importantly, we need to parse the command line arguments
using ceph_argparse_early_args() first, as it will consume the parsed
arguments, and leave the unparsed ones in the input parameter of `args`,
and then, we can pass the unparsed args to app.run().

it's not a perfect solution. as there are some options that both parsers
are interested, for instance, `-c` -- ceph take it as the conf file's
path, while seastar takes it as the number of cores to use. but let's
feed ceph's parser first. unless it's fine to drop the backward
compatibility of command line syntax of ceph-osd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agocrimson/auth: add domain specific error types
Kefu Chai [Tue, 9 Oct 2018 07:18:14 +0000 (15:18 +0800)]
crimson/auth: add domain specific error types

Signed-off-by: Kefu Chai <kchai@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 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 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 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 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 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 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>
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 agomgr/balancer: auto balance a list of pools 25940/head
xie xingguo [Mon, 17 Dec 2018 08:53:44 +0000 (16:53 +0800)]
mgr/balancer: auto balance a list of pools

Add support which limits the auto balancer to a comma-separated list of pools.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
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>