Commit Graph

123798 Commits

Author SHA1 Message Date
Ilya Dryomov
6bdda825aa
Merge pull request #41529 from Yenya/rbd-deep-cp-docs
doc/rbd: document cp versus deep cp

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2021-05-27 15:23:42 +02:00
Jan "Yenya" Kasprzak
bf5863baf5 doc/rbd: document cp versus deep cp
I found that the difference between "rbd cp" and "rbd deep cp",
i.e. what "deep" means in this context, is documented only in
the mailing list archive and in the Mimic reelase notes.

Let's make the difference explicit in the manpage and in rbd --help.

Signed-off-by: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
2021-05-27 13:47:16 +02:00
Sebastian Wagner
674d6d96da
Merge pull request #41224 from adk3798/change-mon-stack-images-docs
doc/cephadm: recommend redeploying monitoring stack daemon after changing image

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-05-27 11:54:24 +02:00
Kefu Chai
a4c961b93c
Merge pull request #41566 from anthonyeleven/anthonyeleven/update-rgw-yaml-in
src/common/options: improve spelling, capitalization, and wording in rgw.yml.in

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-05-27 17:39:30 +08:00
Sebastian Wagner
39fe1c282d
Merge pull request #41400 from liewegas/fix-50113
doc/releases/pacific: add note about rgw on upgrade

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-05-27 11:36:33 +02:00
Milind Changire
26fbbefa82
Merge pull request #40831 from vshankar/wip-cephfs-mirror-incremental-sync
cephfs-mirror: incremental sync

Reviewed-by: Milind Changire <mchangir@redhat.com>
2021-05-27 13:39:23 +05:30
Ilya Dryomov
dfa0164f71
Merge pull request #41279 from pkalever/promote-attach
rbd: promote rbd-nbd attach and detach at rbd integrated cli

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2021-05-27 09:58:32 +02:00
Kefu Chai
8bc2c6da10
Merge pull request #41378 from varshar16/wip-check-file-inputs-nfs
pybind/mgr: generalize CLICheckNonemptyFileInput() error msg

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
2021-05-27 15:23:44 +08:00
Kefu Chai
00349925b0
Merge pull request #41381 from AmnonHanuhov/wip-Refactor_PeeringState
crimson/osd: Refactor PeeringState

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-05-27 15:21:47 +08:00
Kefu Chai
1c8ebd6bf3
Merge pull request #41516 from tchaikov/wip-47380
mon/OSDMonitor: drop stale failure_info even if can_mark_down()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2021-05-27 15:19:12 +08:00
Kefu Chai
e2a050e496
Merge pull request #41546 from tchaikov/wip-crush-alignment
crush/crush: ensure alignof(crush_work_bucket) is 1

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-05-27 15:17:48 +08:00
Kefu Chai
3c6002f52f
Merge pull request #41517 from tchaikov/wip-osd-osd-types
osd/osd_type: use f->dump_unsigned() when appropriate

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2021-05-27 15:17:11 +08:00
Kefu Chai
3bee93335e
Merge pull request #41527 from t-msn/cleanup-peeringstate-init
osd/PeeringState: cleanup dead code in PeeringState::init

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-05-27 15:16:07 +08:00
Kefu Chai
367cf49690
Merge pull request #41565 from anthonyeleven/anthonyeleven/update-rgw-chunk
doc/radosgw: modernize reference to rgw_max_chunk_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-05-27 14:13:24 +08:00
Anthony D'Atri
8011126c61 src/common/options: improve spelling, capitalization, and wording
Signed-off-by: Anthony D'Atri <anthony.datri@gmail.com>
2021-05-26 23:08:34 -07:00
Anthony D'Atri
d9cad2709e doc/radosgw: modernize reference to rgw_max_chunk_size
The value changed from 512KB to 4MB in Kraken.  Reference the prevailing
option default instead of embedding the current value.

Signed-off-by: Anthony D'Atri anthony.datri@gmail.com
2021-05-26 22:54:55 -07:00
Samuel Just
f25210d9b5
Merge pull request #41564 from tchaikov/wip-dmclock-seastar
dmclock: pick up change to support seastar

Reviewed-by: Samuel Just <sjust@redhat.com>
2021-05-26 22:05:05 -07:00
Samuel Just
c81d362015
Merge pull request #41560 from athanatos/sjust/wip-clang-linker-problem
crimson/os/seastore: resolve clang build problems, misc cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-05-26 22:04:19 -07:00
Kefu Chai
4975766372 dmclock: pick up change to support seastar
so if WITH_SEASTAR is defined, the POSIX synchronous primitives
are either replaced with seastar counterparts or disabled.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-05-27 11:36:24 +08:00
Satoru Takeuchi
6415044df3 rgw: add the description of blocking io during index resharding
It's nice to describe that write I/Os are blocked during resharding.

Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
2021-05-27 02:21:28 +00:00
Zac Dover
31558e5568 doc/cephadm: enrich "service status"
This PR improves the syntax of the "Service
Status" section of the "Service Managment"
section of the cephadm guide. This includes
pretty significant reworking of the information
in the section, so vetting this one might be
annoying. Anyway, I think I've lowered the
cognitive load on the reader.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-27 11:28:38 +10:00
Samuel Just
75827db6a3 crimson/os/seastore/seastore: add helpers to simplify omap usage
Add _omap_get_values and _omap_get_value to clarify omap_get_values and
get_attr.  Also resolves a clang linker error.

Signed-off-by: Samuel Just <sjust@redhat.com>
2021-05-26 16:57:50 -07:00
Samuel Just
7d56e0e342 crimson/os/seastore: use tuple return for omap_list throughout
Signed-off-by: Samuel Just <sjust@redhat.com>
2021-05-26 16:57:42 -07:00
Samuel Just
397efdd20b crimson/os/seastore/seastore.h: remove unncessary whitespace
Signed-off-by: Samuel Just <sjust@redhat.com>
2021-05-26 23:54:04 +00:00
Samuel Just
5775e97bd0 crimson/os/seastore/seastore.h: remove non-const repeat_with_onode
Signed-off-by: Samuel Just <sjust@redhat.com>
2021-05-26 23:54:04 +00:00
Samuel Just
3ce365b633 crimson/os/futurized_store: use ceph::bufferlist to match
Signed-off-by: Samuel Just <sjust@redhat.com>
2021-05-26 23:54:04 +00:00
Sage Weil
a6aeb58be0 Merge PR #41351 into master
* refs/pull/41351/head:
	cephadm: clean-up error message
	cephadm: raise an error when `--config` file is not found

Reviewed-by: Sage Weil <sage@redhat.com>
2021-05-26 18:42:29 -04:00
Sage Weil
0263277d69 Merge PR #41283 into master
* refs/pull/41283/head:
	cephadm: manage cephadm log with logrotated

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2021-05-26 18:42:06 -04:00
Sage Weil
3587a10b3e mgr/cephadm: resolve IP at 'orch host add' time
We prefer to always have a real IP for hosts in the cluster.  This avoids
a reliance on DNS for most operations.

Perhaps more importantly, it means we are less sensitive to inconsistent
host lookup results, for example due to (1) mismatched /etc/hosts files
between machines, or (2) a lookup of the local hostname that returns
127.0.1.1.

Adjust with_hosts() fixture to take an addr, and adjust tests accordingly.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-26 18:38:08 -04:00
Neha Ojha
5d7551d75b doc/releases/octopus.rst: rados updates for 15.2.13
Signed-off-by: Neha Ojha <nojha@redhat.com>
2021-05-26 21:36:59 +00:00
Dan Mick
de491c128a monitoring/grafana/build/Makefile: work around buildah bug
Workaround https://github.com/containers/buildah/issues/3253
by pushing to a local OCI-format image to clear out erroneously-left
'parent' field in buildah commit --squash output.  Can be removed
when the fix for the above is available.

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
b56ff43232 monitoring/grafana/build/Makefile: use --authfile
podman login caches auth tokens in auth.json; for sudo, it may be
placed in /run/containers/0 or it may be in /run/users/0/containers;
the latter directory is removed when root "logs out", which isn't
clear what it means with sudo/su.  Several builds failed because
they couldn't find the cached auth between sudo podman login and sudo
podman push.  Sidestep the confusion by just using a local file for
the auth cache.

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
a3b4bc73f7 monitoring/grafana/build/Makefile: cleanup, ready for jenkins
- allow env setting of versions of components
- add docker/quay username/password variables
- derive container version from grafana version
- make arch-specific tags
- expand clean target to remove container images
- remove release-specific targets, "all" target
- move push operations to separate "push" target

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
0fdbe673c8 monitoring/grafana/build/Makefile: use curl instead of wget
build machines tend to already have curl installed

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
2faadc2d5c monitoring/grafana/build/Makefile: use "sudo buildah"
Some build machines don't have /etc/sub{u,g}id set up for
so-called "rootless" (non-privileged) operation.  Use sudo
to avoid the need for "rootless".

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
9d37c6efbd monitoring/grafana/build/Makefile: pull dashboards from local dir
Use the dashboard definition files in this workspace directly

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
444d6f6623 monitoring/grafana/build/Makefile: Add ARCH variable
Allow building for other archs, in particular arm64

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
508b1d387f monitoring/grafana/build/Makefile: fully qualify source image
Some build machines may not have a default docker repo configured.
Specify docker.io.

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:24 -07:00
Adam C. Emerson
935d3e079d
Merge pull request #41465 from adamemerson/wip-50169
rgw: Simplify log shard probing and err on the side of omap

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2021-05-26 13:52:57 -04:00
Kefu Chai
1b7904fc45
Merge pull request #41554 from rzarzynski/wip-crimson-simplify-ox-lt-mgmt
crimson/osd: simplify the management of OpsExecuter's life-time.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-05-26 23:03:46 +08:00
Radoslaw Zarzynski
96f74185be crimson/osd: simplify the management of OpsExecuter's life-time.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-05-26 14:30:27 +00:00
Sage Weil
1d6b331cb7 Merge PR #41510 into master
* refs/pull/41510/head:
	doc/cephfs/nfs: remove documented limitation

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
2021-05-26 10:12:06 -04:00
Sage Weil
42d23c9fea ceph-volume: replace __ with _ in device_id
This matches behavior with common/blkdev from
5ee787944b

Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-26 07:09:37 -05:00
Kefu Chai
7858b56804 mgr: expose CRUSHMap.find_roots()
so mgr module could use it to enumerate all nodes without parents

See-also: https://tracker.ceph.com/issues/50971
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-05-26 20:08:00 +08:00
Kefu Chai
e32589d1ad
Merge pull request #41547 from t-msn/wip-update-cephspec
ceph.spec.in: install gcc-toolset-9-gcc-c++ for rhel only

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-05-26 18:44:31 +08:00
Kefu Chai
1fa8c925ba crush/crush: ensure alignof(crush_work_bucket) is 1
in do_rule(), we allocate the space for crush_work_bucket using

char work[crush_work_size(crush, maxout)];

where crush_work_size() calculate the size like:

map->working_size + result_max * 3 * sizeof(__u32);

so work is allocated on stack, but the alignment of the
crush_work_bucket struct is not taken into consideration, so in
crush_init_workspace(), point could point to an address which is not
aligned to 8 bytes, which is the alignment of crush_work_bucket by
default. so is its member variables, all of them are uint32_t, and hence
are also 8-bytes aligned.

to ensure the compiler generate the correct assembly for accessing
the member variables without assuming that the struct is 8-byte
aligned, we should specify the alignment explicitly.

in this change, `__attribute__ ((packed))` is specified for
crush_work_bucket, so that its alignment is 1.

this issue is spotted by ASan, it complains like:

../src/crush/mapper.c:881:22: runtime error: member access within misaligned address 0x7ffe051f90dc for type 'struct crush_work_bucket', which requires 8 byte alignment
0x7ffe051f90dc: note: pointer points here
  1d e5 77 3d 68 55 00 00  00 00 00 00 00 00 00 00  20 93 1f 05 fe 7f 00 00  10 91 1f 05 fe 7f 00 00
              ^
../src/crush/mapper.c:882:22: runtime error: member access within misaligned address 0x7ffe051f90dc for type 'struct crush_work_bucket', which requires 8 byte alignment
0x7ffe051f90dc: note: pointer points here
  1d e5 77 3d 00 00 00 00  00 00 00 00 00 00 00 00  20 93 1f 05 fe 7f 00 00  10 91 1f 05 fe 7f 00 00
              ^
../src/crush/mapper.c:883:20: runtime error: member access within misaligned address 0x7ffe051f90dc for type 'struct crush_work_bucket', which requires 8 byte alignment
0x7ffe051f90dc: note: pointer points here
  1d e5 77 3d 00 00 00 00  00 00 00 00 00 00 00 00  20 93 1f 05 fe 7f 00 00  10 91 1f 05 fe 7f 00 00
              ^

Fixes: https://tracker.ceph.com/issues/50978
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-05-26 18:41:27 +08:00
Zulai Wang
32a3970576 rgw: remove quota soft threshold
Remove quota soft threshold, which causes expensive checks for sharded buckets

Fixes: 14eabd4aa7
Signed-off-by: Zulai Wang <wangzl31@outlook.com>
2021-05-26 16:35:58 +08:00
Misono Tomohiro
f38def9273 ceph.spec.in: install gcc-toolset-9-gcc-c++ for rhel only
Otherwise fedora 33 complains there is no gcc-toolset-9-gcc-c++
when running "WITH_SEASTAR=true ./install_deps.sh"

Related to: 36759b5363
Signed-off-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
2021-05-26 16:21:34 +09:00
Kefu Chai
31c84c0b3c
Merge pull request #41545 from tchaikov/wip-vstart-fix
vstart.sh: pass the addition option to parse_block_devs()

Reviewed-by: Samuel Just <sjust@redhat.com>
2021-05-26 15:18:22 +08:00
Varsha Rao
a026ef2090 mgr/dashboard/access_control: fix flake8 expected 2 blank lines error
Signed-off-by: Varsha Rao <varao@redhat.com>
2021-05-26 11:40:05 +05:30