Commit Graph

95311 Commits

Author SHA1 Message Date
Andrew Schoen
eb1caff2f2
Merge pull request #26401 from jan--f/c-v-fix-siez-format-py3
ceph-volume: implement __format__ in Size to format sizes in py3

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2019-02-18 14:37:35 -06:00
Andrew Schoen
438bc645bd
Merge pull request #26403 from jan--f/c-v-no-iteritems-py3
ceph-volume: remove iteritems instances

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2019-02-18 14:36:57 -06:00
Sage Weil
fc6e22b1df Merge PR #26463 into master
* refs/pull/26463/head:
	script/ptl-tool: allow invocation within a subdirectory

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-02-18 13:39:35 -06:00
J. Eric Ivancich
be00ec3513
Merge pull request #26272 from ivancich/wip-log-excl-lock-busy-info
rgw: when exclusive lock fails due existing lock, log add'l info

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
2019-02-18 12:48:09 -05:00
Patrick Donnelly
65c5a2f43f
mds: remove wrong puts on Message
Messages ref counts in the MDS/client are handled by the smart pointers.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-02-18 08:28:59 -08:00
Mykola Golub
04cc884df0 qa/suites/upgrade/luminous-x: force clone v1 format for final rbd python test
Fixes: https://tracker.ceph.com/issues/38346
Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-02-18 16:23:13 +00:00
Matt Benjamin
e87113afa1
Merge pull request #25926 from linuxbox2/wip-rgw-lc-prefix
rgw: lifcycle: don't reject compound rules with empty prefix
2019-02-18 11:15:27 -05:00
Lenz Grimmer
69920e426d
Merge pull request #26386 from votdev/improve_dashboard_module_opts
mgr/dashboard: Set MODULE_OPTIONS types and defaults

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
2019-02-18 16:03:59 +01:00
Jason Dillaman
1a74204952
Merge pull request #26226 from trociny/wip-rbd-re-sparsify
rbd: online re-sparsify of images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-02-18 09:24:21 -05:00
Lenz Grimmer
c326a28733
Merge pull request #26242 from p-na/wip-pna-osd-purge
mgr/dashboard: Implement OSD purge

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
2019-02-18 14:15:48 +01:00
Kefu Chai
a0ce76f5f6 pybind: move FLAGS into Flag class
so we have shorter names, and don't need to import ceph_argparse
only for accessing the flags

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-18 17:41:12 +08:00
Kefu Chai
aa59ecd3ef
Merge pull request #26431 from wjwithagen/wjw-fix-src_os_bluestore_KernelDevice.cc
os/bluestore: Only use F_SET_FILE_RW_HINT when available

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-02-18 17:17:27 +08:00
xie xingguo
4a0eabb3a6 osd/OSDMap: using std::vector::reserve to reduce memory reallocation
In C++ vectors are dynamic arrays.
Vectors are assigned memory in blocks of contiguous locations.
When the memory allocated for the vector falls short of storing
new elements, a new memory block is allocated to vector and all
elements are copied from the old location to the new location.
This reallocation of elements helps vectors to grow when required.
However, it is a costly operation and time complexity is involved
in this step is linear.
Try to use std::vector::reserve whenever possible if performance
matters.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-02-18 15:40:22 +08:00
Patrick Nawracay
1419346886 mgr/dashboard: Implement OSD purge
Removes the `remove` functionality from the UI.

Fixes: http://tracker.ceph.com/issues/35811

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
2019-02-18 07:18:09 +00:00
Xie Xingguo
e36364b160
Merge pull request #26440 from xiexingguo/wip-balancer-week
mgr/balancer: restrict automatic balancing to specific weekdays

Reviewed-by: Sage Weil <sage@redhat.com>
2019-02-18 12:14:46 +08:00
Jason Dillaman
727a1c2478
Merge pull request #26425 from trociny/wip-38315
journal: fix potential race when closing object recorder

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-02-17 21:25:24 -05:00
xie xingguo
0412a51ac6 mgr/balancer: restrict automatic balancing to specific weekdays
We have implemented similar semantics for the scrub behaviour.
Let's try to keep pace with that.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-02-18 09:14:07 +08:00
Tatsuya Naganawa
e9dd52eb74
ceph-deploy would not support --cluster option anymore
Since ceph-deploy would not support --cluster option anymore, section in this doc could be removed
Signed-off-by: Tatsuya Naganawa <tatsuyan201101@gmail.com>
2019-02-18 02:25:05 +09:00
Sage Weil
8e63f042cc Merge PR #26353 into master
* refs/pull/26353/head:
	osd/PG: print get/put under debug_refs
	osd: clear priv on heartbeat_reset

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-02-17 10:44:33 -06:00
Sage Weil
5f86c72825 mgr/MgrStandby: include addrs in metadata
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-17 09:26:44 -06:00
Sage Weil
f43ff610fa osd/PG: print get/put under debug_refs
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-17 08:18:34 -06:00
Sage Weil
a60f332c32 Merge PR #24805 into master
* refs/pull/24805/head:
	qa/suite: add dedup test
	src/tools: fix compile error (master version issue)
	src/tools: add stats (fixed objects,total objects)
	src/tools: make room for cdc
	src/tools: make enhacned stats and interface class
	src/tools: set timelimit and add signal handler to check progress
	src/tools: use the slice thing and make parallel (chunk_scrub)
	src/test: add max-thread test in test_dedup_tool.sh
	src/tools: use the slice thing and make parallel
	src/test: add chunk-scrub test in test_dedup_tool.sh
	src/tools: add chunk-scrub op in dedup tool
	src/cls/cas: add has_chunk op
	src/test: add test_dedup_tool.sh
	src/tools: initial works for dedup tool

Reviewed-by: Sage Weil <sage@redhat.com>
2019-02-17 08:18:06 -06:00
Sage Weil
57ee66b7f1 Merge PR #26462 into master
* refs/pull/26462/head:
	options: update some descriptions and see_also fields.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-02-17 08:16:57 -06:00
Peng Wang
a942722c5b common/ceph_timer: stop timer's thread when it is suspended
otherwise the client could hang when shutting down

Fixes: https://tracker.ceph.com/issues/37766
Signed-off-by: Peng Wang <wp389@126.com>
2019-02-17 17:47:53 +08:00
David Zafman
af5c747a80 osd: Prevent negative local num_bytes sent to peer for backfill reservation
Fixes: http://tracker.ceph.com/issues/38344

Signed-off-by: David Zafman <dzafman@redhat.com>
2019-02-16 18:02:10 -08:00
Sage Weil
7840e7d8ba script/ptl-tool: allow invocation within a subdirectory
Make ptl-tool.py work from a subdirectory inside the repo (e.g., build/).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-16 13:05:35 -06:00
Kefu Chai
d86ef56332 rpm: guard runtime deps with "with make_check"
move jq and xmlstarlet into "with make_check", as they
are only used for running "make check", not for building Ceph.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-17 02:27:07 +08:00
Kefu Chai
2fb4cddd6f rpm,deb: add python-{openssl,requests} as make_check dependencies
Fixes: https://tracker.ceph.com/issues/37584
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-17 02:27:07 +08:00
Kefu Chai
69fe3e5aba install-deps.sh: selectively enable deps on rpm distros
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-17 02:27:07 +08:00
Kefu Chai
694495f621 install-deps.sh: selectively enable deps on deb distros
on debian derivatives, only enable required dependencies on demand.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-17 02:27:07 +08:00
Kefu Chai
4fd179654e install-deps.sh: extract munge_debian_control()
this function will uncomment necessary dependencies on demand.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-17 02:25:05 +08:00
Kefu Chai
ee5357d029 debian/control: mark test-time dependencies
mark dependencies used for `make check` run with `Make-Check`

in which, socat is used only by `qa/standalone/mon/mon-bind.sh`, we
could mark it with QA-Run, but since there only a single dependency in
this bucket, let's wait for more of them before adding the QA-Run
category.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-17 02:23:38 +08:00
Sage Weil
4de85a5321 Merge PR #26187 into master
* refs/pull/26187/head:
	mgr/balancer: balance pools with same crush_rule in batch
	osd/OSDMap: more improvements to upmap

Reviewed-by: Sage Weil <sage@redhat.com>
2019-02-16 09:39:59 -06:00
Sage Weil
94bb79e2f6 Merge PR #26435 into master
* refs/pull/26435/head:
	msg/async/ProtocolV2: assume peer has SERVER_NAUTILUS for encoding v2 frame

Reviewed-by: Ricardo Dias <rdias@suse.com>
2019-02-16 09:30:48 -06:00
Kefu Chai
b0a42c207a
Merge pull request #26275 from trociny/wip-mksnap-errmsg
rados: provide user with more meaningful error message

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2019-02-16 23:29:09 +08:00
Kefu Chai
554c821c54
Merge pull request #26454 from batrick/i37955-followup
ceph.in: use correct module for cmd flags

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-02-16 23:26:49 +08:00
Kefu Chai
4a1e5604b0
Merge pull request #26446 from tchaikov/wip-mgr-plugins-are-arch-indep
cmake,rpm,deb: install mgr plugins into /usr/share/ceph/mgr

Reviewed-by: Boris Ranto <branto@redhat.com>
2019-02-16 23:20:27 +08:00
Kefu Chai
e062432902
Merge pull request #26449 from tchaikov/wip-monc-cleanup
mon/MonClient: drop my_addr

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-02-16 23:16:09 +08:00
Kefu Chai
ac1f62b750 rpm,deb: remove btrfs-tools as a build-dependency
this change reverts 7d48d21a

we are using bluestore for testing by default on GNU/Linux now. and on
FreeBSD, install-deps.sh does not look at spec.in or d/control.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-16 21:47:55 +08:00
Kefu Chai
502160594a rpm,deb: remove bc as a build-dependency
this change reverts 3ff4be6d, because in ce9c0298, we replaced bc
with awk.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-16 21:47:55 +08:00
Mark Nelson
6e2d3b80b9 options: update some descriptions and see_also fields.
Signed-off-by: Mark Nelson <mnelson@redhat.com>
2019-02-16 17:53:59 +08:00
Kefu Chai
c70faf4b13 rpm: mark mgr plugins "noarch"
as they are architecture independent.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-16 17:47:42 +08:00
Kefu Chai
5d3e7b4418 debian: s|lib/ceph/mgr|share/ceph/mgr|
as the mgr plugins are installed into $prefix/share/ceph/mgr now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-16 17:47:42 +08:00
Kefu Chai
5aab09992a rpm: s|lib/ceph/mgr|share/ceph/mgr|
as the mgr plugins are installed into $prefix/share/ceph/mgr now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-16 16:38:27 +08:00
Kefu Chai
b81bce0007 cmake: rename CMAKE_INSTALL_{FULL_}?PKGLIBDIR
rename CMAKE_INSTALL_{FULL_}?PKGLIBDIR to
CEPH_INSTALL_{FULL_}?PKGLIBDIR. in order to differentiate them from the
paths not ended with "ceph".

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-16 16:38:27 +08:00
Kefu Chai
6a788dac01 cmake: install mgr plugins into $prefix/share/ceph
as mgr plugins are architecture independent source files. see also
/usr/share/cmake-*/

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-16 16:38:27 +08:00
Patrick Donnelly
ac5bff1ddd
mds: do not show standby-replay as ranks
Before:

    mds: cephfs:1 {0=c=up:standby-replay}, 0 up:standby

After:

    mds: a:1 {0=cs=up:active} 1 up:standby-replay 4 up:standby

Fixes: http://tracker.ceph.com/issues/38347
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-02-15 17:08:46 -08:00
Sage Weil
cc1a7ea972 Merge PR #26455 into master
* refs/pull/26455/head:
	qa/suites/upgrade/mimic-x/stress-split: drop pglog_hardlimit test
	qa/suites/upgrade/mimic-x/stress-split: update for msgr2
	qa/suites/upgrade/mimic-x/parallel: update for msgr v2

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-02-15 18:14:05 -06:00
David Zafman
afe8859e3e
Merge pull request #26416 from dzafman/wip-fix-test-loops
test: Limit loops waiting for force-backfill/force-recovery to happen

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-02-15 14:25:59 -08:00
Sage Weil
359e5bb37c Merge PR #26448 into master
* refs/pull/26448/head:
	osd: do not send peers really old maps
	osd: build_incremental_map_msg: recover if we are missing an incremental
	osd: build_incremental_map_msg: behave if we have latest full but not incremental

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-02-15 16:22:14 -06:00