]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agocrimson/common/errorator.h: simplify the compound safe_then() variant. 31918/head
Radoslaw Zarzynski [Thu, 28 Nov 2019 15:39:05 +0000 (16:39 +0100)]
crimson/common/errorator.h: simplify the compound safe_then() variant.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: avoid seastar::do_with() due to performance reasons. 30387/head
Radoslaw Zarzynski [Thu, 17 Oct 2019 22:22:44 +0000 (00:22 +0200)]
crimson: avoid seastar::do_with() due to performance reasons.

`seastar::do_with(T&& rvalue, F&& f) takes object for lifetime
extension by rvalue reference. This imposes materialization of
a temporary to move from even when `do_with()` is being called
like:

  `do_with(OpsExecuter{...}, [] { /* ... */)`.

The reason behind that is following language rule:

  "Temporary objects are created when a prvalue is materialized
  so that it can be used as a glvalue, which occurs (since C++17)
  in the following situations:

   * binding a reference to a prvalue"
  (from: "Temporary object lifetime", cppreference.com)

As OpsExecuter is pretty heavy-weight, it is reasonable to avoid
`do_with()` and perform the lifetime extension with smart pointer.
Additional benefit is squeezing plain-to-errorated conversion in
`seastar::internal::do_with_state::get_future()`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: OpsExecuter::submit_changes() operates on errorated future.
Radoslaw Zarzynski [Thu, 17 Oct 2019 09:05:45 +0000 (11:05 +0200)]
crimson: OpsExecuter::submit_changes() operates on errorated future.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: introduce make_exception_future to errorator.
Radoslaw Zarzynski [Tue, 15 Oct 2019 22:32:13 +0000 (00:32 +0200)]
crimson: introduce make_exception_future to errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: drop extra copy in errorator's appliance.
Radoslaw Zarzynski [Sun, 29 Sep 2019 20:28:57 +0000 (22:28 +0200)]
crimson: drop extra copy in errorator's appliance.

Save few unneeded instructions on the read path. I expect
negligible impact on performance. The patch is rather for
easier reading of assembler.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: dissect error handling path from ::safe_then().
Radoslaw Zarzynski [Sun, 29 Sep 2019 01:49:32 +0000 (03:49 +0200)]
crimson: dissect error handling path from ::safe_then().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: drop ceph::do_with(). Specialize sestar::do_with() instead.
Radoslaw Zarzynski [Thu, 17 Oct 2019 08:56:22 +0000 (10:56 +0200)]
crimson: drop ceph::do_with(). Specialize sestar::do_with() instead.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: specialize seastar::futurize to avoid copying.
Radoslaw Zarzynski [Sun, 29 Sep 2019 13:02:38 +0000 (15:02 +0200)]
crimson: specialize seastar::futurize to avoid copying.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: _load_{os,ss} return errorated future to avoid copying.
Radoslaw Zarzynski [Thu, 17 Oct 2019 09:05:05 +0000 (11:05 +0200)]
crimson: _load_{os,ss} return errorated future to avoid copying.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: drop as_plain_future() from errorated futures.
Radoslaw Zarzynski [Sun, 29 Sep 2019 13:02:06 +0000 (15:02 +0200)]
crimson: drop as_plain_future() from errorated futures.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: replace make_plain_exception_future() with errorize{}.
Radoslaw Zarzynski [Thu, 26 Sep 2019 22:09:51 +0000 (00:09 +0200)]
crimson: replace make_plain_exception_future() with errorize{}.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: clean-up errorator's error set checks.
Radoslaw Zarzynski [Thu, 26 Sep 2019 11:43:39 +0000 (13:43 +0200)]
crimson: clean-up errorator's error set checks.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: apply errorator along the stat path.
Radoslaw Zarzynski [Tue, 24 Sep 2019 19:49:48 +0000 (21:49 +0200)]
crimson/osd: apply errorator along the stat path.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: introduce passing-further variant of safe_then() to errorator.
Radoslaw Zarzynski [Tue, 24 Sep 2019 18:48:18 +0000 (20:48 +0200)]
crimson: introduce passing-further variant of safe_then() to errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: switch small occurances of throwing to errorator.
Radoslaw Zarzynski [Tue, 24 Sep 2019 18:23:20 +0000 (20:23 +0200)]
crimson/osd: switch small occurances of throwing to errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: apply errorator along the get_object_state() path.
Radoslaw Zarzynski [Tue, 24 Sep 2019 17:35:00 +0000 (19:35 +0200)]
crimson/osd: apply errorator along the get_object_state() path.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: avoid plainifying/errorating in crimson::for_for_each().
Radoslaw Zarzynski [Thu, 17 Oct 2019 15:45:22 +0000 (17:45 +0200)]
crimson: avoid plainifying/errorating in crimson::for_for_each().

We don't want to convert between `errorator::future` and
`seastar::future` back and forth due to performance penalty.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: implement ceph::do_{for_each(),do_with()} helpers.
Radoslaw Zarzynski [Mon, 23 Sep 2019 22:01:08 +0000 (00:01 +0200)]
crimson: implement ceph::do_{for_each(),do_with()} helpers.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: apply errorator to op-taking PGBackend::getxattr().
Radoslaw Zarzynski [Mon, 23 Sep 2019 17:18:29 +0000 (19:18 +0200)]
crimson/osd: apply errorator to op-taking PGBackend::getxattr().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: apply the errorator along execute_osd_op() path.
Radoslaw Zarzynski [Mon, 23 Sep 2019 15:45:10 +0000 (17:45 +0200)]
crimson/osd: apply the errorator along execute_osd_op() path.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: delegate executing osd op in objclass.
Radoslaw Zarzynski [Mon, 23 Sep 2019 17:04:22 +0000 (19:04 +0200)]
crimson/osd: delegate executing osd op in objclass.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: add support for unificating errorators into compounds.
Radoslaw Zarzynski [Mon, 23 Sep 2019 15:15:47 +0000 (17:15 +0200)]
crimson: add support for unificating errorators into compounds.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: deduplicate errorator's error set.
Radoslaw Zarzynski [Fri, 20 Sep 2019 19:24:30 +0000 (21:24 +0200)]
crimson: deduplicate errorator's error set.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: use std::error_code instances for errors.
Radoslaw Zarzynski [Fri, 20 Sep 2019 11:33:08 +0000 (13:33 +0200)]
crimson: use std::error_code instances for errors.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: unthrowable_wrapper::handle() accepts type-taking lambda.
Radoslaw Zarzynski [Fri, 20 Sep 2019 11:32:37 +0000 (13:32 +0200)]
crimson: unthrowable_wrapper::handle() accepts type-taking lambda.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: erroratorize the do_op_call() path more.
Radoslaw Zarzynski [Wed, 18 Sep 2019 15:25:55 +0000 (17:25 +0200)]
crimson/osd: erroratorize the do_op_call() path more.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: apply errorator to do_op_call() path.
Radoslaw Zarzynski [Tue, 17 Sep 2019 18:33:00 +0000 (20:33 +0200)]
crimson/osd: apply errorator to do_op_call() path.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: introduce make_plain_exception_future() to errorator.
Radoslaw Zarzynski [Tue, 17 Sep 2019 18:31:40 +0000 (20:31 +0200)]
crimson: introduce make_plain_exception_future() to errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: introduce stateful errors to errorator.
Radoslaw Zarzynski [Tue, 17 Sep 2019 18:31:26 +0000 (20:31 +0200)]
crimson: introduce stateful errors to errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: handle attr retrieval errors with all_same_way().
Radoslaw Zarzynski [Sun, 15 Sep 2019 15:18:33 +0000 (17:18 +0200)]
crimson/osd: handle attr retrieval errors with all_same_way().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: introduce all_same_way() to errorator.
Radoslaw Zarzynski [Sun, 15 Sep 2019 15:17:45 +0000 (17:17 +0200)]
crimson: introduce all_same_way() to errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: don't allocate exception_ptr when returning error code.
Radoslaw Zarzynski [Sun, 15 Sep 2019 14:01:39 +0000 (16:01 +0200)]
crimson: don't allocate exception_ptr when returning error code.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: formalize the interface between errors and errorators.
Radoslaw Zarzynski [Sun, 15 Sep 2019 13:39:55 +0000 (15:39 +0200)]
crimson: formalize the interface between errors and errorators.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: apply errorator along the read path, part 5.
Radoslaw Zarzynski [Fri, 13 Sep 2019 22:43:57 +0000 (00:43 +0200)]
crimson/osd: apply errorator along the read path, part 5.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: rework discarding errors in errorator.
Radoslaw Zarzynski [Fri, 13 Sep 2019 22:42:53 +0000 (00:42 +0200)]
crimson: rework discarding errors in errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: introduce syntactic sugar for visiting errorator.
Radoslaw Zarzynski [Thu, 12 Sep 2019 23:02:56 +0000 (01:02 +0200)]
crimson: introduce syntactic sugar for visiting errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: migrate make_error<T> to unthrowable_wrapper.
Radoslaw Zarzynski [Thu, 12 Sep 2019 22:57:34 +0000 (00:57 +0200)]
crimson: migrate make_error<T> to unthrowable_wrapper.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: abstract the error type in unthrowable_wrapper.
Radoslaw Zarzynski [Thu, 12 Sep 2019 22:40:28 +0000 (00:40 +0200)]
crimson: abstract the error type in unthrowable_wrapper.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: decouple errorator from unthrowable_wrapper.
Radoslaw Zarzynski [Thu, 12 Sep 2019 22:39:40 +0000 (00:39 +0200)]
crimson: decouple errorator from unthrowable_wrapper.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: decouple errorator from unthrowable_wrapper::instance.
Radoslaw Zarzynski [Thu, 12 Sep 2019 12:34:01 +0000 (14:34 +0200)]
crimson: decouple errorator from unthrowable_wrapper::instance.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: add more static asserts to errorator.
Radoslaw Zarzynski [Tue, 10 Sep 2019 16:21:10 +0000 (18:21 +0200)]
crimson: add more static asserts to errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: dissect maybe_handler_error_t from errorator template.
Radoslaw Zarzynski [Tue, 10 Sep 2019 21:59:47 +0000 (23:59 +0200)]
crimson: dissect maybe_handler_error_t from errorator template.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: apply errorator along the read path, part 4.
Radoslaw Zarzynski [Tue, 10 Sep 2019 12:31:57 +0000 (14:31 +0200)]
crimson/osd: apply errorator along the read path, part 4.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: let an errorator to be converted into more errorated one.
Radoslaw Zarzynski [Mon, 9 Sep 2019 20:42:21 +0000 (22:42 +0200)]
crimson: let an errorator to be converted into more errorated one.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: apply errorator along the read path, part 3.
Radoslaw Zarzynski [Mon, 9 Sep 2019 13:44:40 +0000 (15:44 +0200)]
crimson/osd: apply errorator along the read path, part 3.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: facilitate errorator extending with new errors.
Radoslaw Zarzynski [Mon, 9 Sep 2019 13:40:58 +0000 (15:40 +0200)]
crimson: facilitate errorator extending with new errors.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: apply errorator along the read path, part 2.
Radoslaw Zarzynski [Fri, 13 Sep 2019 16:01:59 +0000 (18:01 +0200)]
crimson/osd: apply errorator along the read path, part 2.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/os, crimson/osd: apply errorator along the read path, part 1.
Radoslaw Zarzynski [Mon, 9 Sep 2019 12:48:19 +0000 (14:48 +0200)]
crimson/os, crimson/osd: apply errorator along the read path, part 1.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: bring discard_all{} to errorator.
Radoslaw Zarzynski [Mon, 9 Sep 2019 11:28:50 +0000 (13:28 +0200)]
crimson: bring discard_all{} to errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: bring compile time-verified chaining of errorators.
Radoslaw Zarzynski [Fri, 6 Sep 2019 11:10:41 +0000 (13:10 +0200)]
crimson: bring compile time-verified chaining of errorators.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: dissect crc checking on reads into separated procedure.
Radoslaw Zarzynski [Thu, 5 Sep 2019 17:11:36 +0000 (19:11 +0200)]
crimson/osd: dissect crc checking on reads into separated procedure.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/os: alias errorator for CyanStore::get_attrs().
Radoslaw Zarzynski [Sat, 14 Sep 2019 10:22:34 +0000 (12:22 +0200)]
crimson/os: alias errorator for CyanStore::get_attrs().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/os: drop the old FuturizedStore::Exception class.
Radoslaw Zarzynski [Mon, 26 Aug 2019 10:38:21 +0000 (12:38 +0200)]
crimson/os: drop the old FuturizedStore::Exception class.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: bring crimson::errorator with its first appliance.
Radoslaw Zarzynski [Sun, 25 Aug 2019 14:46:02 +0000 (16:46 +0200)]
crimson: bring crimson::errorator with its first appliance.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agomgr/dashboard: Support RBD namespaces (#30935)
Lenz Grimmer [Tue, 12 Nov 2019 09:50:50 +0000 (09:50 +0000)]
mgr/dashboard: Support RBD namespaces (#30935)

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #31357 from votdev/improve_timediff_unittest
Lenz Grimmer [Tue, 12 Nov 2019 09:49:23 +0000 (09:49 +0000)]
Merge pull request #31357 from votdev/improve_timediff_unittest

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #30534 from jiahuizeng/osd_dev_node
Jan Fajerski [Tue, 12 Nov 2019 09:23:07 +0000 (10:23 +0100)]
Merge pull request #30534 from jiahuizeng/osd_dev_node

mgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or bluestore

5 years agoMerge pull request #31431 from jschmid1/fix_cherrypy_imports
Kefu Chai [Tue, 12 Nov 2019 08:55:47 +0000 (16:55 +0800)]
Merge pull request #31431 from jschmid1/fix_cherrypy_imports

mgr/dashboard: cheroot moved into a separate project

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomgr: Run python unit tests with tox in the mgr (#30364)
Lenz Grimmer [Tue, 12 Nov 2019 08:34:02 +0000 (08:34 +0000)]
mgr: Run python unit tests with tox in the mgr (#30364)

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/dashboard: Remove compression mode unset in pool from (#31376)
Lenz Grimmer [Tue, 12 Nov 2019 08:29:26 +0000 (08:29 +0000)]
mgr/dashboard: Remove compression mode unset in pool from (#31376)

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #29944 from xxhdx1985126/wip-fix-blustore-fadvice_flags-leak
Kefu Chai [Tue, 12 Nov 2019 08:17:15 +0000 (16:17 +0800)]
Merge pull request #29944 from xxhdx1985126/wip-fix-blustore-fadvice_flags-leak

osd: copy ObjectOperation::BufferUpdate::Write::fadvise_flag to ceph::os::Transaction

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31333 from adamemerson/wip-who-warns-the-warnings
Kefu Chai [Tue, 12 Nov 2019 08:14:43 +0000 (16:14 +0800)]
Merge pull request #31333 from adamemerson/wip-who-warns-the-warnings

src: use un-deprecated version of aio_create_completion

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31416 from sseshasa/wip-41666-replicaSizeWarn
Sridhar Seshasayee [Tue, 12 Nov 2019 06:36:46 +0000 (12:06 +0530)]
Merge pull request #31416 from sseshasa/wip-41666-replicaSizeWarn

osd/OSDMap: Show health warning if a pool is configured with size 1

Reviewed-by: Sage Weil <sweil@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31475 from zdover23/wip-doc-community-calendar
Brad Hubbard [Tue, 12 Nov 2019 04:46:15 +0000 (14:46 +1000)]
Merge pull request #31475 from zdover23/wip-doc-community-calendar

doc: Added a link to Ceph Community Calendar.

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
5 years agodoc: Added a link to Ceph Community Calendar. 31475/head
Zac Dover [Thu, 7 Nov 2019 22:40:35 +0000 (08:40 +1000)]
doc: Added a link to Ceph Community Calendar.

Co-Authored by: Neha Ojha <nojha@redhat.com>
Signed-off-by: Zac Dover <zac.dover@gmail.com>
5 years agoMerge PR #31501 into master
Sage Weil [Tue, 12 Nov 2019 00:09:29 +0000 (18:09 -0600)]
Merge PR #31501 into master

* refs/pull/31501/head:
ceph-mon: bind to public_addrv if set (before public_addr or public_network)
common/options: add public_addrv
common/options: fix ADDRVEC parsing
ceph-daemon: support --mon-addrv for deploy subcommand

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #30914 into master
Patrick Donnelly [Mon, 11 Nov 2019 23:21:30 +0000 (15:21 -0800)]
Merge PR #30914 into master

* refs/pull/30914/head:
ceph: Add doc for deploying cephfs-nfs cluster using rook

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge PR #31540 into master
Sage Weil [Mon, 11 Nov 2019 21:50:55 +0000 (15:50 -0600)]
Merge PR #31540 into master

* refs/pull/31540/head:
ceph-daemon: make ps1 a raw string

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: make ps1 a raw string 31540/head
Michael Fritch [Mon, 11 Nov 2019 21:07:49 +0000 (14:07 -0700)]
ceph-daemon: make ps1 a raw string

python3 interprets '\u' as a unicode escape

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31024 into master
Patrick Donnelly [Mon, 11 Nov 2019 20:21:34 +0000 (12:21 -0800)]
Merge PR #31024 into master

* refs/pull/31024/head:
doc: improve in mount.ceph man page
doc: describe mds_namespace option in mount.ceph man page

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #30911 into master
Patrick Donnelly [Mon, 11 Nov 2019 20:03:21 +0000 (12:03 -0800)]
Merge PR #30911 into master

* refs/pull/30911/head:
doc/ceph-fuse: describe -n option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Douglas Fuller <dfuller@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge PR #30657 into master
Patrick Donnelly [Mon, 11 Nov 2019 18:45:10 +0000 (10:45 -0800)]
Merge PR #30657 into master

* refs/pull/30657/head:
test_cephfs_shell: pass arg to "help" in test_help
cephfs-shell: set exit_code when an error occurs
cephfs-shell: print traceback only when debug switch is on
cephfs-shell: catch libcephfs.Error only in onecmd()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31452 into master
Patrick Donnelly [Mon, 11 Nov 2019 18:41:24 +0000 (10:41 -0800)]
Merge PR #31452 into master

* refs/pull/31452/head:
Add chown ceph:ceph for /tmp/ceph.mon.keyring

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31538 into master
Sage Weil [Mon, 11 Nov 2019 18:14:35 +0000 (12:14 -0600)]
Merge PR #31538 into master

* refs/pull/31538/head:
ceph-daemon: do not fetch daemon detail when removing a cluster
ceph-daemon: ls: add --no-detail

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoceph-daemon: do not fetch daemon detail when removing a cluster 31538/head
Sage Weil [Mon, 11 Nov 2019 17:05:00 +0000 (11:05 -0600)]
ceph-daemon: do not fetch daemon detail when removing a cluster

It's slow and not needed.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: ls: add --no-detail
Sage Weil [Mon, 11 Nov 2019 17:04:22 +0000 (11:04 -0600)]
ceph-daemon: ls: add --no-detail

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31387 into master
Sage Weil [Mon, 11 Nov 2019 16:15:45 +0000 (10:15 -0600)]
Merge PR #31387 into master

* refs/pull/31387/head:
src/CMakeLists: remove leading 'v' from 'git describe' version

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31524 into master
Sage Weil [Mon, 11 Nov 2019 16:15:18 +0000 (10:15 -0600)]
Merge PR #31524 into master

* refs/pull/31524/head:
mgr/ssh: Fix various Python issues.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
5 years agomgr/dashboard: Improve position of MDS chart tooltip (#31368)
Lenz Grimmer [Mon, 11 Nov 2019 15:29:11 +0000 (15:29 +0000)]
mgr/dashboard: Improve position of MDS chart tooltip (#31368)

mgr/dashboard: Improve position of MDS chart tooltip

Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #31512 into master
Sage Weil [Mon, 11 Nov 2019 15:28:01 +0000 (09:28 -0600)]
Merge PR #31512 into master

* refs/pull/31512/head:
mgr/ssh: allow passing LV to 'orchestrator osd create'

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/dashboard: Support RBD namespaces 30935/head
Ricardo Marques [Wed, 31 Jul 2019 09:34:57 +0000 (10:34 +0100)]
mgr/dashboard: Support RBD namespaces

Fixes: https://tracker.ceph.com/issues/25125
Signed-off-by: Ricardo Marques <rimarques@suse.com>
5 years agomgr/dashboard: Fix data point alignment in MDS counters chart (#31288)
Lenz Grimmer [Mon, 11 Nov 2019 13:19:54 +0000 (13:19 +0000)]
mgr/dashboard: Fix data point alignment in MDS counters chart (#31288)

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31519 from votdev/fix_ssh_vagrant
Sebastian Wagner [Mon, 11 Nov 2019 13:00:24 +0000 (14:00 +0100)]
Merge pull request #31519 from votdev/fix_ssh_vagrant

mgr/ssh: Install SSH public key in Vagrantfile box fails

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/ssh: Fix various Python issues. 31524/head
Volker Theile [Mon, 11 Nov 2019 10:52:35 +0000 (11:52 +0100)]
mgr/ssh: Fix various Python issues.

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: RBD tests must use pools with power-of-two pg_n… (#31490)
Lenz Grimmer [Mon, 11 Nov 2019 09:58:39 +0000 (09:58 +0000)]
mgr/dashboard: RBD tests must use pools with power-of-two pg_n… (#31490)

mgr/dashboard: RBD tests must use pools with power-of-two pg_num

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/ssh: Install SSH public key in Vagrantfile box fails 31519/head
Volker Theile [Mon, 11 Nov 2019 09:15:18 +0000 (10:15 +0100)]
mgr/ssh: Install SSH public key in Vagrantfile box fails

The current implementation to copy the host users SSH public key into the Vagrant box does not work with Vagrant 2.2.6.

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31419 from smithfarm/wip-cbs-5
Nathan Cutler [Mon, 11 Nov 2019 08:31:24 +0000 (09:31 +0100)]
Merge pull request #31419 from smithfarm/wip-cbs-5

ceph-backport.sh: guess component with --existing-pr

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoosd/OSDMap: Show health warning if a pool is configured with size 1 31416/head
Sridhar Seshasayee [Tue, 5 Nov 2019 10:40:14 +0000 (16:10 +0530)]
osd/OSDMap: Show health warning if a pool is configured with size 1

Introduce a config option called 'mon_warn_on_pool_no_redundancy' that is
used to show a health warning if any pool in the ceph cluster is
configured with a size of 1. The user can mute/unmute the warning using
'ceph health mute/unmute POOL_NO_REDUNDANCY'.

Add standalone test to verify warning on setting pool size=1. Set the
associated warning to 'false' in ceph.conf.template under qa/tasks so
that existing tests do not break.

Fixes: https://tracker.ceph.com/issues/41666
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
5 years agoAdd chown ceph:ceph for /tmp/ceph.mon.keyring 31452/head
oneoneonepig [Thu, 7 Nov 2019 05:01:53 +0000 (13:01 +0800)]
Add chown ceph:ceph for /tmp/ceph.mon.keyring

The keyring will be 600 by default with the owner of the current user who issues the command, which will make command "sudo -u ceph ceph-mon --mkfs" fail since the user "ceph" don't have access to the keyring file.
Because of that, the mon data directory won't have keyring and when "sudo systemctl start ceph-mon" it will show error "unable to read magic from mon data"

Signed-off-by: Jeffrey Chu <peihuachu1112@gmail.com>
5 years agoMerge pull request #31271 from ivancich/wip-fix-cancel-bucket-reshard
J. Eric Ivancich [Sun, 10 Nov 2019 18:16:49 +0000 (13:16 -0500)]
Merge pull request #31271 from ivancich/wip-fix-cancel-bucket-reshard

rgw: allow reshard log entries for non-existent buckets to be cancelled

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge pull request #31492 from jan--f/c-v-add-part-size
Jan Fajerski [Sun, 10 Nov 2019 16:25:26 +0000 (17:25 +0100)]
Merge pull request #31492 from jan--f/c-v-add-part-size

ceph-volume: add proper size attribute to partitions

5 years agomgr/ssh: allow passing LV to 'orchestrator osd create' 31512/head
Sage Weil [Sun, 10 Nov 2019 15:08:56 +0000 (09:08 -0600)]
mgr/ssh: allow passing LV to 'orchestrator osd create'

In this case,

 ceph orchestrator osd create smithi009:/dev/vg_nvme/lv_1

produced

    "0": [
        {
            "devices": [
                "/dev/nvme0n1"
            ],
            "lv_name": "lv_1",
            "lv_path": "/dev/vg_nvme/lv_1",
            "lv_size": "89.40g",
            "lv_tags": "ceph.block_device=/dev/vg_nvme/lv_1,ceph.block_uuid=a1vfDi-0jor-VEPK-DZVd-K90y-cqG1-QoXr9l,ceph.cephx_lockbox_secret=,ceph.cluster_fsid=5d6d2c1c-0362-11ea-825a-001a4aab830c,ceph.cluster_name=ceph,ceph.crush_device_class=None,ceph.encrypted=0,ceph.osd_fsid=04175a6e-55e7-4244-b683-79da76f723af,ceph.osd_id=0,ceph.type=block,ceph.vdo=0",
            "lv_uuid": "a1vfDi-0jor-VEPK-DZVd-K90y-cqG1-QoXr9l",
            "name": "lv_1",
            "path": "/dev/vg_nvme/lv_1",
            "tags": {
                "ceph.block_device": "/dev/vg_nvme/lv_1",
                "ceph.block_uuid": "a1vfDi-0jor-VEPK-DZVd-K90y-cqG1-QoXr9l",
                "ceph.cephx_lockbox_secret": "",
                "ceph.cluster_fsid": "5d6d2c1c-0362-11ea-825a-001a4aab830c",
                "ceph.cluster_name": "ceph",
                "ceph.crush_device_class": "None",
                "ceph.encrypted": "0",
                "ceph.osd_fsid": "04175a6e-55e7-4244-b683-79da76f723af",
                "ceph.osd_id": "0",
                "ceph.type": "block",
                "ceph.vdo": "0"
            },
            "type": "block",
            "vg_name": "vg_nvme"
        }
    ],

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #30853 from ivancich/wip-tune-sharded-bucket-listing
J. Eric Ivancich [Sun, 10 Nov 2019 05:07:15 +0000 (00:07 -0500)]
Merge pull request #30853 from ivancich/wip-tune-sharded-bucket-listing

rgw: reduce per-shard entry count during ordered bucket listing

5 years agoMerge pull request #31323 from ivancich/wip-autoclean-reshard-long-entries
J. Eric Ivancich [Sun, 10 Nov 2019 05:06:21 +0000 (00:06 -0500)]
Merge pull request #31323 from ivancich/wip-autoclean-reshard-long-entries

rgw: auto-clean reshard queue entries for non-existent buckets

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge PR #31505 into master
Sage Weil [Sun, 10 Nov 2019 02:38:49 +0000 (20:38 -0600)]
Merge PR #31505 into master

* refs/pull/31505/head:
mgr/ssh: take IP, CIDR, or addrvec for new mon(s)

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31507 into master
Sage Weil [Sun, 10 Nov 2019 02:38:35 +0000 (20:38 -0600)]
Merge PR #31507 into master

* refs/pull/31507/head:
ceph-daemon: ceph/daemon-base:latest-master-devel

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-mon: bind to public_addrv if set (before public_addr or public_network) 31501/head
Sage Weil [Fri, 8 Nov 2019 22:35:28 +0000 (16:35 -0600)]
ceph-mon: bind to public_addrv if set (before public_addr or public_network)

This lets you specify a precise addrvec for the monitor to bind to,
instead of inferring a v1 or v2 address from the port number, or assuming
both with default ports, or v2 only with an unrecognized port.

I unfortunately don't quite remember why I didn't make public_addr a
ADDRVEC option way back in nautilus--I only remmeber that it was going to
cause problems.  Adding a separate addrv option here is safe.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocommon/options: add public_addrv
Sage Weil [Fri, 8 Nov 2019 22:29:50 +0000 (16:29 -0600)]
common/options: add public_addrv

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31474 into master
Sage Weil [Sat, 9 Nov 2019 21:39:19 +0000 (15:39 -0600)]
Merge PR #31474 into master

* refs/pull/31474/head:
mgr/devicehealth: ensure we don't store empty objects

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoceph-daemon: ceph/daemon-base:latest-master-devel 31507/head
Sage Weil [Sat, 9 Nov 2019 14:01:37 +0000 (08:01 -0600)]
ceph-daemon: ceph/daemon-base:latest-master-devel

The -devel one rebuilds daily, while latest-master rebuilds when
ceph-container.git changes.

Signed-off-by: Sage Weil <sage@redhat.com>