Commit Graph

83174 Commits

Author SHA1 Message Date
Kefu Chai
34c3af45a5
Merge pull request #18804 from majianpeng/bluestore-collection-prealloc
os/bluestore: Prealloc memory avoid realloc in list_collection.

Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-09 10:43:24 +08:00
Kefu Chai
7894961e9f
Merge pull request #18494 from ifed01/wip-stupidalloc-fix2
os/bluestore: do not assert if BlueFS rebalance is unable to allocate sufficient space

Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-09 10:42:43 +08:00
Kefu Chai
a82cad5839
Merge pull request #18343 from shinobu-x/sk-remove-osdmap
mon/PGMap: Remove unnecessary header

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-09 10:41:50 +08:00
Patrick Donnelly
8c95cc5144
Merge PR #19954 into master
* refs/pull/19954/head:
	test/encoding: refactor to avoid escaping shell magic
	mds: minor refactor of SimpleLock
	mds: track Capability in mempool
	mds: move CInode container members to mempool
	mds: move CDentry container members to mempool
	mds: move CDir container members to mempool
	mds: put MDSCacheObject compact_map in mempool
	common: use size_t for object size
	mds: convert to allocator agnostic string_view
	mds: simplify initialization
	compact_*: support mempool allocated containers

Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-02-08 18:17:15 -08:00
Radoslaw Zarzynski
248750fea4 osd: PrimaryLogPG::do_osd_ops() uses md_config_cacher_t.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2018-02-09 02:46:58 +01:00
Jason Dillaman
7b7a7d55b1
Merge pull request #20007 from mogeb/steady-clock-librbd
librbd: use steady clock to measure elapsed time in AioCompletion

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-08 19:20:21 -05:00
Jason Dillaman
5029ee8a60
Merge pull request #20008 from mogeb/steady-clock-tools-rbd
tools/rbd: use steady clock in bencher

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-08 19:20:07 -05:00
Jason Dillaman
7b79305f60
Merge pull request #20218 from shun-s/wip-speedup-diskusage-resize
librbd: speed up object map disk usage and resize

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-08 19:19:52 -05:00
Jason Dillaman
6d5652125c
Merge pull request #20311 from Songweibin/wip-group-snap-ls
rbd: do not show title if there is no group snapshot

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-08 19:19:35 -05:00
Jason Dillaman
6c3d5aa149
Merge pull request #20349 from trociny/wip-22932
rbd-mirror: fix potential infinite loop when formatting status message

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-08 19:19:12 -05:00
Patrick Donnelly
84ae0ce5fc
Merge PR #20310 into master
* refs/pull/20310/head:
	qa: adjust cephfs full test for kclient

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-08 13:30:04 -08:00
Patrick Donnelly
65217e5363
Merge PR #20148 into master
* refs/pull/20148/head:
	mds: reset connection's priv when marking down connection
	mds: fix session reference leak

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-08 13:05:26 -08:00
Patrick Donnelly
b0afc33811
Merge PR #20155 into master
* refs/pull/20155/head:
	osdc/Journaler: make sure flush() writes enough data

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-08 13:05:19 -08:00
Patrick Donnelly
e8e72570fe
Merge PR #20190 into master
* refs/pull/20190/head:
	mon: allow removal of tier of ec overwritable pool

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
2018-02-08 13:05:12 -08:00
Patrick Donnelly
06b176b362
Merge PR #20200 into master
* refs/pull/20200/head:
	client: add cap_dirtier_uid/gid to CapSnap

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2018-02-08 13:05:05 -08:00
Patrick Donnelly
cb03b5e7f5
Merge PR #20246 into master
* refs/pull/20246/head:
	mds: remove extra 0x in ino prints
	mds: print inode number not CInode ptr
2018-02-08 13:04:54 -08:00
Sage Weil
59bdada5d5 mon/OSDMonitor: accept crush_device_class in 'osd new' json input
If provided, set the OSD device_class at OSD creation time.  This is
simpler than writing a file that the OSD has to read in and use to
set its initial device class, and also avoids a bit of sticky state
at the OSD that will make it keep trying to reset its device class on
startup if it ever gets cleared.

Note that we now ignore json input fields we don't understand, so remove
a test case.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-08 12:34:49 -06:00
Kefu Chai
789b23ad85 doc/mgr: remove none user-facing code from doc
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-09 01:47:35 +08:00
Kefu Chai
5613fe38a9 test/test_admin_socket_output: allow different asok directory
the asok files are not necessary located in ./out, actually, they are
put in $TMPDIR/ceph-asok.$random_stuff .

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-08 22:37:54 +08:00
Kefu Chai
1979b011ae test/admin_socket_output: no need to create a copy of fs::path
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-08 22:37:53 +08:00
Alfredo Deza
7a5777183e
Merge pull request #20367 from ceph/simple-custom-cluster
ceph-volume: adds custom cluster name support to simple

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2018-02-08 08:48:41 -05:00
Andrew Schoen
7f1dc6b3ab ceph-volume: use a custom cluster name in simple functional tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-02-08 07:09:57 -06:00
Xie Xingguo
f1cb504b2a
Merge pull request #20305 from xiexingguo/wip-more-balancer-fixes
pybind/mgr/balancer: more specific command outputs

Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-08 12:30:46 +08:00
Xie Xingguo
9119dd6056
Merge pull request #20355 from luomuyao/typo
rgw: fix a typo in comment

Reviewed-by: Jos Collin <jcollin@redhat.com>
2018-02-08 11:41:48 +08:00
Patrick Donnelly
46c25abd1c
test/encoding: refactor to avoid escaping shell magic
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-07 18:03:05 -08:00
Patrick Donnelly
e9be29c6aa
mds: minor refactor of SimpleLock
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-07 18:03:05 -08:00
Patrick Donnelly
b106408f95
mds: track Capability in mempool
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-07 18:03:05 -08:00
Patrick Donnelly
7e2f59aad3
mds: move CInode container members to mempool
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-07 18:02:50 -08:00
Radoslaw Zarzynski
28997c1c6b os/bluestore: avoid overhead of std::function in blob_t.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2018-02-08 02:46:46 +01:00
luomuyao
1f3cdac856 rgw: fix a typo in comment
Signed-off-by: luomuyao <luo.muyao@zte.com.cn>
2018-02-08 09:02:50 +08:00
Brad Hubbard
ed7a74464d mon/OSDMonitor: Remove unused functions
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2018-02-08 08:59:12 +10:00
Josh Durgin
9f6d865cd5
Merge pull request #20161 from tchaikov/wip-20086
test/librados: be more tolerant with timed lock tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-02-07 14:43:59 -08:00
Josh Durgin
eae6e64034
Merge pull request #20173 from liewegas/wip-os-ch
os: unify Sequencer and CollectionHandle

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-02-07 14:04:08 -08:00
Andrew Schoen
b1cee74fa2 ceph-volume: set conf.cluster name during simple activate
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-02-07 14:42:24 -06:00
Adam C. Emerson
5126848f88
Merge pull request #20144 from adamemerson/wip-cache-register
Cache Register!

Provide the ability to examine and delete elements from the cache.

rgw: Add cache introspection and manipulation

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-07 13:46:18 -05:00
Mykola Golub
db81bd81fa
Merge pull request #20176 from dillaman/wip-librbd-clone-v2-1
librbd: initial hooks for clone v2 support

Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-02-07 19:54:50 +02:00
Adam C. Emerson
69fafcaaed rgw: Add cache introspection and manipulation
Provide the ability to examine and delete elements from the cache.

Fixes: http://tracker.ceph.com/issues/22603
Fixes: http://tracker.ceph.com/issues/22604
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-07 12:20:52 -05:00
Mykola Golub
2fb99b5ed3 rbd-mirror: fix potential infinite loop when formatting status message
The improvements include:

- tag_tid values should always be increasing, so loop only if
  master.tag_tid > mirror_tag_tid in calculate_behind_master_or_send_update;
- in send_update_tag_cache don't refetch a tag if it is already in the
  cache;
- make fake tags with tag_data.predecessor.tag_tid set to zero;
- make sure the new tag is inserted to the cache if an old entry
  with this id happens to exist.

Fixes: http://tracker.ceph.com/issues/22932
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-02-07 18:30:16 +02:00
Kefu Chai
22a7bc4c7d
Merge pull request #20318 from ovh/bp-limit-normalize-key
common/config: limit calls to normalize_key_name

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-07 22:43:58 +08:00
Kefu Chai
bcbcdd26b2
Merge pull request #19958 from renhwztetecs/renhw-wip-osd-sighup
osd: Sign in early SIGHUP signal

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-07 22:40:59 +08:00
Patrick Donnelly
920ea85ad1
mds: move CDentry container members to mempool
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-07 06:40:46 -08:00
Patrick Donnelly
6b7073fe55
mds: move CDir container members to mempool
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-07 06:40:46 -08:00
Patrick Donnelly
b7fa3eec0f
mds: put MDSCacheObject compact_map in mempool
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-07 06:40:46 -08:00
Patrick Donnelly
43af5afca6
common: use size_t for object size
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-07 06:40:46 -08:00
Patrick Donnelly
0c8ec93af7
mds: convert to allocator agnostic string_view
This is necessary to allow many interfaces to take mempool allocated strings.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-07 06:40:30 -08:00
Andrew Schoen
cf2bc0abcd
Merge pull request #20264 from ceph/wip-rm22620
ceph-volume dmcrypt support for simple

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-02-07 15:21:04 +01:00
Kefu Chai
2e56224770
Merge pull request #20307 from tchaikov/wip-std-filesystem
test/admin_socket_output: switch to std::experimental::filesystem

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2018-02-07 21:56:28 +08:00
Kefu Chai
92495add10
Merge pull request #20324 from tchaikov/wip-cmake-build-boost
cmake: fix the include dir for building boost::python

Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
2018-02-07 21:53:30 +08:00
xie xingguo
3da5257a67 pybind/mgr/balancer: cancel plan if distribution is already perfect
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-02-07 21:26:34 +08:00
xie xingguo
147625651f pybind/mgr/balancer: allow customized optimization threshold
In practice it is hard to achieve a 100% (perfect) balanced distribution.
This patch introduces a user visiable threshold configuration here, which
allow user to define the minimal deviation to trigger an optimization.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-02-07 21:26:33 +08:00