Commit Graph

109766 Commits

Author SHA1 Message Date
Sage Weil
2740349122 Merge PR #33959 into octopus
* refs/pull/33959/head:
	qa: fix all the fsx.sh-invoking yaml files to install dependencies

Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-22 10:56:31 -05:00
Sage Weil
3b28477f0d Merge PR #34067 into octopus
* refs/pull/34067/head:
	mgr/DaemonServer: add explicit check that acting matches for merge

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2020-03-22 10:55:54 -05:00
Adam C. Emerson
1e8864092d mon: Build ceph-mon without using namespace declarations in headers
This is part of a series of commits to clean up using namespace at top
level in headers.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-03-22 00:28:46 -04:00
Adam C. Emerson
0b1935bc3f crypto: Build without using namespace declarations in headers
This is part of a series of commits to clean up using namespace at top
level in headers.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-03-22 00:28:39 -04:00
Adam C. Emerson
674a6f6309 compressor: Build without using namespace declarations in headers
This is part of a series of commits to clean up using namespace at top
level in headers.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-03-22 00:28:28 -04:00
Adam C. Emerson
2f56e9b6d8 global: Build without using namespace declarations in headers
This is part of a series of commits to clean up using namespace at top
level in headers.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-03-22 00:28:00 -04:00
Kefu Chai
ec362f4499
Merge pull request #34071 from badone/wip-docker-test-helper-use-podman-by-default
tests: Use podman if available

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-22 10:41:23 +08:00
Kefu Chai
961834c3b1
Merge pull request #34048 from tchaikov/wip-test-docker-fc31
tests: update Dockerfile to support fc-31

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2020-03-22 10:40:16 +08:00
Brad Hubbard
a1e8f61cb7 tests: Use podman if available
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2020-03-22 09:07:50 +10:00
Sage Weil
1700d18158 mgr/DaemonServer: add explicit check that acting matches for merge
Add an explicit check that the PG acting for the source and target
match before merging.

Fixes: https://tracker.ceph.com/issues/44684
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-21 14:17:30 -05:00
Yang Honggang
aa36086295 test/msgr/perf_msgr_client.cc: fix misleading total op num
Signed-off-by: Yang Honggang <yanghonggang@kuaishou.com>
2020-03-21 19:39:06 +08:00
Mykola Golub
5d09c481a4
Merge pull request #34040 from dillaman/wip-44396-partial-fix
rbd-mirror: snapshot-based mirroring should use image sync throttler

Reviewed-by: Mykola Golub <mgolub@suse.com>
2020-03-21 10:22:45 +02:00
Kefu Chai
71f6db5f6b
Merge pull request #34066 from mgfritch/cephadm-mon-b-test
qa/workunits/cephadm/test_cephadm.sh: fix mon.b failure

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-21 14:34:28 +08:00
Kefu Chai
a791177764
Merge pull request #34022 from ifed01/wip-ifed-fix-leak-in-expand
os/bluestore: fix extent leak after main device expand.

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
2020-03-21 14:32:15 +08:00
Kefu Chai
d071132987
Merge pull request #33883 from dragonylffly/wip-fix-comments
msg/async: fix log information

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-21 14:31:16 +08:00
Kefu Chai
11b8e974a9
Merge pull request #33869 from mgfritch/cephadm-osd-create-test
qa/workunits/cephadm/test_cephadm.sh: move osd test to ceph-volume

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-03-21 14:30:23 +08:00
Kefu Chai
fc5a41119d
Merge pull request #34097 from adamemerson/wip-boost-use-valgrind-fix
cmake: Don't enable BOOST_USE_VALGRIND when not requested

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-21 14:29:22 +08:00
Kefu Chai
b0dca75a59
Merge pull request #34056 from xiexingguo/wip-44662
qa/*/osd-markdown.sh: propagate map to osd before testing its reaction

Reviewed-by: Neha Ojha <nojha@redhat.com>
2020-03-21 14:27:51 +08:00
Sean Fang
bb5802407c doc: Fix some link errors about ceph-deploy
Previously moved "ceph-deploy" did not change the link jump in it correctly

Signed-off-by: Sean Fang <silence.boy@live.cn>
2020-03-21 13:20:54 +08:00
Kefu Chai
25ac152841
Merge pull request #33796 from adamemerson/wip-using-namespace-common
Build the target 'common' without relying on using namespace in headers

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-21 10:33:16 +08:00
Kefu Chai
f617e10612
Merge pull request #33903 from tchaikov/wip-rados-object-locator
tools/rados: use object-locator in user-visible outputs

Reviewed-by: Neha Ojha <nojha@redhat.com>
2020-03-21 10:30:08 +08:00
Sage Weil
e2f3e6062c Merge PR #34098 into octopus
* refs/pull/34098/head:
	cephadm: relabel /etc/ganesha mount

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-20 21:15:23 -05:00
Sage Weil
41d0966b72 mgr/cephadm: point alertmanager at all mgr/dashboard URLs
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-20 20:49:40 -05:00
Kefu Chai
3cac20f31a
Merge pull request #33976 from tchaikov/wip-build-doc-on-darwin
admin/build-doc, pybind/*/setup.py: support Darwin

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2020-03-21 09:27:09 +08:00
Xie Xingguo
ec404a9a9e
Merge pull request #34070 from bangmingcheng/wip-doc-ceph-chenbm
doc: fix a spelling error at /doc/radosgw/dynamicresharding.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-21 09:01:29 +08:00
Adam C. Emerson
647819c632 cmake: Don't enable BOOST_USE_VALGRIND when not requested
We were adding the define without support in the library if
WITH_BOOST_VALGRIND was turned off.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-03-20 20:40:39 -04:00
Sage Weil
818b8583c8 mgr/rook: list rgw services
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-20 17:11:24 -04:00
Sage Weil
15a106c3b0 mgr/rook: tolerate timestamps that are None
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-20 17:03:57 -04:00
Sage Weil
66de37d565 mgr/orch: add 'subcluster' property to RGWSpec
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-20 16:40:12 -04:00
Sage Weil
22cea7eb0e mgr/rook: do not create radosgw pools
First, we don't know how big they should be or what they should look like.
The caller should already know that, and/or radosgw can create the pools
itself.

This depends on https://github.com/rook/rook/pull/5058

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-20 16:40:12 -04:00
Sage Weil
0580297aff mgr/rook: refactor apply/add for rgw
A few caveats here:

- enforce that realm == zone, since that is all rook does at the moment.
- we force a (bad!) pool configuration, since rook requires that these
be present (instead of allowing radosgw or the caller to create the pools)

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-20 16:40:12 -04:00
Sage Weil
74b0212d90 Merge PR #34082 into octopus
* refs/pull/34082/head:
	cephadm: switch grafana image to the ceph repo

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-20 15:35:17 -05:00
Sage Weil
6c9e4e2192 Merge PR #34068 into octopus
* refs/pull/34068/head:
	mgr/cephadm: clean up client.crash.* container_image settings after upgrade

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-20 15:31:32 -05:00
Sage Weil
b7857818f8 cephadm: relabel /etc/ganesha mount
Fixes: https://tracker.ceph.com/issues/44701
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-20 15:30:11 -05:00
Sage Weil
1bc2853d2f Merge PR #34046 into octopus
* refs/pull/34046/head:
	qa/suites/rados/cephadm/upgrade: update starting version
	mgr/orch: 'ceph upgrade ...' -> 'ceph orch upgrade ...'

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-20 14:50:42 -05:00
Sage Weil
7c6defc9f0 Merge PR #34092 into octopus
* refs/pull/34092/head:
	doc/releases/octopus.rst: add note about ec recovery below min_size

Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-20 13:14:25 -05:00
Gregory Farnum
22673102c2
Merge pull request #33719 from ukernel/wip-44416
mds: pass proper MutationImpl::LockOp to Locker::wrlock_start()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by:  Jeff Layton <jlayton@redhat.com>
2020-03-20 10:25:15 -07:00
Jason Dillaman
a7cc4ab05a rbd-mirror: leader watcher should not cancel get locker if locker is invalid
When a new leader acquires the lock, it will send out a lock acquired
notification along with periodic heartbeats. The get locker will attempt to
run immediately, but if a heartbeat arrives before it executes the heartbeat
will cancel the timer and reschedule it for the future. This process repeats
for each periodic heartbeat and the locker is never re-read from the OSD.

This is an issue only for namespace replayers due to the delayed fashion in
which the leader instance id is retrieved.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-03-20 13:18:14 -04:00
Jason Dillaman
336a16bcaf rbd-mirror: snapshot sync request needs to check for interruption
If the sync request was locally canceled, we need to resume the paused
shut down logic instead of just notifying the image replayer state
machine of the change -- since it had already requested a shut down and
will not re-request it.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-03-20 13:18:14 -04:00
Jason Dillaman
ae726336d2 librbd: request exclusive lock when moving to trash
Even if the image is in-use, moving it to the trash does not
remove any data. This also solves a race between snapshot-based
mirroring shutting down and being able to move a mirrored image
to the trash.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-03-20 13:18:14 -04:00
Jason Dillaman
470ce1c0d7 rbd-mirror: basic integration with sync throttling
snapshot-based mirroring did not have any throttling to prevent
too many concurrent syncs from running. Since each sync might need
to iterate over every object of an image, that could potentially
put an extreme burden on the remote cluster.

A future PR will add a more intelligent throttle based on the actual
number of objects needed to be scanned.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-03-20 13:18:14 -04:00
Jason Dillaman
9970e49ab5 rbd-mirror: don't prematurely finish snapshot replay loop
The unlink step was being incorrectly skipped if a state machine
shut down was requested.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-03-20 13:18:13 -04:00
Jason Dillaman
4b92bf3e5f rbd-mirror: pass InstanceWatcher to snapshot Replayer
The replayer will request image syncs via the instance watcher in the next
commit.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-03-20 13:18:13 -04:00
Neha
02ca09852e doc/releases/octopus.rst: add note about ec recovery below min_size
Signed-off-by: Neha Ojha <nojha@redhat.com>
2020-03-20 17:13:56 +00:00
Casey Bodley
984f3ff7e0 doc: update octopus release notes for rgw
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2020-03-20 12:07:06 -04:00
Sage Weil
0d04e85f4f mgr/cephadm: configure rgw_frontends for rgw service
This assumes the beast frontend.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-20 11:43:22 -04:00
Yuri Weinstein
137f3b3223
Merge pull request #33841 from xiexingguo/wip-44507
osd/PeeringState: fix pending want_acting vs osd offline race

Reviewed-by: Samuel Just <sjust@redhat.com>
2020-03-20 08:23:14 -07:00
Jeff Layton
85df3a5fb2 doc: add a basic client configuration document
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2020-03-20 11:15:37 -04:00
Sebastian Wagner
8c681d2a57
Merge pull request #32319 from jan--f/pybind-mgr-util-cephfs-con-pool
mgr_util: add CephfsClient implementation

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Venky Shankar vshankar@redhat.com
2020-03-20 16:07:01 +01:00
Yingxin Cheng
0c02f055d1 crimson/osd: log Heartbeat::remove_peer before assertion failure
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2020-03-20 22:40:43 +08:00