Commit Graph

104199 Commits

Author SHA1 Message Date
Sage Weil
f75d832727 osd: release backoffs during merge
When we merge PGs, ensure that backoffs release messages are sent to
the client before the victim PG is destroyed.  This is /almost/ handled
by on_shutdown(), except that the shutdown code is aggressive about
tearing down backoff state in order to manage the PGRef lifecycle
carefully--and because in the shutdown (or normal PG/pool deletion) case
it doesn't matter what (if anything) we tell the client.

Fix this by simply queuing the backoff release prior to shutting down the
merge source PG.

An alternative appraoch would be to rejigger the PGRef release timing, but
that code is very fragile and this is a more targetted fix for this issue.
We might consider a more careful look in the future... or not!

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-14 08:50:54 -06:00
Patrick Donnelly
1715c644c3
Merge PR #30754 into master
* refs/pull/30754/head:
	doc/cephfs: merge fstab doc with respective mount docs
	doc: add systemd unit part for FUSE mounts in fstab doc
	doc: update and improve "mount using kernel driver" doc
	doc: update and improve "mount using FUSE" doc

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-14 06:14:44 -08:00
Sage Weil
32c532a53b Merge PR #31631 into master
* refs/pull/31631/head:
	ceph-daemon: Add more type hints

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-14 08:08:19 -06:00
Sebastian Wagner
86c4e2a1d9
Merge pull request #31561 from sebastian-philipp/orchestrator-remove-cli-tox
mgr/orchestrator_cli: remove tox and move test to parent dir

Reviewed-by: Stephan Müller <smueller@suse.com>
2019-11-14 14:44:01 +01:00
Sebastian Wagner
d6c10192c6 mgr/orchestrator: remove tox and move test to parent dir
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-11-14 12:37:50 +01:00
Thomas Bechtold
592339ca68 ceph-daemon: Add more type hints
Commit 7ce26be7a3 started to add type hints. This commit continues
that and adds the missing type hints.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
2019-11-14 10:55:15 +01:00
Rishabh Dave
ab9185187d doc/cephfs: merge fstab doc with respective mount docs
Fixes: https://tracker.ceph.com/issues/42601
Signed-off-by: Rishabh Dave <ridave@redhat.com>
2019-11-14 10:02:01 +05:30
Sage Weil
7ffb5d9e79 Merge PR #31614 into master
* refs/pull/31614/head:
	ceph-daemon: use `-e` instead of `--env`

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-13 13:14:12 -06:00
Sage Weil
3c24c2de0e Merge PR #31613 into master
* refs/pull/31613/head:
	mgr/ssh: fix redeploy

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-13 12:59:57 -06:00
Sage Weil
1c9efb10cd Merge PR #31609 into master
* refs/pull/31609/head:
	ceph-daemon: Add basic mypy support

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-13 12:35:03 -06:00
Kefu Chai
f86e779fe3
Merge pull request #31601 from tchaikov/wip/install-newer-binutils-on-xenial
install-deps.sh: install binutils 2.28 for xenial

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2019-11-14 01:03:47 +08:00
Sage Weil
253238ed5e Merge PR #31602 into master
* refs/pull/31602/head:
	mgr/ssh: annotate object representation

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-13 10:18:58 -06:00
Michael Fritch
341b6943e9
ceph-daemon: use -e instead of --env
Older versions of podman don't allow intermixing `-e` and `--env`

Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-13 09:15:28 -07:00
Kefu Chai
06a004b932 install-deps.sh: remove the cleanup for kitware repo
it was used for removing the kitware repo, and in
7265b55d09, we switched to a rebuilt
version hosted in chacra, and it was more than two months ago,
presumably, none builder has kitware repo anymore. so, let's remove
the cleanup code.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-11-14 00:12:16 +08:00
Kefu Chai
edc93babf7 install-deps.sh: install binutils 2.28 for xenial
ld 2.26 segment faults when linking librados.so in
https://github.com/ceph/ceph/pull/16715 .

while ld 2.28 always survives.
binutils 2.28 is rebuilt and uploaded to chacra
binutils/master/7fa393306ed8b93019d225548474c0540b8928f7/ubuntu/xenial,

so let's use it instead.

the source deb package comes from
http://ppa.launchpad.net/jonathonf/binutils/ubuntu

i tried to use the binutils 2.30 source package from bionic,
but it has build dependency of dpkg-dev (>= 1.19.0.5) which cannot be
fulfilled on xenial. so without more changes, we cannot get
binutils 2.30 built on xenial using this source package.

Fixes: https://tracker.ceph.com/issues/42596
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-11-14 00:12:06 +08:00
Alfredo Deza
550874c4c7
Merge pull request #31592 from jan--f/c-v-fix-mimic-functional-tests
ceph-volume: assume msgrV1 for all branches containing mimic

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
2019-11-13 11:10:58 -05:00
Sage Weil
437f5ee53b Merge PR #31603 into master
* refs/pull/31603/head:
	ceph-daemon: fix prompt

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
2019-11-13 10:10:20 -06:00
Thomas Bechtold
7ce26be7a3 ceph-daemon: Add basic mypy support
Add mypy support and some type hints to be able to do static code
analysis.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
2019-11-13 16:13:20 +01:00
Sage Weil
d23a53b7bd mgr/ssh: fix redeploy
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-13 08:53:37 -06:00
Lenz Grimmer
8d2f9b0ede
mgr/dashboard: Add E2E tests for tasks and notifications sideb… (#31128)
mgr/dashboard: Add E2E tests for tasks and notifications sidebar

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
2019-11-13 14:26:19 +00:00
Sage Weil
3ad40174f4 ceph-daemon: fix prompt
[ceph: root@gnit /]#
not
[ceph: root@gnit /]$

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-13 07:18:11 -06:00
Joshua Schmid
0454fb0bdb mgr/ssh: annotate object representation
* InventoryNode
* ServiceDescription

Signed-off-by: Joshua Schmid <jschmid@suse.de>
2019-11-13 14:12:00 +01:00
Sage Weil
1bbbc4803c Merge PR #31583 into master
* refs/pull/31583/head:
	ceph-daemon: -v|--verbose, not -d|--debug

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-13 07:04:04 -06:00
Sage Weil
6c5db46adc Merge PR #31585 into master
* refs/pull/31585/head:
	ceph-daemon: add `--legacy-dir` arg to `ls` command

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-13 07:03:46 -06:00
Nathan Cutler
d142cd07e7
Merge pull request #31533 from tspmelo/wip-bc-redmine-key
backport-create-issue: read redmine key from file

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2019-11-13 13:27:26 +01:00
Kefu Chai
4c42b4d49d
Merge pull request #31544 from ifed01/wip-ifed-gettid2
test/fio: bump to fio-3.15

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-13 18:58:36 +08:00
Jan Fajerski
b8754919df ceph-volume: assume msgrV1 for all branches containing mimic
With nautilus and newer OSDs listen on v1 ports and v2 ports. Assume
that if mimic (or luminous) occur in the branch name, the OSDs are
running msgrv1 only.

Fixes: https://tracker.ceph.com/issues/42791

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-11-13 10:19:00 +01:00
Kefu Chai
acc5cbb4ed
Merge pull request #31426 from cyx1231st/rfc-seastar-fix-build-dpdk
crimson: fix build seastar with dpdk

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-13 17:05:04 +08:00
Sebastian Wagner
62ce7af4b1
Merge pull request #30662 from sebastian-philipp/orchestrator-c-v-inventory
python-common, mgr/orchestrator, mgr/dashboard: Use common "Devices"

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
2019-11-13 10:03:57 +01:00
Yingxin Cheng
bf958abc0f crimson: build seastar dpdk from src/seastar/dpdk
src/spdk/dpdk and src/seastar/dpdk are both at their private branches
with project-specific modifications, so select proper dpdk source
directory according to flags WITH_SPDK and Seastar_DPDK.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-13 15:53:43 +08:00
Yingxin Cheng
ab84158fc0 crimson: link required dpdk components for seastar
see https://github.com/scylladb/seastar/blob/
809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-13 15:53:31 +08:00
Rishabh Dave
6e3a070d45 doc: add systemd unit part for FUSE mounts in fstab doc
To make FUSE-mounted CephFS persist across reboots, user also needs to
start and enable the systemd units. Add that part to the document for
fstab, instead of mentioning it in "Mount CephFS using FUSE" doc. Also,
wrap few lines and rename mountpoint to /mnt/mycephfs in examples to
keep them same across docs.

Fixes: https://tracker.ceph.com/issues/42298
Signed-off-by: Rishabh Dave <ridave@redhat.com>
2019-11-13 11:10:47 +05:30
Rishabh Dave
03d8fdbb49 doc: update and improve "mount using kernel driver" doc
Move the examples of mount command for Ceph cluster with CephX enabled
to the top of page, since it is enabled by default, improve explanation
around Ceph with multiple FSs, get rid of hash symbols before every
command (without them it's clear that the text is command and with them
the reader cannot use the commands directly), link fstab page, add how
mount in general looks, add prerequisites required for kernel mounts and
expand explanation wherever possible.

Fixes: https://tracker.ceph.com/issues/42220
Signed-off-by: Rishabh Dave <ridave@redhat.com>
2019-11-13 11:10:47 +05:30
Rishabh Dave
cd34b96e4d doc: update and improve "mount using FUSE" doc
Recommend keyring permission to be 600 instead of 644, show examples
for `-k`, `-r`, `-m` and `--client_mds_namespace` options, move
references to the bottom of the page,  show how to unmount FUSE-mounted
CephFS, copy the tip about unmounting from "mount using kernel" page to
"mount using FUSE" page, correct commands for automating FUSE mounts,
add sub-headings to the document and add how ceph-fuse command looks in
general.

Fixes: https://tracker.ceph.com/issues/42205
Signed-off-by: Rishabh Dave <ridave@redhat.com>
2019-11-13 11:10:41 +05:30
Kefu Chai
5cd8cba1e9
Merge pull request #31571 from rhcs-dashboard/42775-fix-typo
common: fix typo in rgw_user_max_buckets option long description.

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-13 11:49:05 +08:00
Kefu Chai
28b37b2774
Merge pull request #31510 from yuvalif/wip-yuval-remove-flaky-amqp-test
rgw/amqp: remove flaky amqp test

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-13 11:44:21 +08:00
Michael Fritch
1b7f80c4c4
ceph-daemon: add --legacy-dir arg to ls command
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-12 16:46:09 -07:00
Sage Weil
1eb93943b3 ceph-daemon: -v|--verbose, not -d|--debug
-v is more natural IMO

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-12 17:20:34 -06:00
Sage Weil
4fb78fad91 Merge PR #31575 into master
* refs/pull/31575/head:
	ceph-daemon: 'logs' command

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-12 17:16:22 -06:00
Sage Weil
25d4902e46 ceph-daemon: 'logs' command
This just invokes podman logs with the appropriate argument(s).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-12 14:17:03 -06:00
Sage Weil
53324c10ba Merge PR #31577 into master
* refs/pull/31577/head:
	pybind/mgr/CMakeLists: exclude tox.ini, requirements.txt from install

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-11-12 14:16:06 -06:00
Neha Ojha
e5734d957f
Merge pull request #31542 from neha-ojha/wip-42756
osd/OSDMap.cc: don't output over/underfull messages to lderr

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
2019-11-12 10:24:29 -08:00
Sage Weil
8ee1f5e243 pybind/mgr/CMakeLists: exclude tox.ini, requirements.txt from install
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-12 12:06:13 -06:00
Tiago Melo
1b5f37bbcd backport-create-issue: read redmine key from file
Now you don't need to provide redmine key or user/password as a flag, as the
script will read it from "~/.redmine_key".

This makes it more consistent with other scripts.

Signed-off-by: Tiago Melo <tmelo@suse.com>
2019-11-12 16:59:23 -01:00
Patrick Donnelly
a6b7ca3800
Merge PR #31157 into master
* refs/pull/31157/head:
	doc: update inf/infinite option for subvolume resize
	qa/tasks: fs subvolume resize inf command
	mgr/volumes: fs subvolume resize inf/infinite command

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-12 09:25:26 -08:00
Sage Weil
051fd9c212 Merge PR #31503 into master
* refs/pull/31503/head:
	Revert "os/bluestore: add kv_drain_preceding_waiters indicate drain_preceding."

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-11-12 10:56:08 -06:00
Sage Weil
4ef9d257e6 Merge PR #31537 into master
* refs/pull/31537/head:
	mgr/orchestrator: move split_host into shared helpers
	mgr/ssh: allow names to be specified for stateless services
	mgr/ssh: optionally specify names for mon daemons
	mgr/ssh: optionally specify names for mgr daemons

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-12 10:23:06 -06:00
Jason Dillaman
5ffac86264
Merge pull request #31280 from zy751713126/snap_get_name_and_id
librbd: add snap_get_name and snap_get_id method API
2019-11-12 10:57:20 -05:00
Jason Dillaman
c2b18a5b3f
Merge pull request #31491 from zy751713126/rbd_bench
rbd/bench: outputs bytes/s format dynamically

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-11-12 10:54:44 -05:00
Jason Dillaman
98bbe55c9a
Merge pull request #31497 from trociny/wip-mock-warnings
test/librbd: fix mock warnings in TestMockIoImageRequest

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-11-12 10:54:07 -05:00