Commit Graph

119556 Commits

Author SHA1 Message Date
Brad Hubbard
6aa9528c17
Merge pull request #39383 from badone/wip-unmask-deep-scrub-stdout-lazy_omap_stats_test
test/lazy-omap-stats: Immediate deep-scrub output

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2021-02-10 11:37:17 +10:00
Samuel Just
3ccf7cb8ca
Merge pull request #39333 from cyx1231st/wip-seastore-onode-tree-empty-oid-ns
crimson/onode-staged-tree: support empty ns and oid

Reviewed-by: Samuel Just <sjust@redhat.com>
2021-02-09 15:39:13 -08:00
Brad Hubbard
3e79a035ee test/lazy-omap-stats: Immediate deep-scrub output
Show stdout from the child process as it happens.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2021-02-10 08:02:00 +10:00
Casey Bodley
7f72ff359e
Merge pull request #38871 from cbodley/wip-qa-rgw-valgrind-on
qa/rgw: reenable valgrind in rgw/verify suite

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2021-02-09 16:22:42 -05:00
Casey Bodley
a635e523be qa/rgw: test_rgw_reshard.py just tries common ports
the 'sudo netstat | grep radosgw' command is causing failures:

  File "qa/workunits/rgw/test_rgw_reshard.py", line 53, in get_radosgw_port
    x = out.decode('utf8').split(" ")
AttributeError: 'bool' object has no attribute 'decode'

because when valgrind is enabled, the process name is 'valgrind' instead
of 'radosgw'

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2021-02-09 14:26:26 -05:00
Casey Bodley
c706740dbe test/rgw: re-enable valgrind in rgw verify suite
this only enables it for radosgw itself, not the other daemons

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2021-02-09 14:26:19 -05:00
Casey Bodley
58e0da8fc9 qa/rgw: move valgrind config into valgrind.yaml
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2021-02-09 14:26:19 -05:00
Casey Bodley
8d7cf601a2
Merge pull request #39211 from cbodley/wip-rgw-admin-formatter
radosgw-admin: fix leaks with make_unique()

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2021-02-09 07:31:05 -05:00
Casey Bodley
aefacf1c98
Merge pull request #39301 from cbodley/wip-49169
rgw: fix snprintf() truncate warning in ETagVerifier

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2021-02-09 07:30:40 -05:00
Kefu Chai
d5290aad46
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>
2021-02-09 13:51:01 +08:00
Venky Shankar
9f039ceeda
Merge pull request #39353 from lxbsz/minor
client: use scoped_lock instead of unique_lock
2021-02-09 10:43:10 +05:30
Yingxin Cheng
54f8710664 crimson/onode-staged-tree: be explicit about string_key markers
To be explicit that string_kew_view_t::MIN and MAX are not valid
string lengths. They are reserved as markers.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-02-09 12:48:59 +08:00
Kefu Chai
8c49c91fc9
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>
2021-02-09 12:23:50 +08:00
Yingxin Cheng
42ae838af5 crimson/onode-staged-tree: support empty ns and oid
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-02-09 11:42:43 +08:00
Kefu Chai
5fcddda37b 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
3177df3142 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
da7ea289e5 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
e85d1f759c 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
68af4a9f12 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
3c17ea9010 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
e730737e8b 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
c6dd356e4c 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
9eca9243f4 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
f37e915e9f 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
28712f215d 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>
2021-02-09 11:38:22 +08:00
Kefu Chai
1f6f9b24e4
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>
2021-02-09 10:15:36 +08:00
luo.runbing
893924c20d
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>
2021-02-09 09:39:41 +08:00
Samuel Just
83d3ac1b03
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>
2021-02-08 12:04:31 -08:00
Sebastian Wagner
be9b98a4a3 mgr/orch: Fix flake8 error
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-02-08 17:37:52 +01:00
Sebastian Wagner
602a91327d
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>
2021-02-08 17:34:10 +01:00
Sebastian Wagner
f635555fe7
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>
2021-02-08 17:33:16 +01:00
Sebastian Wagner
d4d3d17b23
Merge pull request #39153 from mgfritch/cephadm-flake8
mgr/cephadm: introduce flake8

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-02-08 17:32:04 +01:00
Kefu Chai
46493eb748
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>
2021-02-09 00:04:51 +08:00
Kefu Chai
22e68cd6c0
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>
2021-02-08 23:03:16 +08:00
Kefu Chai
fab5910b3f 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>
2021-02-08 22:09:46 +08:00
Kefu Chai
eadc2bce48 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>
2021-02-08 22:09:46 +08:00
Kefu Chai
876737f92e crimson/os: do not define assignment operator for Value
we cannot assign a reference.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-02-08 22:09:46 +08:00
Kefu Chai
0d7242917b crimson/os: do not capture unused variable
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-02-08 22:09:46 +08:00
Kefu Chai
244a7db3c3 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>
2021-02-08 22:09:46 +08:00
Xiubo Li
1100403ce6 client: use scoped_lock instead of unique_lock
Signed-off-by: Xiubo Li <xiubli@redhat.com>
2021-02-08 19:02:17 +08:00
Sebastian Wagner
8df1956d16
Merge pull request #39350 from tchaikov/wip-cephadm-unicode
cephadm: do not cast subnet to unicode

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-02-08 11:47:11 +01:00
Sebastian Wagner
44b912b626
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>
2021-02-08 11:46:35 +01:00
Sebastian Wagner
4db6aebee0
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>
2021-02-08 11:15:19 +01:00
Kefu Chai
318ddc521c
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>
2021-02-08 18:08:57 +08:00
Kefu Chai
5ca820fb9e Revert "msg,mon,common: log when DispatchQueue throttle limit is reached"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-02-08 18:03:14 +08:00
Kefu Chai
b585164877 cephadm: do not cast subnet to unicode
this change addresses a regression introduced by
fe4f4402fb, which was tested before
abd9287db0 got merged. and the former was
merged after abd9287db0. hence the
regression.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-02-08 16:29:55 +08:00
Xuehan Xu
005534856a 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>
2021-02-08 15:01:59 +08:00
Kefu Chai
b64e2479b0
Merge pull request #39193 from tchaikov/wip-cephadm-py3
cephadm: drop support to python<3.3

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-02-08 12:20:03 +08:00
Kefu Chai
3d012222fa
Merge pull request #38897 from Daniel-Pivonka/mgroktostop
mgr/cephadm: ok-to-stop for mgr

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-02-08 11:57:21 +08:00
Kefu Chai
b0eb012256
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>
2021-02-08 11:55:17 +08:00