]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoobjecter: avoid recursive lock of Objecter::rwlock 7343/head
Yan, Zheng [Mon, 25 Jan 2016 07:55:38 +0000 (15:55 +0800)]
objecter: avoid recursive lock of Objecter::rwlock

Objecter::RequestStateHook::call() already takes read lock of
Objecter::rwlock. Taking read lock again in Objecter::_dump_foo_ops()
can trigger lockdep assertion.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #6976 from dzafman/wip-13862
Sage Weil [Thu, 21 Jan 2016 15:50:46 +0000 (10:50 -0500)]
Merge pull request #6976 from dzafman/wip-13862

osd: fix temp object removal after upgrade

http://pulpito.ceph.com/sage-2016-01-20_17:01:32-upgrade:hammer-x-wip-sage-testing---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Wed, 20 Jan 2016 21:49:12 +0000 (16:49 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #7300 from ceph/wip-cmake
Casey Bodley [Wed, 20 Jan 2016 21:12:45 +0000 (16:12 -0500)]
Merge pull request #7300 from ceph/wip-cmake

cmake: test_build_libcephfs needs ${ALLOC_LIBS}

9 years agocmake: test_build_libcephfs needs ${ALLOC_LIBS} 7300/head
Ali Maredia [Wed, 20 Jan 2016 19:41:28 +0000 (14:41 -0500)]
cmake: test_build_libcephfs needs ${ALLOC_LIBS}

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #7231 from renhwsky/renhw-wip-14369
Kefu Chai [Wed, 20 Jan 2016 13:18:28 +0000 (21:18 +0800)]
Merge pull request #7231 from renhwsky/renhw-wip-14369

osd: remove unused OSDMap::set_weightf()

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7164 from flaf/master
Kefu Chai [Wed, 20 Jan 2016 08:37:50 +0000 (16:37 +0800)]
Merge pull request #7164 from flaf/master

doc: fix "mon osd down out subtree limit" option name

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: fix "mon osd down out subtree limit" option name 7164/head
lafont [Sat, 9 Jan 2016 04:38:25 +0000 (05:38 +0100)]
doc: fix "mon osd down out subtree limit" option name

The name of the parameter `mon osd down out subtree limit`
was incorrect (with `downout` instead of `down out`).
Furthermore, the description seemed to me a little bit
ambiguous.

Signed-off-by: François Lafont <francois.lafont@ac-versailles.fr>
9 years agoMerge pull request #7246 from ukernel/jewel-14377
Gregory Farnum [Wed, 20 Jan 2016 02:24:34 +0000 (18:24 -0800)]
Merge pull request #7246 from ukernel/jewel-14377

ceph_test_libcephfs: tolerate duplicated entries in readdir

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6205 from jcsp/wip-volume-client
Gregory Farnum [Wed, 20 Jan 2016 02:21:23 +0000 (18:21 -0800)]
Merge pull request #6205 from jcsp/wip-volume-client

pybind: add ceph_volume_client interface for Manila and similar frameworks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7229 from david-z/wip-master-fix-failling-to-cache-pressure
Gregory Farnum [Wed, 20 Jan 2016 02:19:56 +0000 (18:19 -0800)]
Merge pull request #7229 from david-z/wip-master-fix-failling-to-cache-pressure

ceph-fuse: fix double decreasing the count to trim caps

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7209 from ukernel/jewel-11517
Gregory Farnum [Wed, 20 Jan 2016 02:17:23 +0000 (18:17 -0800)]
Merge pull request #7209 from ukernel/jewel-11517

client: check if Fh is readable when processing a read

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7199 from ukernel/jewel-14254
Gregory Farnum [Wed, 20 Jan 2016 02:13:58 +0000 (18:13 -0800)]
Merge pull request #7199 from ukernel/jewel-14254

mds: fix client cap/message replay order on restart

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7279 from zaitcev/wip-5073-subuser
Yehuda Sadeh [Wed, 20 Jan 2016 00:46:17 +0000 (16:46 -0800)]
Merge pull request #7279 from zaitcev/wip-5073-subuser

rgw: Parse --subuser better

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge remote-tracking branch 'origin/jewel'
Josh Durgin [Tue, 19 Jan 2016 21:44:31 +0000 (13:44 -0800)]
Merge remote-tracking branch 'origin/jewel'

9 years agoMerge pull request #6496 from ceph/wip-fs-snaptests
Gregory Farnum [Tue, 19 Jan 2016 19:38:15 +0000 (11:38 -0800)]
Merge pull request #6496 from ceph/wip-fs-snaptests

qa/workunits/snaps: move snap tests into fs sub-directory

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6868 from H3C/wip-11642-cephfuse-useage
Gregory Farnum [Tue, 19 Jan 2016 19:37:21 +0000 (11:37 -0800)]
Merge pull request #6868 from H3C/wip-11642-cephfuse-useage

ceph-fuse:print usage information when no parameter specified

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7270 from cbodley/wip-cmake-execinfo
Orit Wasserman [Tue, 19 Jan 2016 18:20:19 +0000 (19:20 +0100)]
Merge pull request #7270 from cbodley/wip-cmake-execinfo

cmake: add missing check for HAVE_EXECINFO_H

9 years agoMerge pull request #7280 from zaitcev/wip-5073-update2
Yehuda Sadeh [Tue, 19 Jan 2016 17:55:57 +0000 (09:55 -0800)]
Merge pull request #7280 from zaitcev/wip-5073-update2

rgw: Drop a debugging message

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: Parse --subuser better 7279/head
Pete Zaitcev [Tue, 19 Jan 2016 06:44:42 +0000 (23:44 -0700)]
rgw: Parse --subuser better

This fixes a funny message "ERROR: 'tenant$user != tenant$user'"
in case --subuser='tenant$user' is supplied.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
9 years agorgw: Drop a debugging message 7280/head
Pete Zaitcev [Tue, 19 Jan 2016 06:48:11 +0000 (23:48 -0700)]
rgw: Drop a debugging message

A P3-tagged message escaped upstream.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
9 years agoMerge pull request #7274 from dillaman/wip-helgrind-race-jewel
Josh Durgin [Tue, 19 Jan 2016 11:47:16 +0000 (06:47 -0500)]
Merge pull request #7274 from dillaman/wip-helgrind-race-jewel

helgrind: additional race conditionslibrbd: journal replay should honor inter-event dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: missing lock on state transition 7274/head
Jason Dillaman [Mon, 18 Jan 2016 22:53:00 +0000 (17:53 -0500)]
librbd: missing lock on state transition

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agohelgrind: annotate false-positive race conditions
Jason Dillaman [Mon, 18 Jan 2016 22:52:51 +0000 (17:52 -0500)]
helgrind: annotate false-positive race conditions

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7272 from dillaman/wip-14385-jewel
Josh Durgin [Mon, 18 Jan 2016 22:30:48 +0000 (17:30 -0500)]
Merge pull request #7272 from dillaman/wip-14385-jewel

qa: disable rbd/qemu-iotests test case 055 on RHEL/CentOSlibrbd: journal replay should honor inter-event dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7019 from dillaman/wip-14006
Josh Durgin [Mon, 18 Jan 2016 22:09:05 +0000 (17:09 -0500)]
Merge pull request #7019 from dillaman/wip-14006

librbd: journal replay should honor inter-event dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS 7272/head
Jason Dillaman [Mon, 18 Jan 2016 20:57:43 +0000 (15:57 -0500)]
qa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS

Fixes: #14385
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocmake: add missing check for HAVE_EXECINFO_H 7270/head
Casey Bodley [Mon, 18 Jan 2016 18:47:28 +0000 (13:47 -0500)]
cmake: add missing check for HAVE_EXECINFO_H

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #7265 from ceph/wip-14397-disable-xfs-extsize
Sage Weil [Mon, 18 Jan 2016 19:11:21 +0000 (14:11 -0500)]
Merge pull request #7265 from ceph/wip-14397-disable-xfs-extsize

osd: disable filestore_xfs_extsize by default

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoosd: disable filestore_xfs_extsize by default 7265/head
Ken Dreyer [Mon, 18 Jan 2016 15:24:46 +0000 (08:24 -0700)]
osd: disable filestore_xfs_extsize by default

This option involves a tradeoff: When disabled, fragmentation is worse,
but large sequential writes are faster. When enabled, large sequential
writes are slower, but fragmentation is reduced.

Fixes: #14397
9 years agoos/kstore: fix u64 decode checks
Sage Weil [Mon, 18 Jan 2016 14:55:17 +0000 (09:55 -0500)]
os/kstore: fix u64 decode checks

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge branch 'wip-bluestore'
Sage Weil [Mon, 18 Jan 2016 14:53:02 +0000 (09:53 -0500)]
Merge branch 'wip-bluestore'

9 years agoos/bluestore: fix _key_decode_u64 error checks
Sage Weil [Mon, 18 Jan 2016 14:52:40 +0000 (09:52 -0500)]
os/bluestore: fix _key_decode_u64 error checks

The data that follows may be binary encoded and null.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/FreelistManager: switch to std::mutex
Sage Weil [Thu, 14 Jan 2016 16:53:36 +0000 (11:53 -0500)]
os/bluestore/FreelistManager: switch to std::mutex

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7211 from cxwshawn/clean-fix
Sage Weil [Mon, 18 Jan 2016 14:28:41 +0000 (09:28 -0500)]
Merge pull request #7211 from cxwshawn/clean-fix

osd: ReplicatedPG: clean up unused function

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7158 from yuyuyu101/wip-async-cleanup-deleted
Sage Weil [Mon, 18 Jan 2016 14:27:20 +0000 (09:27 -0500)]
Merge pull request #7158 from yuyuyu101/wip-async-cleanup-deleted

msg/async: cleanup dead connection and misc things

9 years agoMerge pull request #6809 from yuyuyu101/wip-13985
Sage Weil [Mon, 18 Jan 2016 14:26:40 +0000 (09:26 -0500)]
Merge pull request #6809 from yuyuyu101/wip-13985

msgr:  fix large message data content length causing overflow

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7047 from xiexingguo/xxg-wip-14176
Sage Weil [Mon, 18 Jan 2016 14:26:00 +0000 (09:26 -0500)]
Merge pull request #7047 from xiexingguo/xxg-wip-14176

osd: KeyValueStore: fix wrongly placed assert

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #7142 from xiexingguo/xxg-wip-crush
Sage Weil [Mon, 18 Jan 2016 14:25:20 +0000 (09:25 -0500)]
Merge pull request #7142 from xiexingguo/xxg-wip-crush

crushtool: improve usage/tip messages

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7203 from branch-predictor/bp-use-faster-is-zero
Sage Weil [Mon, 18 Jan 2016 14:24:39 +0000 (09:24 -0500)]
Merge pull request #7203 from branch-predictor/bp-use-faster-is-zero

osd: use optimized is_zero in object_stat_sum_t.is_zero()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7169 from trociny/fix-bluestore-without-aio
Sage Weil [Mon, 18 Jan 2016 14:23:34 +0000 (09:23 -0500)]
Merge pull request #7169 from trociny/fix-bluestore-without-aio

osd: bluestore: don't include when building without libaio

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5900 from ritz303/wip-doc-12899
Kefu Chai [Fri, 15 Jan 2016 16:45:48 +0000 (00:45 +0800)]
Merge pull request #5900 from ritz303/wip-doc-12899

doc: Updated the rados command man page to include the --run-name opt…

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7249 from ceph/wip-fix-cmake-trusty
Casey Bodley [Fri, 15 Jan 2016 16:07:45 +0000 (11:07 -0500)]
Merge pull request #7249 from ceph/wip-fix-cmake-trusty

cmake: fix the build on trusty

9 years agolibrbd: handle additional journal replay states 7019/head
Jason Dillaman [Fri, 15 Jan 2016 15:40:06 +0000 (10:40 -0500)]
librbd: handle additional journal replay states

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: avoid recursive callback when replaying journal
Jason Dillaman [Fri, 15 Jan 2016 15:38:54 +0000 (10:38 -0500)]
librbd: avoid recursive callback when replaying journal

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: correct googlemock warnings
Jason Dillaman [Fri, 15 Jan 2016 15:32:28 +0000 (10:32 -0500)]
tests: correct googlemock warnings

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: update tests to support replaying snap create / resize
Jason Dillaman [Tue, 22 Dec 2015 20:55:19 +0000 (15:55 -0500)]
tests: update tests to support replaying snap create / resize

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: initial hook points for snap create / resize journal replay
Jason Dillaman [Tue, 22 Dec 2015 19:00:43 +0000 (14:00 -0500)]
librbd: initial hook points for snap create / resize journal replay

After snap create has blocked IO and after resize has ensured clipped
IO boundaries, they will resume the playback of journal events.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: journal events still possible during shutdown
Jason Dillaman [Tue, 22 Dec 2015 18:54:15 +0000 (13:54 -0500)]
librbd: journal events still possible during shutdown

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: new unit test for snap rollback state machine
Jason Dillaman [Tue, 22 Dec 2015 18:40:51 +0000 (13:40 -0500)]
tests: new unit test for snap rollback state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: snapshot rollback should block writes
Jason Dillaman [Tue, 22 Dec 2015 17:05:47 +0000 (12:05 -0500)]
librbd: snapshot rollback should block writes

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: track simple maintenance ops to coordinate replay
Jason Dillaman [Tue, 22 Dec 2015 15:18:33 +0000 (10:18 -0500)]
librbd: track simple maintenance ops to coordinate replay

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: asynchronously replay journal events
Jason Dillaman [Tue, 22 Dec 2015 01:27:36 +0000 (20:27 -0500)]
librbd: asynchronously replay journal events

Properly track when AIO operations are safely committed to
disk before marking the journal events are committed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: unit test cases for all available journal events
Jason Dillaman [Thu, 17 Dec 2015 20:29:40 +0000 (15:29 -0500)]
tests: unit test cases for all available journal events

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: initial integration of maintenance op journal replay
Jason Dillaman [Thu, 17 Dec 2015 20:28:31 +0000 (15:28 -0500)]
librbd: initial integration of maintenance op journal replay

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: AioImageRequest base class is now templated
Jason Dillaman [Thu, 17 Dec 2015 18:21:42 +0000 (13:21 -0500)]
librbd: AioImageRequest base class is now templated

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: updated librbd test cases for updated maint ops API
Jason Dillaman [Thu, 17 Dec 2015 16:09:18 +0000 (11:09 -0500)]
tests: updated librbd test cases for updated maint ops API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: moved all maintenance ops to new Operations class
Jason Dillaman [Thu, 17 Dec 2015 15:46:00 +0000 (10:46 -0500)]
librbd: moved all maintenance ops to new Operations class

This will permit unit testing and will facilitate proper
serialization of requests (when necessary).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: journal event handling test updates
Jason Dillaman [Thu, 17 Dec 2015 06:25:45 +0000 (01:25 -0500)]
tests: journal event handling test updates

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: unit test case for librbd::operation::ResizeRequest
Jason Dillaman [Thu, 17 Dec 2015 06:22:37 +0000 (01:22 -0500)]
tests: unit test case for librbd::operation::ResizeRequest

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: properly order maintenance ops journal events
Jason Dillaman [Thu, 17 Dec 2015 04:17:22 +0000 (23:17 -0500)]
librbd: properly order maintenance ops journal events

In general, the op shoud only start after the jouranl event is
safely committed.  Snapshot create and resize need special treatment
to record the event while no IO is in-progress.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: fixed "hidden" virtual methods
Jason Dillaman [Wed, 16 Dec 2015 21:18:55 +0000 (16:18 -0500)]
librbd: fixed "hidden" virtual methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: handle journal and IO commits in either sequence
Jason Dillaman [Wed, 16 Dec 2015 18:46:16 +0000 (13:46 -0500)]
librbd: handle journal and IO commits in either sequence

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: allocate and associate op tids to maint op journal events
Jason Dillaman [Wed, 16 Dec 2015 15:48:08 +0000 (10:48 -0500)]
librbd: allocate and associate op tids to maint op journal events

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: unit tests for librbd Journal
Jason Dillaman [Tue, 15 Dec 2015 21:16:53 +0000 (16:16 -0500)]
tests: unit tests for librbd Journal

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: journal replay flush should be async
Jason Dillaman [Tue, 15 Dec 2015 18:20:48 +0000 (13:20 -0500)]
librbd: journal replay flush should be async

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: convert journal classes to templates for unit testing
Jason Dillaman [Tue, 15 Dec 2015 16:13:34 +0000 (11:13 -0500)]
librbd: convert journal classes to templates for unit testing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: compile RBD and RGW types into ceph-dencoder when enabled
Jason Dillaman [Wed, 16 Dec 2015 15:40:56 +0000 (10:40 -0500)]
tests: compile RBD and RGW types into ceph-dencoder when enabled

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: move journal support classes to journal namespace
Jason Dillaman [Tue, 15 Dec 2015 15:34:24 +0000 (10:34 -0500)]
librbd: move journal support classes to journal namespace

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocmake: fix the build on trusty 7249/head
Kefu Chai [Fri, 15 Jan 2016 14:20:46 +0000 (22:20 +0800)]
cmake: fix the build on trusty

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoceph_test_libcephfs: tolerate duplicated entries in readdir 7246/head
Yan, Zheng [Fri, 15 Jan 2016 09:15:16 +0000 (17:15 +0800)]
ceph_test_libcephfs: tolerate duplicated entries in readdir

If a dirfrag get fragmented in the middle of readdir, the readdir
result may contain duplicated entries. (but there shouldn't be
any missing entries)

Fixes: #14377
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoosd:osdmap some clean up 7231/head
huanwen ren [Fri, 15 Jan 2016 05:38:59 +0000 (13:38 +0800)]
osd:osdmap some clean up

remove set_weightf

Fixes: #14369
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agomds: add config option to suspend logging 7199/head
Yan, Zheng [Fri, 15 Jan 2016 05:33:21 +0000 (13:33 +0800)]
mds: add config option to suspend logging

The option creates long-standing unsafe MDS requests. It help in
testing unsafe request related corner cases.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agomds: fix completed cap flush handling
Yan, Zheng [Wed, 13 Jan 2016 14:00:53 +0000 (22:00 +0800)]
mds: fix completed cap flush handling

Client re-send cap flush when MDS restarts. The cap flush message
may release some caps even if the corresponding flush is already
completed.

Fixes: #13546
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agomds: delay handling client caps until corresponding inode is created
Yan, Zheng [Tue, 12 Jan 2016 08:54:14 +0000 (16:54 +0800)]
mds: delay handling client caps until corresponding inode is created

When handling client caps in clientreplay stage, it's possible that
corresponding inode does not exist because the client request which
creates inode hasn't been replayed. To handle this corner case, we
delay handling caps message until corresponding inode is created.

Fixes: #14254
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge branch 'wip-compressor'
Sage Weil [Fri, 15 Jan 2016 00:04:46 +0000 (19:04 -0500)]
Merge branch 'wip-compressor'

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoCompressor: compressor plugins unit tests
Ved-vampir [Tue, 10 Nov 2015 15:47:18 +0000 (18:47 +0300)]
Compressor: compressor plugins unit tests

Signed-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
9 years agoCompressor: compressor code extention: plugin system added
Ved-vampir [Tue, 10 Nov 2015 15:20:02 +0000 (18:20 +0300)]
Compressor: compressor code extention: plugin system added

Signed-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
9 years agoMerge pull request #6425 from branch-predictor/bp-delayed-pglog-index-v2
Sage Weil [Fri, 15 Jan 2016 00:02:30 +0000 (19:02 -0500)]
Merge pull request #6425 from branch-predictor/bp-delayed-pglog-index-v2

osd: delay populating in-memory PG log hashmaps

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6797 from mathslinux/fix-parse-return
Sage Weil [Fri, 15 Jan 2016 00:01:00 +0000 (19:01 -0500)]
Merge pull request #6797 from mathslinux/fix-parse-return

rgw: fix wrong check for parse() return

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7087 from H3C/wip-yrf-cephdf
Sage Weil [Fri, 15 Jan 2016 00:00:16 +0000 (19:00 -0500)]
Merge pull request #7087 from H3C/wip-yrf-cephdf

mon: add RAW USED column to ceph df detail

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7106 from tchaikov/wip-11101
Sage Weil [Thu, 14 Jan 2016 23:59:46 +0000 (18:59 -0500)]
Merge pull request #7106 from tchaikov/wip-11101

ceph: improve the error message

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7122 from xiexingguo/xxg-wip-bluefs
Sage Weil [Thu, 14 Jan 2016 23:59:12 +0000 (18:59 -0500)]
Merge pull request #7122 from xiexingguo/xxg-wip-bluefs

osd: bluestore: fix several bugs

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7196 from liewegas/wip-bluestore
Sage Weil [Thu, 14 Jan 2016 23:57:57 +0000 (18:57 -0500)]
Merge pull request #7196 from liewegas/wip-bluestore

osd: bluestore: fix space rebalancing, collection split, buffered reads

9 years agoMerge pull request #7200 from xiexingguo/xxg-wip-14343
Sage Weil [Thu, 14 Jan 2016 23:57:26 +0000 (18:57 -0500)]
Merge pull request #7200 from xiexingguo/xxg-wip-14343

osd: bluestore: bluefs: fix several small bugs

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7213 from xiexingguo/xxg-wip-14351
Sage Weil [Thu, 14 Jan 2016 23:56:16 +0000 (18:56 -0500)]
Merge pull request #7213 from xiexingguo/xxg-wip-14351

osd: kstore: several small fixes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'upstream/jewel'
Jason Dillaman [Thu, 14 Jan 2016 21:21:05 +0000 (16:21 -0500)]
Merge remote-tracking branch 'upstream/jewel'

9 years agoMerge pull request #7222 from dack/master
Sage Weil [Thu, 14 Jan 2016 20:49:03 +0000 (15:49 -0500)]
Merge pull request #7222 from dack/master

ceph-disk: add -f flag for btrfs mkfs

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge branch 'greg-fs-testing'
Greg Farnum [Thu, 14 Jan 2016 18:27:17 +0000 (10:27 -0800)]
Merge branch 'greg-fs-testing'

9 years agofsx: checkout old version until it compiles properly on miras
Greg Farnum [Wed, 13 Jan 2016 21:17:53 +0000 (13:17 -0800)]
fsx: checkout old version until it compiles properly on miras

I sent a patch to xfstests upstream at
http://article.gmane.org/gmane.comp.file-systems.fstests/1665, but
until that's fixed we need a version that works in our test lab.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge branch 'wip-13569' of git://github.com/ukernel/ceph into greg-fs-testing
Greg Farnum [Wed, 13 Jan 2016 02:37:56 +0000 (18:37 -0800)]
Merge branch 'wip-13569' of git://github.com/ukernel/ceph into greg-fs-testing

https://github.com/ceph/ceph/pull/6463

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge branch 'wip-13127-master' into greg-fs-testing
Greg Farnum [Wed, 13 Jan 2016 02:37:24 +0000 (18:37 -0800)]
Merge branch 'wip-13127-master' into greg-fs-testing

https://github.com/ceph/ceph/pull/5990

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge remote-tracking branch 'origin/wip-libcephfs-acl' into greg-fs-testing
Greg Farnum [Thu, 14 Jan 2016 18:24:15 +0000 (10:24 -0800)]
Merge remote-tracking branch 'origin/wip-libcephfs-acl' into greg-fs-testing

https://github.com/ceph/ceph/pull/5658

Reviewed-by: John Spray <jspray@redhat.com>
Conflicts:
src/common/config_opts.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge branch 'wip-root-metadata' of git://github.com/jcsp/ceph into greg-fs-testing
Greg Farnum [Wed, 13 Jan 2016 01:57:04 +0000 (17:57 -0800)]
Merge branch 'wip-root-metadata' of git://github.com/jcsp/ceph into greg-fs-testing

https://github.com/ceph/ceph/pull/6179

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agodoc/release-notes: v10.0.2
Sage Weil [Thu, 14 Jan 2016 14:47:29 +0000 (09:47 -0500)]
doc/release-notes: v10.0.2

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7235 from theanalyst/fix/pybind-build-failure
Jason Dillaman [Thu, 14 Jan 2016 14:30:46 +0000 (09:30 -0500)]
Merge pull request #7235 from theanalyst/fix/pybind-build-failure

pybind: fix build failure, remove extraneous semicolon in method

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agopybind/rbd.pyx: drop stray semicolon
Sage Weil [Thu, 14 Jan 2016 14:22:48 +0000 (09:22 -0500)]
pybind/rbd.pyx: drop stray semicolon

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/FreelistManager: fix _dump locking 7196/head
Sage Weil [Thu, 14 Jan 2016 14:18:24 +0000 (09:18 -0500)]
os/bluestore/FreelistManager: fix _dump locking

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agopybind: remove extraneous semicolon in method 7235/head
Abhishek Lekshmanan [Thu, 14 Jan 2016 13:51:32 +0000 (14:51 +0100)]
pybind: remove extraneous semicolon in method

A semicolon on `rbd_build_object_map` method was causing build failures
in current master

Fixes: #14371
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoosd: less chatter about tick 7234/head
Sage Weil [Thu, 14 Jan 2016 13:46:45 +0000 (08:46 -0500)]
osd: less chatter about tick

Signed-off-by: Sage Weil <sage@redhat.com>