Commit Graph

82924 Commits

Author SHA1 Message Date
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
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
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
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
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
xie xingguo
3733b94686 pybind/mgr/balancer: be more specific on creating an optimization plan
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-02-07 21:26:33 +08:00
Xie Xingguo
4d8bae0625
Merge pull request #20347 from Songweibin/wip-osd-cleanup
osd: drop redundant comment

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-02-07 15:34:04 +08:00
songweibin
dd07c22a1d osd: drop redundant comment
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-02-07 13:53:21 +08:00
Patrick Donnelly
a33659d604
Merge PR #20288 into master
* refs/pull/20288/head:
	ptl-tool: open githubmap with utf-8 code

Reviewed-by: Jos Collin <jcollin@redhat.com>
2018-02-06 20:38:14 -08:00
Patrick Donnelly
7375d027a3
mds: remove extra 0x in ino prints
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-06 16:44:51 -08:00
Sage Weil
c58bd9c1bc test/objectstore/TestObjectStoreState: make objects match collection
- start pool at 1
- make hash fall within pg (just match it for now)

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 14:09:31 -06:00
Sage Weil
ab67958010 os/ObjectStore: remove void *osr from Transaction
No longer used!  (It was only needed for an ugly FileStore hack.)

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 14:09:31 -06:00
Sage Weil
31b5aec88e os/filestore: do not rely on ObjectStore::Transaction::osr
This was used only to name the osr for the purposes of the tracepoint. We
can do that ourselves!

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 14:09:30 -06:00
Sage Weil
58e03a9b2f osd: drop explicit calls to osr->flush
These are no longer needed as the implementations do it themselves.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 14:09:30 -06:00
Sage Weil
08eb08a580 osd/PrimaryLogPG: drop unnecessary flush() on shutdown
The ObjectStore implementation should handle this.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 14:09:30 -06:00
Sage Weil
c0c6de3b94 os: make implementation flush before collection_{list,empty}
This takes the (awkward) burden off the caller.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 14:09:30 -06:00
Sage Weil
38d24fefd6 os/ObjectStore: make all read operations CollectionHandle-based
Drop the coll_t shims, and convert the last few that weren't already
handle-based.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 14:09:27 -06:00
Sage Weil
03c8a828ea
Merge pull request #20313 from guzhongyan/fix-22350
osd/OSDMap: misleading message in print_oneline_summary()

Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-06 14:01:41 -06:00
Sage Weil
0ebbb1c62c
Merge pull request #20317 from liewegas/wip-pg-scrub-priority
osd/PG: pass scrub priority to replica

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-06 14:01:19 -06:00
Sage Weil
b2467f02c5
Merge pull request #20319 from tchaikov/wip-ops_blocked_by_scrub-cleanup
osd: pass ops_blocked_by_scrub() to requeue_scrub()

Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-06 14:00:53 -06:00
Andrew Schoen
63046e0d7b ceph-volume: do not test custom cluster names with simple
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-02-06 11:36:03 -06:00
Sage Weil
3ca0e0c565
Merge pull request #20279 from liewegas/wip-idempotent-sequence
ceph_test_filestore_idempotent_sequence: many fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-02-06 10:53:35 -06:00
Andrew Schoen
85b319a2c5 ceph-volume: sleep 2 minutes after reboot in simple tests
This will allow for some time for OSD services to start back up after
reboot. If not we see race conditions where tests fail because they
were run before the OSD finished startup.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-02-06 10:46:44 -06:00
Sage Weil
abd58ad0b9 os/ObjectStore: combine Sequencer and CollectionImpl in ObjectStore
In practice we have a sequencer per collection. Combine them in the interface
to simplify our lives!

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 08:21:29 -06:00
Sage Weil
9c8c66c4c8 ceph_test_objectstore_workloadgen: remove
Stale test code, never run.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 08:21:29 -06:00