]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agomgr/rook: Add timezone info 39373/head
Varsha Rao [Tue, 9 Feb 2021 09:56:16 +0000 (15:26 +0530)]
mgr/rook: Add timezone info

Recently time zone info was added[1] to various properties like created,
started and others in cephadm and changes were made to orchestrator module too.
Let's add timezone info to rook as well, which will fix the type error.

[1] https://github.com/ceph/ceph/pull/37920

Fixes: https://tracker.ceph.com/issues/49126
Signed-off-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #39345 from tchaikov/wip-crimson-move
Kefu Chai [Tue, 9 Feb 2021 05:51:01 +0000 (13:51 +0800)]
Merge pull request #39345 from tchaikov/wip-crimson-move

crimson/osd: do not pass oop as a const ref and cleanups

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agoMerge pull request #39353 from lxbsz/minor
Venky Shankar [Tue, 9 Feb 2021 05:13:10 +0000 (10:43 +0530)]
Merge pull request #39353 from lxbsz/minor

client: use scoped_lock instead of unique_lock

4 years agoMerge pull request #39367 from runsisi/wip-fix-spec
Kefu Chai [Tue, 9 Feb 2021 04:23:50 +0000 (12:23 +0800)]
Merge pull request #39367 from runsisi/wip-fix-spec

ceph.spec.in: fix missing backslash for line continuation

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os: disable code block only executed by Debug build 39345/head
Kefu Chai [Mon, 8 Feb 2021 16:35:59 +0000 (00:35 +0800)]
crimson/os: disable code block only executed by Debug build

silences warning like:

warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
  ).safe_then([this, target_size] {
               ^~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: capture labels using new variables
Kefu Chai [Mon, 8 Feb 2021 16:34:25 +0000 (00:34 +0800)]
crimson/osd: capture labels using new variables

structured binding does not define variables, let's capture the bound
"variables" using variables defined in the capture list.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/common: mark ExitBarrier final
Kefu Chai [Mon, 8 Feb 2021 16:27:27 +0000 (00:27 +0800)]
crimson/common: mark ExitBarrier final

to silence -Wfinal-dtor-non-final-class warnings like

operation.h:461:20: warning: class with destructor marked 'final' cannot
be inherited from [-Wfinal-dtor-non-final-class]
    ~ExitBarrier() final {
                   ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: refactor ClientRequest::do_process()
Kefu Chai [Mon, 8 Feb 2021 05:11:37 +0000 (13:11 +0800)]
crimson/osd: refactor ClientRequest::do_process()

instead of using a local lambda which tries to have a single point
for handling both the happy path and failure path, it'd be simpler
to just early return if we fail to handle a request,

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: do not pass oop as a const ref
Kefu Chai [Sun, 7 Feb 2021 15:23:33 +0000 (23:23 +0800)]
crimson/osd: do not pass oop as a const ref

before this change, std::move(oop) will create a copy of oop.
after this change, std::move(oop) actually moves oop.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: do not pass ops to submit_transaction() separately
Kefu Chai [Sun, 7 Feb 2021 15:12:14 +0000 (23:12 +0800)]
crimson/osd: do not pass ops to submit_transaction() separately

the order of evaluation of function arguments is unspecified with some
exceptions. but in this case, the reason why ops is still valid is that
the parameter type of `osd_op_p` is `const osd_op_params_t&`. so a copy
is passed to it.

to enable us to actually move `osd_op_p`, in this change, the
osd_op_p.req->ops is used instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: extract methods out of ClientRequest::process_op()
Kefu Chai [Mon, 8 Feb 2021 10:19:25 +0000 (18:19 +0800)]
crimson/osd: extract methods out of ClientRequest::process_op()

* do_recover_missing()
* do_process()

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: do not move op_params_p in fill_op_params_bump_pg_version()
Kefu Chai [Sun, 7 Feb 2021 06:46:12 +0000 (14:46 +0800)]
crimson/osd: do not move op_params_p in fill_op_params_bump_pg_version()

it's confusing to move the parameter for updating it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: do not add parentheses unless necessary
Kefu Chai [Sun, 7 Feb 2021 06:35:50 +0000 (14:35 +0800)]
crimson/osd: do not add parentheses unless necessary

do not use the notation of

[]() -> return_type {

unless it helps with readability or we have to do so.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: remove no-op func passed to OpsExecuter::flush_changes()
Kefu Chai [Sun, 7 Feb 2021 05:53:11 +0000 (13:53 +0800)]
crimson/osd: remove no-op func passed to OpsExecuter::flush_changes()

no need to create an empty func for an request which creates no
transactions.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: rename PG::rep_repair_primary_object() to repair_object()
Kefu Chai [Sun, 7 Feb 2021 04:24:21 +0000 (12:24 +0800)]
crimson/osd: rename PG::rep_repair_primary_object() to repair_object()

as we should expose the internals using the name of interface, and there
is no need to differentiate rep_repair_primary_object() from another
repair method.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39361 from sebastian-philipp/orch-fix-flake8
Kefu Chai [Tue, 9 Feb 2021 02:15:36 +0000 (10:15 +0800)]
Merge pull request #39361 from sebastian-philipp/orch-fix-flake8

mgr/orch: Fix flake8 error

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoceph.spec.in: fix missing backslash for line continuation 39367/head
luo.runbing [Tue, 9 Feb 2021 01:18:18 +0000 (09:18 +0800)]
ceph.spec.in: fix missing backslash for line continuation

it errors while building without lua_packages:

+ -DBOOST_J=102 -DWITH_GRAFANA=ON
/var/tmp/rpm-tmp.aq2X3J: line 91: -DBOOST_J=102: command not found

Signed-off-by: luo.runbing <luo.runbing@zte.com.cn>
4 years agoMerge pull request #39332 from cyx1231st/wip-seastore-range-query
Samuel Just [Mon, 8 Feb 2021 20:04:31 +0000 (12:04 -0800)]
Merge pull request #39332 from cyx1231st/wip-seastore-range-query

crimson/onode-staged-tree: implement Cursor::get_next() and comparators for range query

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agomgr/orch: Fix flake8 error 39361/head
Sebastian Wagner [Mon, 8 Feb 2021 16:37:52 +0000 (17:37 +0100)]
mgr/orch: Fix flake8 error

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #37729 from mgfritch/cephadm-podman-logdriver
Sebastian Wagner [Mon, 8 Feb 2021 16:34:10 +0000 (17:34 +0100)]
Merge pull request #37729 from mgfritch/cephadm-podman-logdriver

cephadm: configure journald as the logdriver

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
4 years agoMerge pull request #37764 from mgfritch/cephadm-no-container-init
Sebastian Wagner [Mon, 8 Feb 2021 16:33:16 +0000 (17:33 +0100)]
Merge pull request #37764 from mgfritch/cephadm-no-container-init

cephadm: run containers using `--init` by default

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
4 years agoMerge pull request #39153 from mgfritch/cephadm-flake8
Sebastian Wagner [Mon, 8 Feb 2021 16:32:04 +0000 (17:32 +0100)]
Merge pull request #39153 from mgfritch/cephadm-flake8

mgr/cephadm: introduce flake8

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #39331 from ceph/revert-37954-wip-F46226-log-dq-throttle-limit-new
Kefu Chai [Mon, 8 Feb 2021 16:04:51 +0000 (00:04 +0800)]
Merge pull request #39331 from ceph/revert-37954-wip-F46226-log-dq-throttle-limit-new

Revert "msg,mon,common: log when DispatchQueue throttle limit is reached"

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39359 from tchaikov/wip-crimson-clang-build
Kefu Chai [Mon, 8 Feb 2021 15:03:16 +0000 (23:03 +0800)]
Merge pull request #39359 from tchaikov/wip-crimson-clang-build

crimson/os: fix build with clang

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
4 years agocrimson/os: capture labels using a new variable 39359/head
Kefu Chai [Mon, 8 Feb 2021 14:04:32 +0000 (22:04 +0800)]
crimson/os: capture labels using a new variable

structured-binding does not define variables, so we cannot use "[=]" to
implicitly capture them. define variables in the capture list instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os: mark unused variable [[maybe_unused]]
Kefu Chai [Mon, 8 Feb 2021 13:54:46 +0000 (21:54 +0800)]
crimson/os: mark unused variable [[maybe_unused]]

to silence warning like

key_layout.h:516:10: warning: unused variable 'nspace_masked'
[-Wunused-variable]
    auto nspace_masked = string_view_masked_t::decode(nspace, delta);
         ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os: do not define assignment operator for Value
Kefu Chai [Mon, 8 Feb 2021 13:52:07 +0000 (21:52 +0800)]
crimson/os: do not define assignment operator for Value

we cannot assign a reference.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os: do not capture unused variable
Kefu Chai [Mon, 8 Feb 2021 13:45:02 +0000 (21:45 +0800)]
crimson/os: do not capture unused variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/common: mark ExitBarrier final
Kefu Chai [Mon, 8 Feb 2021 13:43:09 +0000 (21:43 +0800)]
crimson/common: mark ExitBarrier final

to silence warnings like:

crimson/common/operation.h:394:20: warning: class with destructor marked
'final' cannot be inherited from [-Wfinal-dtor-non-final-class]
    ~ExitBarrier() final {
                   ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoclient: use scoped_lock instead of unique_lock 39353/head
Xiubo Li [Mon, 8 Feb 2021 11:02:17 +0000 (19:02 +0800)]
client: use scoped_lock instead of unique_lock

Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agoMerge pull request #39350 from tchaikov/wip-cephadm-unicode
Sebastian Wagner [Mon, 8 Feb 2021 10:47:11 +0000 (11:47 +0100)]
Merge pull request #39350 from tchaikov/wip-cephadm-unicode

cephadm: do not cast subnet to unicode

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #39266 from sebastian-philipp/cephadm-rm-keyring-on-failed-deploy
Sebastian Wagner [Mon, 8 Feb 2021 10:46:35 +0000 (11:46 +0100)]
Merge pull request #39266 from sebastian-philipp/cephadm-rm-keyring-on-failed-deploy

mgr/cephadm: cleanup daemon keyring on failed daemon deploy

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
4 years agoMerge pull request #38695 from pcuzner/orch-status-changes
Sebastian Wagner [Mon, 8 Feb 2021 10:15:19 +0000 (11:15 +0100)]
Merge pull request #38695 from pcuzner/orch-status-changes

mgr/orchestrator: minor improvements to orch status

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #39347 from xxhdx1985126/wip-crimson-pg-bug-fix
Kefu Chai [Mon, 8 Feb 2021 10:08:57 +0000 (18:08 +0800)]
Merge pull request #39347 from xxhdx1985126/wip-crimson-pg-bug-fix

crimson/osd: make sure ox be removed after all continuations are finished in PG::do_osd_ops

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoRevert "msg,mon,common: log when DispatchQueue throttle limit is reached" 39331/head
Kefu Chai [Sat, 6 Feb 2021 06:47:56 +0000 (14:47 +0800)]
Revert "msg,mon,common: log when DispatchQueue throttle limit is reached"

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocephadm: do not cast subnet to unicode 39350/head
Kefu Chai [Mon, 8 Feb 2021 08:27:44 +0000 (16:27 +0800)]
cephadm: do not cast subnet to unicode

this change addresses a regression introduced by
fe4f4402fbcd87667613640f2808d5d0e07e749d, which was tested before
abd9287db0e4f4f7873864119f5ce62519af1d48 got merged. and the former was
merged after abd9287db0e4f4f7873864119f5ce62519af1d48. hence the
regression.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: make sure ox be removed after all continuations are finished in PG:... 39347/head
Xuehan Xu [Mon, 8 Feb 2021 06:59:48 +0000 (14:59 +0800)]
crimson/osd: make sure ox be removed after all continuations are finished in PG::do_osd_ops

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agoMerge pull request #39193 from tchaikov/wip-cephadm-py3
Kefu Chai [Mon, 8 Feb 2021 04:20:03 +0000 (12:20 +0800)]
Merge pull request #39193 from tchaikov/wip-cephadm-py3

cephadm: drop support to python<3.3

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #38897 from Daniel-Pivonka/mgroktostop
Kefu Chai [Mon, 8 Feb 2021 03:57:21 +0000 (11:57 +0800)]
Merge pull request #38897 from Daniel-Pivonka/mgroktostop

mgr/cephadm: ok-to-stop for mgr

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #39082 from ifed01/wip-ifed-meta-in-objectstore-tool
Kefu Chai [Mon, 8 Feb 2021 03:55:17 +0000 (11:55 +0800)]
Merge pull request #39082 from ifed01/wip-ifed-meta-in-objectstore-tool

tools/ceph-objectstore-tool: allow object operations on meta pgid

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39273 from tchaikov/wip-timer-mono
Kefu Chai [Mon, 8 Feb 2021 03:54:03 +0000 (11:54 +0800)]
Merge pull request #39273 from tchaikov/wip-timer-mono

common/Timer: use mono_clock for clock_t

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39295 from tchaikov/wip-mgr-balancer-ann
Kefu Chai [Mon, 8 Feb 2021 03:52:21 +0000 (11:52 +0800)]
Merge pull request #39295 from tchaikov/wip-mgr-balancer-ann

pybind/mgr/balancer: add type annotations

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
4 years agoMerge pull request #39164 from tchaikov/wip-crimson-push-mov
Kefu Chai [Mon, 8 Feb 2021 01:39:35 +0000 (09:39 +0800)]
Merge pull request #39164 from tchaikov/wip-crimson-push-mov

crimson/osd: consume the push payload

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agoMerge pull request #39204 from TRYTOBE8TME/wip-rgw-create-bucket-dpp
Ali Maredia [Sun, 7 Feb 2021 17:07:14 +0000 (12:07 -0500)]
Merge pull request #39204 from TRYTOBE8TME/wip-rgw-create-bucket-dpp

src/rgw: Dpp addition to create bucket log

4 years agorgw: Dpp addition to create bucket log 39204/head
root [Wed, 13 Jan 2021 07:19:08 +0000 (12:49 +0530)]
rgw: Dpp addition to create bucket log

This commit adds dpp to the create bucket log.

Signed-off-by: Kalpesh Pandya <kapandya@redhat.com>
4 years agopybind/mgr/balancer: flake8 cleanups 39295/head
Kefu Chai [Thu, 4 Feb 2021 13:31:24 +0000 (21:31 +0800)]
pybind/mgr/balancer: flake8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/balancer: define Plan.{dump,show}()
Kefu Chai [Thu, 4 Feb 2021 13:15:27 +0000 (21:15 +0800)]
pybind/mgr/balancer: define Plan.{dump,show}()

as they are called by the commands

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/alerts: flake8 cleanups
Kefu Chai [Thu, 4 Feb 2021 05:00:57 +0000 (13:00 +0800)]
pybind/mgr/alerts: flake8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/balancer: define options using Option
Kefu Chai [Thu, 4 Feb 2021 07:32:35 +0000 (15:32 +0800)]
pybind/mgr/balancer: define options using Option

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/balancer: add type annotations
Kefu Chai [Thu, 4 Feb 2021 07:22:47 +0000 (15:22 +0800)]
pybind/mgr/balancer: add type annotations

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/balancer: define commands using CLICommand
Kefu Chai [Wed, 3 Feb 2021 05:44:10 +0000 (13:44 +0800)]
pybind/mgr/balancer: define commands using CLICommand

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39336 from AlexWangD/patch-4
Kefu Chai [Sun, 7 Feb 2021 12:07:01 +0000 (20:07 +0800)]
Merge pull request #39336 from AlexWangD/patch-4

doc: fix the spelling mistake of “Topicd”

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agodoc: fix the spelling mistake of “Topicd” 39336/head
Alex Wang [Sun, 7 Feb 2021 07:26:04 +0000 (15:26 +0800)]
doc: fix the spelling mistake of “Topicd”

“Topicd” is a spelling mistake of "Topics".

4 years agoMerge pull request #37566 from AmnonHanuhov/wip-ObjectStore_EIO_Handling
Kefu Chai [Sun, 7 Feb 2021 04:18:01 +0000 (12:18 +0800)]
Merge pull request #37566 from AmnonHanuhov/wip-ObjectStore_EIO_Handling

crimson/osd: Recover missing object on read error

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/onode-staged-tree: cleanup -- switch to get_*_slot() interfaces 39332/head
Yingxin Cheng [Fri, 5 Feb 2021 16:04:12 +0000 (00:04 +0800)]
crimson/onode-staged-tree: cleanup -- switch to get_*_slot() interfaces

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agoMerge pull request #39303 from dillaman/wip-49173
Mykola Golub [Sat, 6 Feb 2021 09:23:45 +0000 (11:23 +0200)]
Merge pull request #39303 from dillaman/wip-49173

librbd/io: conditionally disable move optimization

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #39312 from ivancich/wip-orphan-list-binary-data
J. Eric Ivancich [Fri, 5 Feb 2021 19:46:56 +0000 (14:46 -0500)]
Merge pull request #39312 from ivancich/wip-orphan-list-binary-data

rgw: allow rgw-orphan-list to handle intermediate files w/ binary data

Reviewed-by: Michael Kidd <linuxkidd@gmail.com>
4 years agomgr/cephadm: Redefinition of unused name from line n (F811) 39153/head
Michael Fritch [Wed, 3 Feb 2021 14:06:16 +0000 (07:06 -0700)]
mgr/cephadm: Redefinition of unused name from line n (F811)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Module imported but unused (F401)
Michael Fritch [Wed, 3 Feb 2021 14:06:06 +0000 (07:06 -0700)]
mgr/cephadm: Module imported but unused (F401)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Local variable name is assigned to but never used (F841)
Michael Fritch [Tue, 2 Feb 2021 17:42:44 +0000 (10:42 -0700)]
mgr/cephadm: Local variable name is assigned to but never used (F841)

add error handling when `CompletedProcess` fails during rgw relam,
zongroup create et al.

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Local variable name is assigned to but never used (F841)
Michael Fritch [Tue, 2 Feb 2021 17:42:36 +0000 (10:42 -0700)]
mgr/cephadm: Local variable name is assigned to but never used (F841)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Line break occurred after a binary operator (W504)
Michael Fritch [Thu, 28 Jan 2021 20:16:04 +0000 (13:16 -0700)]
mgr/cephadm: Line break occurred after a binary operator (W504)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Trailing whitespace (W291)
Michael Fritch [Thu, 28 Jan 2021 02:42:33 +0000 (19:42 -0700)]
mgr/cephadm: Trailing whitespace (W291)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: undefined name 'channel' (F821)
Michael Fritch [Thu, 28 Jan 2021 19:50:42 +0000 (12:50 -0700)]
mgr/cephadm: undefined name 'channel' (F821)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: use ==/!= to compare constant literals (F632)
Michael Fritch [Thu, 28 Jan 2021 18:24:57 +0000 (11:24 -0700)]
mgr/cephadm: use ==/!= to compare constant literals (F632)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: f-string is missing placeholders (F541)
Michael Fritch [Thu, 28 Jan 2021 19:43:10 +0000 (12:43 -0700)]
mgr/cephadm: f-string is missing placeholders (F541)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Do not use variables named 'I', 'O', or 'l' (E741)
Michael Fritch [Thu, 28 Jan 2021 20:05:56 +0000 (13:05 -0700)]
mgr/cephadm: Do not use variables named 'I', 'O', or 'l' (E741)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Do not assign a lambda expression, use a def (E731)
Michael Fritch [Thu, 28 Jan 2021 19:17:22 +0000 (12:17 -0700)]
mgr/cephadm: Do not assign a lambda expression, use a def (E731)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Do not use bare except, specify exception instead (E722)
Michael Fritch [Thu, 28 Jan 2021 19:13:39 +0000 (12:13 -0700)]
mgr/cephadm: Do not use bare except, specify exception instead (E722)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Comparison to true should be 'if cond is true:' or 'if cond:' (E712)
Michael Fritch [Thu, 28 Jan 2021 18:57:16 +0000 (11:57 -0700)]
mgr/cephadm: Comparison to true should be 'if cond is true:' or 'if cond:' (E712)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Multiple statements on one line (def) (E704)
Michael Fritch [Thu, 28 Jan 2021 03:18:40 +0000 (20:18 -0700)]
mgr/cephadm: Multiple statements on one line (def) (E704)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: statement ends with a semicolon (E703)
Michael Fritch [Fri, 5 Feb 2021 18:13:40 +0000 (11:13 -0700)]
mgr/cephadm: statement ends with a semicolon (E703)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Expected 1 blank line before a nested definition (E306)
Michael Fritch [Thu, 28 Jan 2021 03:16:05 +0000 (20:16 -0700)]
mgr/cephadm: Expected 1 blank line before a nested definition (E306)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Expected 2 blank lines, found 0 (E302)
Michael Fritch [Thu, 28 Jan 2021 02:52:03 +0000 (19:52 -0700)]
mgr/cephadm: Expected 2 blank lines, found 0 (E302)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: at least two spaces before inline comment (E261)
Michael Fritch [Fri, 5 Feb 2021 18:13:05 +0000 (11:13 -0700)]
mgr/cephadm: at least two spaces before inline comment (E261)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: multiple spaces after ':' (E241)
Michael Fritch [Thu, 28 Jan 2021 19:45:10 +0000 (12:45 -0700)]
mgr/cephadm: multiple spaces after ':' (E241)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Missing whitespace after ',', ';', or ':' (E231)
Michael Fritch [Thu, 28 Jan 2021 20:07:58 +0000 (13:07 -0700)]
mgr/cephadm: Missing whitespace after ',', ';', or ':' (E231)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Missing whitespace around arithmetic operator (E226)
Michael Fritch [Thu, 28 Jan 2021 19:23:48 +0000 (12:23 -0700)]
mgr/cephadm: Missing whitespace around arithmetic operator (E226)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Missing whitespace around operator (E225)
Michael Fritch [Thu, 28 Jan 2021 20:09:23 +0000 (13:09 -0700)]
mgr/cephadm: Missing whitespace around operator (E225)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Continuation line under-indented for visual indent (E128)
Michael Fritch [Thu, 28 Jan 2021 18:55:43 +0000 (11:55 -0700)]
mgr/cephadm: Continuation line under-indented for visual indent (E128)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Continuation line over-indented for hanging indent (E126)
Michael Fritch [Thu, 28 Jan 2021 03:15:03 +0000 (20:15 -0700)]
mgr/cephadm: Continuation line over-indented for hanging indent (E126)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: closing bracket does not match visual indentation (E124)
Michael Fritch [Thu, 4 Feb 2021 19:52:31 +0000 (12:52 -0700)]
mgr/cephadm: closing bracket does not match visual indentation (E124)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Continuation line missing indentation or outdented (E122)
Michael Fritch [Thu, 28 Jan 2021 03:08:32 +0000 (20:08 -0700)]
mgr/cephadm: Continuation line missing indentation or outdented (E122)

also resolves:
continuation line unaligned for hanging indent (E131)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Continuation line under-indented for hanging indent (E121)
Michael Fritch [Thu, 28 Jan 2021 03:02:27 +0000 (20:02 -0700)]
mgr/cephadm: Continuation line under-indented for hanging indent (E121)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: Indentation is not a multiple of four (comment) (E114)
Michael Fritch [Thu, 28 Jan 2021 03:00:16 +0000 (20:00 -0700)]
mgr/cephadm: Indentation is not a multiple of four (comment) (E114)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: introduce flake8
Michael Fritch [Tue, 26 Jan 2021 19:02:38 +0000 (12:02 -0700)]
mgr/cephadm: introduce flake8

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agocephadm: configure journald as the logdriver 37729/head
Michael Fritch [Fri, 5 Feb 2021 01:19:25 +0000 (18:19 -0700)]
cephadm: configure journald as the logdriver

Introduced by e6792f306ab4d07251588fdca6ed3876ae3a092a

podman containers running in a detached `-d` state need to have a
configured logdriver for `cephadm logs` to be able to gather the daemon
output from journald

Fixes: https://tracker.ceph.com/issues/47916
Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agocephadm: extend `--container-init` to the shell command 37764/head
Michael Fritch [Fri, 5 Feb 2021 15:03:56 +0000 (08:03 -0700)]
cephadm: extend `--container-init` to the shell command

allow for the `--init` flag to be passed during `cephadm shell`

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agocephadm: run containers using `--init` by default
Michael Fritch [Fri, 5 Feb 2021 15:03:49 +0000 (08:03 -0700)]
cephadm: run containers using `--init` by default

generally all ceph containers need an init process to both reap any
zombie pids and/or perform signal handling (e.g. coredumps, etc.)

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agodoc/man/cephadm: add missing `--container-init` flag
Michael Fritch [Fri, 5 Feb 2021 15:03:43 +0000 (08:03 -0700)]
doc/man/cephadm: add missing `--container-init` flag

adopt command allows for the `--container-init` flag

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39261 from adk3798/applytest
Sebastian Wagner [Fri, 5 Feb 2021 11:17:11 +0000 (12:17 +0100)]
Merge pull request #39261 from adk3798/applytest

mgr/orchestrator: useful message when no service type in "ceph orch apply"

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39238 from liewegas/cephadm-conditional-osd-apply
Sebastian Wagner [Fri, 5 Feb 2021 10:47:58 +0000 (11:47 +0100)]
Merge pull request #39238 from liewegas/cephadm-conditional-osd-apply

mgr/cephadm: only apply osd specs if the devices have changed

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #39259 from sebastian-philipp/cephadm-execnet-chmod-600
Sebastian Wagner [Fri, 5 Feb 2021 10:46:43 +0000 (11:46 +0100)]
Merge pull request #39259 from sebastian-philipp/cephadm-execnet-chmod-600

mgr/cephadm: on ssh connection error, advice chmod 0600

Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39318 from AlexWangD/patch-3
Kefu Chai [Fri, 5 Feb 2021 10:10:06 +0000 (18:10 +0800)]
Merge pull request #39318 from AlexWangD/patch-3

doc: fix the spelling mistake of “Rersult”

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agodoc: fix the spelling mistake of “Rersult” 39318/head
Alex Wang [Fri, 5 Feb 2021 08:03:47 +0000 (16:03 +0800)]
doc: fix the spelling mistake of “Rersult”

“Rersult” is a spelling mistake of "Result".

Signed-off-by: Alex Wang wangdashuai@inspur.com
4 years agocrimson/onode-staged-tree: cleanup -- implement and use get_next_slot()
Yingxin Cheng [Fri, 5 Feb 2021 05:50:07 +0000 (13:50 +0800)]
crimson/onode-staged-tree: cleanup -- implement and use get_next_slot()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agoMerge pull request #39258 from Rethan/doc-remove-ms-options
Kefu Chai [Fri, 5 Feb 2021 05:48:10 +0000 (13:48 +0800)]
Merge pull request #39258 from Rethan/doc-remove-ms-options

doc/rados: remove some invalid ms option

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agorgw: allow rgw-orphan-list to handle intermediate files w/ binary data 39312/head
J. Eric Ivancich [Thu, 4 Feb 2021 21:19:17 +0000 (16:19 -0500)]
rgw: allow rgw-orphan-list to handle intermediate files w/ binary data

Updates the grep commands with the --text command-line option since
there are cases where rados object names contain NUL characters.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #38538 from chenerqi/qos-skip-discard
Jason Dillaman [Thu, 4 Feb 2021 23:22:23 +0000 (18:22 -0500)]
Merge pull request #38538 from chenerqi/qos-skip-discard

librbd: optionally exclude ops from qos

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agomgr/cephadm:update test_orchestrator func signature 38695/head
Paul Cuzner [Thu, 4 Feb 2021 23:05:05 +0000 (12:05 +1300)]
mgr/cephadm:update test_orchestrator func signature

The available signature has changed to 3 parms, so this
patch is needed to ensure it conforms.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>