]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agocrimson/osd: add can_discard_op method for detecting "discardable" client requests 37003/head
Xuehan Xu [Tue, 8 Sep 2020 04:36:41 +0000 (12:36 +0800)]
crimson/osd: add can_discard_op method for detecting "discardable" client requests

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agocrimson/osd: drop repop if it can be discarded
Xuehan Xu [Tue, 8 Sep 2020 04:36:06 +0000 (12:36 +0800)]
crimson/osd: drop repop if it can be discarded

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agocrimson/osd: rename is_valid_rep_op_reply to can_discard_replica_op
Xuehan Xu [Tue, 8 Sep 2020 04:35:14 +0000 (12:35 +0800)]
crimson/osd: rename is_valid_rep_op_reply to can_discard_replica_op

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agoMerge pull request #37015 from tchaikov/wip-seastar-packet
Kefu Chai [Mon, 7 Sep 2020 09:44:05 +0000 (17:44 +0800)]
Merge pull request #37015 from tchaikov/wip-seastar-packet

common/buffer_seastar: reserve the packet slots in ctor

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #36946 from zdover23/wip-docs-36796-fix
Sebastian Wagner [Mon, 7 Sep 2020 08:48:27 +0000 (10:48 +0200)]
Merge pull request #36946 from zdover23/wip-docs-36796-fix

doc/cephadm: Document mgr/cephadm/manage_etc_ceph_ceph_conf

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #36995 from smithfarm/wip-47305
Sebastian Wagner [Mon, 7 Sep 2020 08:39:25 +0000 (10:39 +0200)]
Merge pull request #36995 from smithfarm/wip-47305

rpm: on SUSE, podman is required for cephadm to work

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36992 from uweigand/fix-encode-float
Kefu Chai [Mon, 7 Sep 2020 06:50:37 +0000 (14:50 +0800)]
Merge pull request #36992 from uweigand/fix-encode-float

include/encoding: Fix encode/decode of float types on big-endian systems

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36829 from changchengx/osdmap
Kefu Chai [Mon, 7 Sep 2020 06:49:08 +0000 (14:49 +0800)]
Merge pull request #36829 from changchengx/osdmap

crush,osd: refine crushmap comment and implementation

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36947 from pdvian/wip-mgr-get-rule-root
Kefu Chai [Mon, 7 Sep 2020 06:46:52 +0000 (14:46 +0800)]
Merge pull request #36947 from pdvian/wip-mgr-get-rule-root

mgr/mgr_module : Fix keyerror for op if rule steps first element is opcode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36972 from smithfarm/wip-47112
Kefu Chai [Mon, 7 Sep 2020 06:44:44 +0000 (14:44 +0800)]
Merge pull request #36972 from smithfarm/wip-47112

rpm,deb: drop /etc/sudoers.d/cephadm

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36937 from tchaikov/wip-mgr-cleanup
Kefu Chai [Mon, 7 Sep 2020 06:42:01 +0000 (14:42 +0800)]
Merge pull request #36937 from tchaikov/wip-mgr-cleanup

mgr: use range-based loop and cleanups

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36999 from neha-ojha/wip-47309
Kefu Chai [Mon, 7 Sep 2020 06:40:51 +0000 (14:40 +0800)]
Merge pull request #36999 from neha-ojha/wip-47309

qa/*/mon/mon-last-epoch-clean.sh: mark osd out instead of down

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37008 from tchaikov/wip-crimson-pg-tell
Kefu Chai [Mon, 7 Sep 2020 06:39:44 +0000 (14:39 +0800)]
Merge pull request #37008 from tchaikov/wip-crimson-pg-tell

crimson/osd: add "ceph tell <pgid> <command>" support

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
4 years agocommon/buffer_seastar: reserve the packet slots in ctor 37015/head
Kefu Chai [Mon, 7 Sep 2020 06:05:20 +0000 (14:05 +0800)]
common/buffer_seastar: reserve the packet slots in ctor

for better performance, and simpler this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37010 from tchaikov/wip-crimson-osd-net
Kefu Chai [Mon, 7 Sep 2020 05:00:14 +0000 (13:00 +0800)]
Merge pull request #37010 from tchaikov/wip-crimson-osd-net

crimson/net: move implementation into .cc file

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agoMerge pull request #37001 from tchaikov/wip-crimson-basic
Kefu Chai [Mon, 7 Sep 2020 01:52:45 +0000 (09:52 +0800)]
Merge pull request #37001 from tchaikov/wip-crimson-basic

qa/suites: add crimson-rados/basic tests

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge PR #36600 into master
Patrick Donnelly [Sun, 6 Sep 2020 15:54:38 +0000 (08:54 -0700)]
Merge PR #36600 into master

* refs/pull/36600/head:
mds: make caps dump more readable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
4 years agocrimson/osd: add "ceph tell <pgid> <command>" support 37008/head
Kefu Chai [Sun, 6 Sep 2020 06:53:22 +0000 (14:53 +0800)]
crimson/osd: add "ceph tell <pgid> <command>" support

* add an abstract class of `PGCommand` for `ceph tell <pgid> <command>`
* add two sample implementations for the pg tell commands.
  - "query"
  - "mark_unfound_lost"

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrush/CrushWrapper: refine type_map/name_map comment 36829/head
Changcheng Liu [Wed, 26 Aug 2020 01:41:42 +0000 (09:41 +0800)]
crush/CrushWrapper: refine type_map/name_map comment

type_map is the item(bucket & device) type id and its type name.
name_map is the item(bucket & device) id and its name.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agocrush/CrushWrapper: use "new_bucket_id" as var name of the added bucket
Changcheng Liu [Wed, 26 Aug 2020 06:22:10 +0000 (14:22 +0800)]
crush/CrushWrapper: use "new_bucket_id" as var name of the added bucket

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agocrush/CrushWrapper: align variable name with comment
Changcheng Liu [Wed, 26 Aug 2020 06:18:34 +0000 (14:18 +0800)]
crush/CrushWrapper: align variable name with comment

In the prolog of "for loop" statement, it writes "add child in the
location with 0 weight"

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agoosd/OSDMap: no need to give same locations per time to create bucket
Changcheng Liu [Wed, 26 Aug 2020 01:52:57 +0000 (09:52 +0800)]
osd/OSDMap: no need to give same locations per time to create bucket

Suggested-by: Kefu Chai <kefu@redhat.com>
Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agocrush/CrushWrapper: refine comment to improve readability
Changcheng Liu [Wed, 26 Aug 2020 06:16:13 +0000 (14:16 +0800)]
crush/CrushWrapper: refine comment to improve readability

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agoosd/OSDMap: assert osd_weight default initialized value is CEPH_OSD_OUT
Changcheng Liu [Thu, 3 Sep 2020 15:47:52 +0000 (23:47 +0800)]
osd/OSDMap: assert osd_weight default initialized value is CEPH_OSD_OUT

refer: http://www.cplusplus.com/reference/vector/vector/resize/
Explicitly specify initialization value to vector::resize operation.

Suggested-by: Kefu Chai <kefu@redhat.com>
Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agoosd/OSDMap: use class member instead of parameter to reset container size
Changcheng Liu [Wed, 26 Aug 2020 02:21:48 +0000 (10:21 +0800)]
osd/OSDMap: use class member instead of parameter to reset container size

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agoosd/OSDMap: avoid re-initialize osd state and weight done in set_max_osd
Changcheng Liu [Wed, 26 Aug 2020 07:47:04 +0000 (15:47 +0800)]
osd/OSDMap: avoid re-initialize osd state and weight done in set_max_osd

In set_max_osd function, container's osd_weight and osd_vector have been
assigned with the right state/weight value.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agocrush: correct typo
Changcheng Liu [Wed, 26 Aug 2020 01:48:51 +0000 (09:48 +0800)]
crush: correct typo

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agocrush: no need to double check root bucket id
Changcheng Liu [Mon, 24 Aug 2020 02:53:39 +0000 (10:53 +0800)]
crush: no need to double check root bucket id

root bucket id should be definitely less than 0. assert(r < 0) here.
There's no possible to find device items in find_nonshadow_roots.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agoinclude/encoding: Fix encode/decode of float types on big-endian systems 36992/head
Ulrich Weigand [Fri, 4 Sep 2020 13:42:41 +0000 (15:42 +0200)]
include/encoding: Fix encode/decode of float types on big-endian systems

Currently, floating-point types use "raw" encoding, which means they're
simply copied as byte stream.

This means that if the decoding happens on a machine that differs in
byte order from the source machine, the returned value will be
incorrect. As one effect of this problem, a big-endian OSD node cannot
join a cluster where the MON node is little-endian (or vice versa),
because the OSDMap (incremental) structure contains floating-point
values, and as a result of this conversion problem, the OSD node will
crash with an assertion failure as soon as it receives any OSDMap update
from the MON.

This should be fixed by always encoding floating-point values in
little-endian byte order just as is done for integers. (Note that this
still assumes source and target machines used the same floating-point
format except for byte order. But given that nearly all platforms these
days use IEEE binary32/binary64 for float/double, that seems a
reasonable assumption.)

Fixes: https://tracker.ceph.com/issues/47302
Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
4 years agoMerge pull request #36924 from ddiss/sigabbrev_np
Kefu Chai [Sun, 6 Sep 2020 10:45:58 +0000 (18:45 +0800)]
Merge pull request #36924 from ddiss/sigabbrev_np

cmake: detect and use sigdescr_np() if available

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
4 years agoMerge pull request #36929 from tchaikov/wip-python-common-no-unicode
Kefu Chai [Sun, 6 Sep 2020 10:44:37 +0000 (18:44 +0800)]
Merge pull request #36929 from tchaikov/wip-python-common-no-unicode

python-common: s/unicode/str/

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agocrimson/net: move implementation into .cc file 37010/head
Kefu Chai [Sun, 6 Sep 2020 10:32:44 +0000 (18:32 +0800)]
crimson/net: move implementation into .cc file

for faster compilation.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37007 from xxhdx1985126/wip-47313-47311
Kefu Chai [Sun, 6 Sep 2020 08:26:07 +0000 (16:26 +0800)]
Merge pull request #37007 from xxhdx1985126/wip-47313-47311

crimson/osd: accurately judge whether to do drop_recovery_read on recovering objs

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37004 from tchaikov/wip-discard-repop
Kefu Chai [Sun, 6 Sep 2020 08:00:36 +0000 (16:00 +0800)]
Merge pull request #37004 from tchaikov/wip-discard-repop

crimson/osd: discard op if pg changes or sender is down

Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agocrimson/osd: add PG::mark_unfound_lost()
Kefu Chai [Sun, 6 Sep 2020 06:50:26 +0000 (14:50 +0800)]
crimson/osd: add PG::mark_unfound_lost()

it is a stub implementation for supporing asock command

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: add PG::dump_primary()
Kefu Chai [Sun, 6 Sep 2020 06:49:30 +0000 (14:49 +0800)]
crimson/osd: add PG::dump_primary()

for implementing asock command "ceph tell 1.0 query"

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: drop unused header
Kefu Chai [Sun, 6 Sep 2020 06:48:45 +0000 (14:48 +0800)]
crimson/osd: drop unused header

osd_admin.h is referenced in the .cc file, so drop it in the header

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: add OSD::get_pg()
Kefu Chai [Sun, 6 Sep 2020 06:47:01 +0000 (14:47 +0800)]
crimson/osd: add OSD::get_pg()

for implementing asock commands.

and add `PGMap::get_pg()` as a helper

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoosd: refactor PrimaryLogPG::do_command("query")
Kefu Chai [Sun, 6 Sep 2020 06:44:12 +0000 (14:44 +0800)]
osd: refactor PrimaryLogPG::do_command("query")

we should let recovery_state.dump_peering_state() close the formatter
section, because it's recovery_state.dump_peering_state(), who opens it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoosd/PGStateUtils: do not forward declare unused class
Kefu Chai [Sun, 6 Sep 2020 06:42:38 +0000 (14:42 +0800)]
osd/PGStateUtils: do not forward declare unused class

PG is not referenced in this header

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: print pgid in OSD::load_pg()
Kefu Chai [Sat, 5 Sep 2020 13:51:37 +0000 (21:51 +0800)]
crimson/osd: print pgid in OSD::load_pg()

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os: fix indent
Kefu Chai [Sat, 5 Sep 2020 13:51:16 +0000 (21:51 +0800)]
crimson/os: fix indent

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: don't do push related operations if there's no shard to push 37007/head
Xuehan Xu [Sun, 6 Sep 2020 04:04:25 +0000 (12:04 +0800)]
crimson/osd: don't do push related operations if there's no shard to push

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agocrimson/osd: accurately judge whether to do drop_recovery_read on recovering objs
Xuehan Xu [Sun, 6 Sep 2020 03:54:00 +0000 (11:54 +0800)]
crimson/osd: accurately judge whether to do drop_recovery_read on recovering objs

Fixes: https://tracker.ceph.com/issues/47313
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agocrimson/osd: discard op if pg changes or sender is down 37004/head
Kefu Chai [Sat, 5 Sep 2020 12:00:42 +0000 (20:00 +0800)]
crimson/osd: discard op if pg changes or sender is down

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoqa/suites: add crimson-rados/basic tests 37001/head
Kefu Chai [Wed, 19 Aug 2020 11:41:29 +0000 (19:41 +0800)]
qa/suites: add crimson-rados/basic tests

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37000 from xxhdx1985126/wip-47226
Kefu Chai [Sat, 5 Sep 2020 03:17:35 +0000 (11:17 +0800)]
Merge pull request #37000 from xxhdx1985126/wip-47226

crimson/osd: construct log_keys_debug when reading pglog entries

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: construct log_keys_debug when reading pglog entries 37000/head
Xuehan Xu [Sat, 5 Sep 2020 02:58:05 +0000 (10:58 +0800)]
crimson/osd: construct log_keys_debug when reading pglog entries

Fixes: https://tracker.ceph.com/issues/47226
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agoMerge pull request #36990 from tchaikov/wip-doc-prompt
Kefu Chai [Sat, 5 Sep 2020 02:40:03 +0000 (10:40 +0800)]
Merge pull request #36990 from tchaikov/wip-doc-prompt

doc/dev: use prompt directive when appropriate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agodoc/dev: drop unused label 36990/head
Kefu Chai [Sat, 5 Sep 2020 01:55:57 +0000 (09:55 +0800)]
doc/dev: drop unused label

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/dev/developer_guide/tests-unit-tests: use literal "make check"
Kefu Chai [Fri, 4 Sep 2020 16:24:57 +0000 (00:24 +0800)]
doc/dev/developer_guide/tests-unit-tests: use literal "make check"

the ``make check`` is better than a hyper link here.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/dev: fix broken "make check" link
Kefu Chai [Fri, 4 Sep 2020 16:21:13 +0000 (00:21 +0800)]
doc/dev: fix broken "make check" link

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/dev: link to label not file
Kefu Chai [Fri, 4 Sep 2020 16:12:51 +0000 (00:12 +0800)]
doc/dev: link to label not file

it's less error prone, and can help us avoid broken links if we move a
file around

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoqa/*/mon/mon-last-epoch-clean.sh: mark osd out instead of down 36999/head
Neha Ojha [Fri, 4 Sep 2020 21:51:50 +0000 (21:51 +0000)]
qa/*/mon/mon-last-epoch-clean.sh: mark osd out instead of down

The test should mark the OSD out to check if only "in" OSDs are considered by
the osdmap trimming logic.

Fixes: https://tracker.ceph.com/issues/47309
Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #36983 into master
Patrick Donnelly [Fri, 4 Sep 2020 18:59:12 +0000 (11:59 -0700)]
Merge PR #36983 into master

* refs/pull/36983/head:
client: make the osdmap wait under the mount_state reader check

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36580 into master
Patrick Donnelly [Fri, 4 Sep 2020 17:40:46 +0000 (10:40 -0700)]
Merge PR #36580 into master

* refs/pull/36580/head:
Client: defer puting the inode
client: defer cancelling the timer event
client: remove _sync_write_commit which makes no sense any more

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36850 into master
Patrick Donnelly [Fri, 4 Sep 2020 17:29:14 +0000 (10:29 -0700)]
Merge PR #36850 into master

* refs/pull/36850/head:
mds: add performance counter for cap messages

Reviewed-by: Zheng Yan <zyan@redhat.com>
4 years agoMerge PR #36464 into master
Patrick Donnelly [Fri, 4 Sep 2020 17:28:11 +0000 (10:28 -0700)]
Merge PR #36464 into master

* refs/pull/36464/head:
client: get rstat from auth mds to reduce forwarding requests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agodoc/dev: use prompt directive when appropriate
Kefu Chai [Fri, 4 Sep 2020 11:41:30 +0000 (19:41 +0800)]
doc/dev: use prompt directive when appropriate

for 2 reasons:

* sphinx renders codeblock using python syntax highlighting by default,
  so it's not surprising that it highlight keywords like "export" in
  command line samples. so to render command line code blocks, we'd
  better specify the syntax explicitly for better rendering result.
* with the help of "prompt" directive, user is able to copy and paste
  the command without the prompt. for instance, with the default
  "::" directive, user will copy "$ ceph df", which is not very
  convenient, but with "prompt" directive, user only copies
  "ceph df".

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agorpm: on SUSE, podman is required for cephadm to work 36995/head
Nathan Cutler [Fri, 4 Sep 2020 15:51:07 +0000 (17:51 +0200)]
rpm: on SUSE, podman is required for cephadm to work

On SUSE, cephadm is tested with podman only.

Fixes: https://tracker.ceph.com/issues/47305
Signed-off-by: Nathan Cutler <ncutler@suse.com>
4 years agoMerge pull request #36824 from SchoolGuy/feature/replace-png-with-svg
Lenz Grimmer [Fri, 4 Sep 2020 13:50:44 +0000 (15:50 +0200)]
Merge pull request #36824 from SchoolGuy/feature/replace-png-with-svg

mgr/dashboard: Exchange PNGs for SVGs

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #34831 from rhcs-dashboard/41060-API-wrong-error-code
Lenz Grimmer [Fri, 4 Sep 2020 13:25:10 +0000 (15:25 +0200)]
Merge pull request #34831 from rhcs-dashboard/41060-API-wrong-error-code

mgr/dashboard: REST API returns 500 when no Content-Type is specified

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agomgr/mgr_module: fix keyerror for op 36947/head
Prashant D [Wed, 2 Sep 2020 12:33:16 +0000 (08:33 -0400)]
mgr/mgr_module: fix keyerror for op

If rule steps first element is opcode.

Fixes: https://tracker.ceph.com/issues/47272
Signed-off-by: Prashant Dhange <pdhange@redhat.com>
4 years agoMerge pull request #36059 from liu-chunmei/seastore-extentmap-tree
Kefu Chai [Fri, 4 Sep 2020 09:14:10 +0000 (17:14 +0800)]
Merge pull request #36059 from liu-chunmei/seastore-extentmap-tree

crimson/seastore: add extent map tree

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #36865 from ishanrai05/global-styles-fix
Lenz Grimmer [Fri, 4 Sep 2020 09:12:18 +0000 (11:12 +0200)]
Merge pull request #36865 from ishanrai05/global-styles-fix

mgr/dashboard: fix style being applied globally

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agomds: make caps dump more readable 36600/head
Yanhu Cao [Thu, 13 Aug 2020 07:35:08 +0000 (15:35 +0800)]
mds: make caps dump more readable

Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
4 years agoclient: make the osdmap wait under the mount_state reader check 36983/head
Xiubo Li [Thu, 3 Sep 2020 23:52:10 +0000 (19:52 -0400)]
client: make the osdmap wait under the mount_state reader check

It will make no sense to check this if the unmouting is already
going on.

https://tracker.ceph.com/issues/47293
Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agoMerge pull request #36489 from zdover23/wip-doc-dev-merge-request-2020-aug
zdover23 [Fri, 4 Sep 2020 01:15:54 +0000 (11:15 +1000)]
Merge pull request #36489 from zdover23/wip-doc-dev-merge-request-2020-aug

doc/dev: add proper merge commit format

4 years agoMerge pull request #36977 from tchaikov/wip-47290
Neha Ojha [Fri, 4 Sep 2020 00:04:30 +0000 (17:04 -0700)]
Merge pull request #36977 from tchaikov/wip-47290

mon/OSDMonitor: only take in osd into consideration when trimming osd…

Reviewed-by: Dan van der Ster <daniel.vanderster@cern.ch>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agodoc/dev: add proper Merge PR format 36489/head
Zac Dover [Thu, 6 Aug 2020 06:30:03 +0000 (16:30 +1000)]
doc/dev: add proper Merge PR format

This commit adds an example of proper Merge PR format
to the Developer Guide. Though this might not be of
great use to most people, Zac Dover will find it most
helpful.

Fixes: https://tracker.ceph.com/issues/46843
Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agodoc/cephadm: managing ceph.conf 36946/head
Zac Dover [Wed, 2 Sep 2020 09:19:40 +0000 (19:19 +1000)]
doc/cephadm: managing ceph.conf

This commit repairs PR#36796, which was about
updating the configuration settings in ceph.conf
without touching the file directly.

That commit wasn't building because of a couple of
back quotes that were touching the word that followed
them. So much like the princess from The Princess and
The Pea is Sphinx. So careful must we always be.

Fixes: https://tracker.ceph.com/issues/47265
Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge pull request #36954 from HeinleinSupport/wip-doc-remove-ceph-deploy
zdover23 [Thu, 3 Sep 2020 21:15:35 +0000 (07:15 +1000)]
Merge pull request #36954 from HeinleinSupport/wip-doc-remove-ceph-deploy

doc: remove references to ceph-deploy

Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge PR #36902 into master
Patrick Donnelly [Thu, 3 Sep 2020 18:36:52 +0000 (11:36 -0700)]
Merge PR #36902 into master

* refs/pull/36902/head:
mds: fix incorrect check for if dirfrag is being fragmented

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36933 into master
Patrick Donnelly [Thu, 3 Sep 2020 17:42:21 +0000 (10:42 -0700)]
Merge PR #36933 into master

* refs/pull/36933/head:
cephfs_mirror: Fix Clang compile errors

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #35575 from cbodley/wip-45626
Casey Bodley [Thu, 3 Sep 2020 17:39:32 +0000 (13:39 -0400)]
Merge pull request #35575 from cbodley/wip-45626

test/rgw: test_datalog_autotrim filters out new entries

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
4 years agoMerge pull request #36758 from cbodley/wip-rgw-sal-user-sync-stats
Casey Bodley [Thu, 3 Sep 2020 17:38:03 +0000 (13:38 -0400)]
Merge pull request #36758 from cbodley/wip-rgw-sal-user-sync-stats

rgw: rgw_user_sync_all_stats() uses is_truncated()

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #36913 from cbodley/wip-47217
Casey Bodley [Thu, 3 Sep 2020 17:37:26 +0000 (13:37 -0400)]
Merge pull request #36913 from cbodley/wip-47217

radosgw-admin: period pull command is not always a raw_storage_op

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #28489 from croit/fix-40255
J. Eric Ivancich [Thu, 3 Sep 2020 17:16:54 +0000 (13:16 -0400)]
Merge pull request #28489 from croit/fix-40255

rgw: fix bucket limit check fill_status warnings

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #30584 from zhangsw/fix-rgw-expiration-header
J. Eric Ivancich [Thu, 3 Sep 2020 17:16:21 +0000 (13:16 -0400)]
Merge pull request #30584 from zhangsw/fix-rgw-expiration-header

rgw: filter prefix should be used when generating expiration header

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
4 years agoMerge pull request #31058 from cbodley/wip-rgw-skip-bilog
J. Eric Ivancich [Thu, 3 Sep 2020 17:14:25 +0000 (13:14 -0400)]
Merge pull request #31058 from cbodley/wip-rgw-skip-bilog

cls/rgw: avoid read_bucket_header() when bi logging is disabled

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #31354 from xxcs/xxcs05
J. Eric Ivancich [Thu, 3 Sep 2020 17:13:57 +0000 (13:13 -0400)]
Merge pull request #31354 from xxcs/xxcs05

rgw: The rgw_bucket overload <operator, need to consider bucket_id

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #31663 from cfanz/wip-rgw-fix-partial-copy-bug
J. Eric Ivancich [Thu, 3 Sep 2020 17:13:31 +0000 (13:13 -0400)]
Merge pull request #31663 from cfanz/wip-rgw-fix-partial-copy-bug

rgw: do initialization in init_processing() for range copy

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #33942 from pritha-srivastava/rgw-sts-new-keycloak-examples
J. Eric Ivancich [Thu, 3 Sep 2020 17:12:59 +0000 (13:12 -0400)]
Merge pull request #33942 from pritha-srivastava/rgw-sts-new-keycloak-examples

rgw: Updating STS document with references to new keycloak

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
4 years agoMerge PR #36546 into master
Patrick Donnelly [Thu, 3 Sep 2020 17:08:42 +0000 (10:08 -0700)]
Merge PR #36546 into master

* refs/pull/36546/head:
vstart_runner: log commands in a more usable form

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #35122 from BryceCao/wip-swift-buckets-jammed-metadata-sync
J. Eric Ivancich [Thu, 3 Sep 2020 17:04:21 +0000 (13:04 -0400)]
Merge pull request #35122 from BryceCao/wip-swift-buckets-jammed-metadata-sync

rgw: URL encode bucket name in metadata sync

Reviwed-by: Shilpa Jagannath <smanjara@redhat.com>
4 years agoMerge pull request #35123 from BryceCao/wip-bug-fix-swift-bucket-create
J. Eric Ivancich [Thu, 3 Sep 2020 17:02:15 +0000 (13:02 -0400)]
Merge pull request #35123 from BryceCao/wip-bug-fix-swift-bucket-create

rgw: urlencode bucket name when forwarding request

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #35551 from joke-lee/v4-auth
J. Eric Ivancich [Thu, 3 Sep 2020 17:01:45 +0000 (13:01 -0400)]
Merge pull request #35551 from joke-lee/v4-auth

rgw: replace '+' with "%20" in canonical query string for s3 v4 auth.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #35984 from matthewoliver/rgw_swift_api_401_for_v1_and_keystone
J. Eric Ivancich [Thu, 3 Sep 2020 17:01:09 +0000 (13:01 -0400)]
Merge pull request #35984 from matthewoliver/rgw_swift_api_401_for_v1_and_keystone

rgw: Swift API anonymous access should 401

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #36502 from cbodley/wip-rgw-objv-tracker-inc
J. Eric Ivancich [Thu, 3 Sep 2020 16:59:18 +0000 (12:59 -0400)]
Merge pull request #36502 from cbodley/wip-rgw-objv-tracker-inc

rgw: RGWObjVersionTracker tracks version over increments

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
4 years agoMerge PR #36971 into master
Patrick Donnelly [Thu, 3 Sep 2020 16:31:37 +0000 (09:31 -0700)]
Merge PR #36971 into master

* refs/pull/36971/head:
doc: fix typo and correct the affiliation

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomon/OSDMonitor: only take in osd into consideration when trimming osdmaps 36977/head
Kefu Chai [Thu, 3 Sep 2020 15:02:58 +0000 (23:02 +0800)]
mon/OSDMonitor: only take in osd into consideration when trimming osdmaps

we should not take down osd into consideration when trimming osdmap. in
e62269c892, we decrease the upper bound of range of osdmaps to be trimmed
if the given osd is out. but we should have to decrease it only if the
osd in question is still *in*.

so, in this change, the min_lec is decreased only if the osd in question
is *in*.

Fixes: https://tracker.ceph.com/issues/47290
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36218 from mkogan1/wip-cache-put-post
Casey Bodley [Thu, 3 Sep 2020 14:38:17 +0000 (10:38 -0400)]
Merge pull request #36218 from mkogan1/wip-cache-put-post

rgw: add PUT and POST req support to data cache

Reviewed-by: Or Friedmann <ofriedma@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
4 years agorpm,deb: drop /etc/sudoers.d/cephadm 36972/head
Nathan Cutler [Tue, 1 Sep 2020 18:38:47 +0000 (20:38 +0200)]
rpm,deb: drop /etc/sudoers.d/cephadm

Current behavior (without this patch) is:

1. cephadm package installs cephadm at /usr/sbin/cephadm
2. cephadm package installs /etc/sudoers.d/cephadm
3. !!! BUT this file refers to a non-existent executable (/usr/bin/cephadm) !!!
4. the PR that introduced this sudoers file (and this discrepancy) was merged in 2019
5. nobody noticed the discrepancy until now

My conclusion: the file /etc/sudoers.d/cephadm is not needed for cephadm to
work.

Fixes: https://tracker.ceph.com/issues/47112
Signed-off-by: Nathan Cutler <ncutler@suse.com>
4 years agoMerge pull request #36542 from mkogan1/wip-rgw-fix-sync-stats
Casey Bodley [Thu, 3 Sep 2020 14:16:29 +0000 (10:16 -0400)]
Merge pull request #36542 from mkogan1/wip-rgw-fix-sync-stats

rgw: fix user stats iterative increment

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #36932 from theMarix/patch-1
Kefu Chai [Thu, 3 Sep 2020 14:05:06 +0000 (22:05 +0800)]
Merge pull request #36932 from theMarix/patch-1

rpm: Fix typo in summary of prometheus-alerts package

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36951 from cbodley/wip-47240
Casey Bodley [Thu, 3 Sep 2020 13:17:30 +0000 (09:17 -0400)]
Merge pull request #36951 from cbodley/wip-47240

cls/rgw: unlink_instance writes updated olh log on early return

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #36908 from rosinL/wip-valid-chunk
Kefu Chai [Thu, 3 Sep 2020 12:58:37 +0000 (20:58 +0800)]
Merge pull request #36908 from rosinL/wip-valid-chunk

msg/async/rdma: use wr_id address to check valid chunk

Reviewed-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agoMerge pull request #36894 from pcuzner/device-ls-with-lsm
Sebastian Wagner [Thu, 3 Sep 2020 12:45:06 +0000 (14:45 +0200)]
Merge pull request #36894 from pcuzner/device-ls-with-lsm

orchestrator: intergrate LSM information with device ls

4 years agoMerge pull request #36911 from sebastian-philipp/cephadm-lsmcli-jinja
Sebastian Wagner [Thu, 3 Sep 2020 12:44:13 +0000 (14:44 +0200)]
Merge pull request #36911 from sebastian-philipp/cephadm-lsmcli-jinja

mgr/cephadm: customize blink_device_light cmd via j2

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #36943 from sebastian-philipp/cephadm-add-comments-to-secondary...
Sebastian Wagner [Thu, 3 Sep 2020 12:42:53 +0000 (14:42 +0200)]
Merge pull request #36943 from sebastian-philipp/cephadm-add-comments-to-secondary-containers

mgr/cephadm: Add comments to secondary contaieners

Reviewed-by: Matthew Oliver <moliver@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>