]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorgw: make RGWMetadataLog::get_shard_oid public and const
Casey Bodley [Tue, 23 Feb 2016 18:07:36 +0000 (13:07 -0500)]
rgw: make RGWMetadataLog::get_shard_oid public and const

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add RGWStatObjCR for async raw_obj_stat
Casey Bodley [Mon, 22 Feb 2016 21:42:39 +0000 (16:42 -0500)]
rgw: add RGWStatObjCR for async raw_obj_stat

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: only write meta sync shard markers if can_adjust_marker
Casey Bodley [Fri, 19 Feb 2016 20:24:00 +0000 (15:24 -0500)]
rgw: only write meta sync shard markers if can_adjust_marker

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: make RGWMetaSyncCR wakeups thread-safe
Casey Bodley [Fri, 19 Feb 2016 20:09:41 +0000 (15:09 -0500)]
rgw: make RGWMetaSyncCR wakeups thread-safe

now that the shards will be coming and going after startup, they need to
be reference counted and protected by a mutex

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw-admin: add read_current_period_id() helper function
Casey Bodley [Fri, 19 Feb 2016 19:19:24 +0000 (14:19 -0500)]
rgw-admin: add read_current_period_id() helper function

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #7869 from rzarzynski/wip-rgw-aws4-puthash
Orit Wasserman [Wed, 2 Mar 2016 17:08:48 +0000 (18:08 +0100)]
Merge pull request #7869 from rzarzynski/wip-rgw-aws4-puthash

rgw: calculate payload hash in RGWPutObj_ObjStore only when necessary.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Wed, 2 Mar 2016 14:22:28 +0000 (09:22 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #7612 from liewegas/wip-buffer-combined
Sage Weil [Wed, 2 Mar 2016 13:31:08 +0000 (08:31 -0500)]
Merge pull request #7612 from liewegas/wip-buffer-combined

buffer: raw_combined allocations buffer and ref count together

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #7690 from xiexingguo/xxg-wip-14804
Sage Weil [Wed, 2 Mar 2016 13:30:26 +0000 (08:30 -0500)]
Merge pull request #7690 from xiexingguo/xxg-wip-14804

common/TrackedOp: fix inaccurate counting for slow requests

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7704 from xiexingguo/xxg-wip-14814
Sage Weil [Wed, 2 Mar 2016 13:29:54 +0000 (08:29 -0500)]
Merge pull request #7704 from xiexingguo/xxg-wip-14814

osd: filestore: fix wrong scope of result code for error cases during mkfs

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7812 from xiexingguo/xxg-wip-14872
Sage Weil [Wed, 2 Mar 2016 13:29:09 +0000 (08:29 -0500)]
Merge pull request #7812 from xiexingguo/xxg-wip-14872

osd: fix wrong return type of find_osd_on_ip()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7815 from branch-predictor/bp-conditional-crc
Haomai Wang [Wed, 2 Mar 2016 13:28:40 +0000 (21:28 +0800)]
Merge pull request #7815 from branch-predictor/bp-conditional-crc

msg/async: don't calculate msg header crc when not needed

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7711 from xiexingguo/xxg-wip-14817
Sage Weil [Wed, 2 Mar 2016 13:28:03 +0000 (08:28 -0500)]
Merge pull request #7711 from xiexingguo/xxg-wip-14817

osd: filestore: fix result code overwritten for clone

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7790 from tchaikov/wip-log-segv
Sage Weil [Wed, 2 Mar 2016 13:27:36 +0000 (08:27 -0500)]
Merge pull request #7790 from tchaikov/wip-log-segv

log: segv in a portable way

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #7842 from xiexingguo/xxg-wip-14921
Sage Weil [Wed, 2 Mar 2016 13:26:30 +0000 (08:26 -0500)]
Merge pull request #7842 from xiexingguo/xxg-wip-14921

osd: fix overload of '==' operator for pg_stat_t

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7390 from badone/wip-13829
Kefu Chai [Wed, 2 Mar 2016 03:22:24 +0000 (11:22 +0800)]
Merge pull request #7390 from badone/wip-13829

common: Allow OPT_INT settings with negative values

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #7854 from yehudasa/wip-authors-update
Kefu Chai [Wed, 2 Mar 2016 02:18:25 +0000 (10:18 +0800)]
Merge pull request #7854 from yehudasa/wip-authors-update

AUTHORS: update email

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7846 from dillaman/wip-14551
Josh Durgin [Wed, 2 Mar 2016 01:18:04 +0000 (17:18 -0800)]
Merge pull request #7846 from dillaman/wip-14551

rbd: update default image features

Conflicts:
PendingReleaseNotes (trivial)

9 years agoMerge pull request #7841 from dillaman/wip-14550
Josh Durgin [Wed, 2 Mar 2016 01:18:18 +0000 (17:18 -0800)]
Merge pull request #7841 from dillaman/wip-14550

rbd: deprecate image format 1

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7839 from dillaman/wip-14809
Josh Durgin [Wed, 2 Mar 2016 01:18:05 +0000 (17:18 -0800)]
Merge pull request #7839 from dillaman/wip-14809

librbd: remove last synchronous librados calls from open/close state machine

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7785 from dillaman/wip-14822
Josh Durgin [Wed, 2 Mar 2016 01:17:50 +0000 (17:17 -0800)]
Merge pull request #7785 from dillaman/wip-14822

librbd: journal replay needs to support re-executing maintenance ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7776 from dillaman/wip-librbd-journal-tweaks
Josh Durgin [Wed, 2 Mar 2016 01:17:31 +0000 (17:17 -0800)]
Merge pull request #7776 from dillaman/wip-librbd-journal-tweaks

journal: improve commit position tracking

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoAUTHORS: update email 7854/head
Yehuda Sadeh [Tue, 1 Mar 2016 04:13:11 +0000 (20:13 -0800)]
AUTHORS: update email

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: calculate payload hash in RGWPutObj_ObjStore only when necessary. 7869/head
Radoslaw Zarzynski [Tue, 1 Mar 2016 20:52:44 +0000 (21:52 +0100)]
rgw: calculate payload hash in RGWPutObj_ObjStore only when necessary.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #7767 from athanatos/wip-sam-journal-throttle-4
Samuel Just [Tue, 1 Mar 2016 20:51:15 +0000 (12:51 -0800)]
Merge pull request #7767 from athanatos/wip-sam-journal-throttle-4

osd: filestore: restructure journal and op queue throttling

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7823 from SUSE/wip-14906
branto1 [Tue, 1 Mar 2016 15:35:21 +0000 (16:35 +0100)]
Merge pull request #7823 from SUSE/wip-14906

packaging: add lsb-release dependency for SUSE and Debian

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #7837 from rldleblanc/wpq-documentation
Sage Weil [Tue, 1 Mar 2016 14:27:21 +0000 (09:27 -0500)]
Merge pull request #7837 from rldleblanc/wpq-documentation

doc: osd-config Add Configuration Options for op queue.

9 years agoMerge pull request #7851 from jupiturliu/obj-bencher-bug
Sage Weil [Tue, 1 Mar 2016 14:25:51 +0000 (09:25 -0500)]
Merge pull request #7851 from jupiturliu/obj-bencher-bug

rados: fix bug for write bench

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7729 from yuyuyu101/wip-spdk2
Sage Weil [Tue, 1 Mar 2016 14:18:15 +0000 (09:18 -0500)]
Merge pull request #7729 from yuyuyu101/wip-spdk2

osd: bluestore: Revert NVMEDevice task cstor and refresh interface changes

9 years agopackaging: lsb_release build and runtime dependency 7823/head
Nathan Cutler [Fri, 26 Feb 2016 17:30:49 +0000 (18:30 +0100)]
packaging: lsb_release build and runtime dependency

The lsb_release executable is being run in multiple places, not least in
src/common/util.cc, which calls it via shell in the collect_sys_info() code
path.

This patch addresses this issue on SUSE- and Debian-derivatives, as well
as reinstating the dependency for RHEL/Fedora after it was dropped in
15600572265bed397fbd80bdd2b7d83a0e9bd918.

http://tracker.ceph.com/issues/14906 Fixes: #14906

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agobuffer: use alignof for raw_combined allocation arithmetic 7612/head
Sage Weil [Thu, 11 Feb 2016 19:59:43 +0000 (14:59 -0500)]
buffer: use alignof for raw_combined allocation arithmetic

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agobuffer: clean up raw_combined construction
Sage Weil [Thu, 11 Feb 2016 17:52:56 +0000 (12:52 -0500)]
buffer: clean up raw_combined construction

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agobuffer: size append_buffer so that it fits into page-multiple allocations
Sage Weil [Wed, 10 Feb 2016 23:01:00 +0000 (18:01 -0500)]
buffer: size append_buffer so that it fits into page-multiple allocations

We drop some unittest assertions about alloc buffer size.  Sorry!

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorbd-replay: s/CEPH_BUFFER_APPEND_SIZE/CEPH_PAGE_SIZE/
Sage Weil [Tue, 1 Mar 2016 14:09:01 +0000 (09:09 -0500)]
rbd-replay: s/CEPH_BUFFER_APPEND_SIZE/CEPH_PAGE_SIZE/

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agobuffer: alloc right-sized buffer from read_fd
Sage Weil [Wed, 10 Feb 2016 22:51:18 +0000 (17:51 -0500)]
buffer: alloc right-sized buffer from read_fd

This may as well fit the input; this doesn't relate to the
append buffer.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agobuffer: use raw_combined for certain allocations
Sage Weil [Thu, 11 Feb 2016 16:48:44 +0000 (11:48 -0500)]
buffer: use raw_combined for certain allocations

If the alignment is on a page boundary, or the allocation is big,
a separate buffer::raw goes faster.  The rest of the time,
a raw_combined does.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agobuffer: align unspecified allocations to a word
Sage Weil [Thu, 11 Feb 2016 16:46:35 +0000 (11:46 -0500)]
buffer: align unspecified allocations to a word

This will let us put policy create_aligned.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agobuffer: combine data and buffer::raw into single allocation
Sage Weil [Wed, 10 Feb 2016 22:42:07 +0000 (17:42 -0500)]
buffer: combine data and buffer::raw into single allocation

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agobuffer: add front(), back(), get_num_buffers() methods
Sage Weil [Tue, 11 Aug 2015 14:49:07 +0000 (10:49 -0400)]
buffer: add front(), back(), get_num_buffers() methods

These eliminate most callers of buffers(), which exposes the
internal list<ptr>.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agounittest_bufferlist: benchmark some allocations
Sage Weil [Mon, 10 Aug 2015 20:39:06 +0000 (16:39 -0400)]
unittest_bufferlist: benchmark some allocations

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agounittest_bufferlist: fix append_bench
Sage Weil [Thu, 11 Feb 2016 16:08:42 +0000 (11:08 -0500)]
unittest_bufferlist: fix append_bench

- fix source
- include larger sizes

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agounittest_bufferlist: fix ptr move test
Sage Weil [Thu, 11 Feb 2016 14:25:15 +0000 (09:25 -0500)]
unittest_bufferlist: fix ptr move test

Do not assume there is a trailing null the terminate the string.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7739 from xiexingguo/xxg-wip-14387
Sage Weil [Tue, 1 Mar 2016 13:46:08 +0000 (08:46 -0500)]
Merge pull request #7739 from xiexingguo/xxg-wip-14387

osd: fix race condition for heartbeat_need_update

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7703 from xiexingguo/xxg-wip-statfs
Sage Weil [Tue, 1 Mar 2016 13:45:39 +0000 (08:45 -0500)]
Merge pull request #7703 from xiexingguo/xxg-wip-statfs

osd: filestore: fast abort if statfs encounters ENOENT

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7766 from adamemerson/wip-portable-mutex
Sage Weil [Tue, 1 Mar 2016 13:45:00 +0000 (08:45 -0500)]
Merge pull request #7766 from adamemerson/wip-portable-mutex

common: Do not use non-portable constants in mutex_debug

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #7799 from xiexingguo/xxg-wip-fixnvme
Sage Weil [Tue, 1 Mar 2016 13:44:21 +0000 (08:44 -0500)]
Merge pull request #7799 from xiexingguo/xxg-wip-fixnvme

osd: bluestore: NVMEDevice: fix error handling

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7804 from jjhuo/fixes
Sage Weil [Tue, 1 Mar 2016 13:43:49 +0000 (08:43 -0500)]
Merge pull request #7804 from jjhuo/fixes

osd: kstore: fix a race condition in _txc_finish()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7816 from marcan/build-fixes
Sage Weil [Tue, 1 Mar 2016 13:43:25 +0000 (08:43 -0500)]
Merge pull request #7816 from marcan/build-fixes

configure.ac: boost_iostreams is required, not optional

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agolibrbd: use aio watch/unwatch during open/close state machines 7839/head
Jason Dillaman [Sun, 28 Feb 2016 20:22:09 +0000 (15:22 -0500)]
librbd: use aio watch/unwatch during open/close state machines

Removed the place holders in the open/close async state machines with
the newly added aio watch/unwatch methods.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados_test_stub: added aio_watch/aio_unwatch/aio_watch_flush
Jason Dillaman [Sun, 28 Feb 2016 20:21:36 +0000 (15:21 -0500)]
librados_test_stub: added aio_watch/aio_unwatch/aio_watch_flush

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: adjust rbd test case guards to handle new defaults 7846/head
Jason Dillaman [Tue, 1 Mar 2016 13:32:39 +0000 (08:32 -0500)]
test: adjust rbd test case guards to handle new defaults

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: use default RBD features in test cases
Jason Dillaman [Mon, 29 Feb 2016 18:17:02 +0000 (13:17 -0500)]
test: use default RBD features in test cases

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: permit deep-flatten to be dynamically disabled
Jason Dillaman [Mon, 29 Feb 2016 18:16:42 +0000 (13:16 -0500)]
librbd: permit deep-flatten to be dynamically disabled

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: update default image features
Jason Dillaman [Mon, 29 Feb 2016 16:31:55 +0000 (11:31 -0500)]
rbd: update default image features

Exclusive lock, object map, fast-diff, and deep-flatten have been
enabled by default for all new images.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: apply orphaned maintenance ops after journal replay 7785/head
Jason Dillaman [Wed, 24 Feb 2016 23:07:45 +0000 (18:07 -0500)]
librbd: apply orphaned maintenance ops after journal replay

If a client recorded a maintenance op to the journal but crashed
before writing the op finish event, the image will be in an
inconsistent state.  Therefore, once the end of the journal is
reached, attempt to apply all queued ops.

Fixes: #14822
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: only cancel replay of journal op events upon error
Jason Dillaman [Wed, 24 Feb 2016 22:00:13 +0000 (17:00 -0500)]
librbd: only cancel replay of journal op events upon error

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: delay commit of op start event
Jason Dillaman [Wed, 24 Feb 2016 21:35:58 +0000 (16:35 -0500)]
librbd: delay commit of op start event

If the start event is flagged as committed before the op is
actually executed, librbd won't be able to replay the event
should a crash occur.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: permit fire-and-forget aio commit position flush
Jason Dillaman [Wed, 24 Feb 2016 21:20:02 +0000 (16:20 -0500)]
journal: permit fire-and-forget aio commit position flush

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: support replay of maintenance ops
Jason Dillaman [Wed, 24 Feb 2016 20:51:08 +0000 (15:51 -0500)]
librbd: support replay of maintenance ops

Ignore errors that are to be expected when replaying
a maintenance op two or more times.

Fixes: #14822
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7858 from jdurgin/wip-rbd-formatted-output-progress
Loic Dachary [Tue, 1 Mar 2016 10:58:25 +0000 (17:58 +0700)]
Merge pull request #7858 from jdurgin/wip-rbd-formatted-output-progress

test/cli-integration/rbd: disable progress output

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7745 from sileht/sileht/rados-cython
John Spray [Tue, 1 Mar 2016 10:40:21 +0000 (10:40 +0000)]
Merge pull request #7745 from sileht/sileht/rados-cython

pybind: move cephfs to Cython

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #7831 from yuyuyu101/wip-14912
Haomai Wang [Tue, 1 Mar 2016 09:54:03 +0000 (17:54 +0800)]
Merge pull request #7831 from yuyuyu101/wip-14912

AsyncMessenger: fix several bugs

9 years agoMerge pull request #7852 from xiexingguo/xxg-wip-14928
Haomai Wang [Tue, 1 Mar 2016 09:53:20 +0000 (17:53 +0800)]
Merge pull request #7852 from xiexingguo/xxg-wip-14928

msg: async: start over after failing to bind a port in specified range

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
9 years agomsg: async: start over after failing to bind a port in specified range 7852/head
xie xingguo [Tue, 1 Mar 2016 11:03:00 +0000 (19:03 +0800)]
msg: async: start over after failing to bind a port in specified range

The original report associated with this fix can be found at
http://tracker.ceph.com/issues/13002. I reopen one in case it
needs to be backported or something alike.

Fixes: #14928
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agotest/cli-integration/rbd: disable progress output 7858/head
Josh Durgin [Tue, 1 Mar 2016 06:57:00 +0000 (22:57 -0800)]
test/cli-integration/rbd: disable progress output

This test is intended to check machine-readable output and usage, not
human-readable output.

Fixes: #14931
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7778 from marcan/pybind-fixes
Josh Durgin [Tue, 1 Mar 2016 06:48:53 +0000 (22:48 -0800)]
Merge pull request #7778 from marcan/pybind-fixes

pybind/rados: fix object lifetime issues and other bugs in aio

Reviewed-by: Mehdi Abaakouk <sileht@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7855 from tchaikov/wip-fix-ftbfs
Kefu Chai [Tue, 1 Mar 2016 06:39:29 +0000 (14:39 +0800)]
Merge pull request #7855 from tchaikov/wip-fix-ftbfs

test/TestPGLog: fix the FTBFS

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotest/TestPGLog: fix the FTBFS 7855/head
Kefu Chai [Tue, 1 Mar 2016 04:10:26 +0000 (12:10 +0800)]
test/TestPGLog: fix the FTBFS

the new pure virtual method was introduced by e7edf20.

Fixes: #14930
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7781 from ceph/wip-fix-rbd-cli-tests
Josh Durgin [Tue, 1 Mar 2016 01:30:09 +0000 (17:30 -0800)]
Merge pull request #7781 from ceph/wip-fix-rbd-cli-tests

rbd/run_cli_tests.sh: Reflect test failures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agofixed a bug for write bench with rados 7851/head
James Liu [Tue, 1 Mar 2016 00:25:42 +0000 (16:25 -0800)]
fixed a bug for write bench with rados

Signed-off-by: James Liu <james.liu@ssi.samsung.com>
9 years agoMerge pull request #7826 from SUSE/wip-move-requires
Ken Dreyer [Mon, 29 Feb 2016 23:25:34 +0000 (16:25 -0700)]
Merge pull request #7826 from SUSE/wip-move-requires

RPM: move runtime dependencies to ceph-base and fix other packaging issues

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #7769 from somnathr/wip-make-shared
Samuel Just [Mon, 29 Feb 2016 23:04:28 +0000 (15:04 -0800)]
Merge pull request #7769 from somnathr/wip-make-shared

Use make_shared while creating shared_ptr

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agotest_filejournal: reserve throttle as needed 7767/head
Samuel Just [Mon, 29 Feb 2016 19:23:56 +0000 (11:23 -0800)]
test_filejournal: reserve throttle as needed

This is awkward, if there are later users other than this test
and JournalingObjectStore, it'll be worth making it a bit less
clunky and error prone.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoconfig_opts: make filestore_queue_max_(ops|bytes) U64
Samuel Just [Mon, 22 Feb 2016 22:29:20 +0000 (14:29 -0800)]
config_opts: make filestore_queue_max_(ops|bytes) U64

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7765 from athanatos/wip-lost-unfound-repop
Samuel Just [Mon, 29 Feb 2016 18:42:01 +0000 (10:42 -0800)]
Merge pull request #7765 from athanatos/wip-lost-unfound-repop

Repop and lost-unfound overhaul

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agorbd: deprecate image format 1 7841/head
Jason Dillaman [Mon, 29 Feb 2016 02:27:50 +0000 (21:27 -0500)]
rbd: deprecate image format 1

The rbd cli will warn about the deprecation when attempting to create
image format 1 images.  librbd will log an error message when opening
a format 1 RBD image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoAsyncConnection: log cleanup, remove redundant state display 7831/head
Haomai Wang [Wed, 24 Feb 2016 18:15:03 +0000 (02:15 +0800)]
AsyncConnection: log cleanup, remove redundant state display

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: complete all pending events
Haomai Wang [Mon, 29 Feb 2016 17:42:50 +0000 (01:42 +0800)]
Event: complete all pending events

Fix #14925
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoRPM: drop duplicate /var/lib/ceph/* directories 7826/head
Nathan Cutler [Mon, 29 Feb 2016 16:32:50 +0000 (17:32 +0100)]
RPM: drop duplicate /var/lib/ceph/* directories

As of a recent commit, we had /var/lib/ceph/{mds,mon,osd} directories
packaged twice, once with %attr and once without. Drop the latter.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoRPM: drop duplicate udev rules from ceph-base
Nathan Cutler [Mon, 29 Feb 2016 16:31:39 +0000 (17:31 +0100)]
RPM: drop duplicate udev rules from ceph-base

The udev rules should be packaged in ceph-osd only.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agopackaging: rados-classes libraries in ceph-base
Nathan Cutler [Mon, 29 Feb 2016 16:29:46 +0000 (17:29 +0100)]
packaging: rados-classes libraries in ceph-base

Drop duplicate rados-classes libraries from ceph-osd and align the RPM
packaging with Debian by using a wildcard to package everything that
autotools puts in the rados-classes directory.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoAsyncConnection: dispatch write handler when accept done
Haomai Wang [Mon, 29 Feb 2016 16:28:02 +0000 (00:28 +0800)]
AsyncConnection: dispatch write handler when accept done

Fix #12912
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoosd: fix typo 7842/head
xie xingguo [Mon, 29 Feb 2016 15:53:03 +0000 (23:53 +0800)]
osd: fix typo

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosd: fix overload of '==' operator for pg_stat_t
xie xingguo [Mon, 29 Feb 2016 15:50:18 +0000 (23:50 +0800)]
osd: fix overload of '==' operator for pg_stat_t

The newly added fields -- 'last_peered' and 'last_became_peered'
are not compared.

Fixes: #14921
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7824 from dillaman/wip-aio-watch-notify
Samuel Just [Mon, 29 Feb 2016 15:42:08 +0000 (07:42 -0800)]
Merge pull request #7824 from dillaman/wip-aio-watch-notify

librados: fix test failure with new aio watch/unwatch API

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7832 from trociny/wip-journal-register-async
Jason Dillaman [Mon, 29 Feb 2016 13:53:17 +0000 (08:53 -0500)]
Merge pull request #7832 from trociny/wip-journal-register-async

journal: async methods to (un)register and update client

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7829 from xiexingguo/xxg-wip-doc
Kefu Chai [Mon, 29 Feb 2016 13:13:10 +0000 (21:13 +0800)]
Merge pull request #7829 from xiexingguo/xxg-wip-doc

doc: fix typo, indention etc.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: fix typo, indention etc. 7829/head
xiexingguo [Sat, 27 Feb 2016 12:03:30 +0000 (20:03 +0800)]
doc: fix typo, indention etc.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agopybind: update ceph_volume_client for cython 7745/head
John Spray [Fri, 26 Feb 2016 12:49:00 +0000 (12:49 +0000)]
pybind: update ceph_volume_client for cython

No need to explicitly touch the (no-longer-existing)
load_libcephfs method during module load, as with
the cython version we already get an ImportError
if the C library is unavailable.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agopybind: fix error handling on getxattr
John Spray [Mon, 29 Feb 2016 10:26:22 +0000 (10:26 +0000)]
pybind: fix error handling on getxattr

The ctypes bindings returned empty string
instead of raising exception.  This was a bug,
because it made it impossible to detect the
difference between missing xattr and empty
xattr.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agopybind: move cephfs to Cython
Mehdi Abaakouk [Thu, 25 Feb 2016 14:54:05 +0000 (15:54 +0100)]
pybind: move cephfs to Cython

This change moves cephfs binding to Cython.

Closes-bug: #14818
Signed-off-by: Mehdi Abaakouk <sileht@redhat.com>
9 years agodoc: osd-config Add Configuration Options for op queue. 7837/head
Robert LeBlanc [Sun, 28 Feb 2016 16:34:31 +0000 (09:34 -0700)]
doc: osd-config Add Configuration Options for op queue.

Signed-off-by: Robert LeBlanc <robert.leblanc@endurance.com>
9 years agoMerge pull request #7747 from vsjulu/master
Kefu Chai [Sat, 27 Feb 2016 16:01:55 +0000 (00:01 +0800)]
Merge pull request #7747 from vsjulu/master

xio: fix incorrect ip being assigned in case of multiple RDMA ports

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7630 from rzarzynski/wip-rgw-admin-token-cache
Yehuda Sadeh [Sat, 27 Feb 2016 14:22:09 +0000 (06:22 -0800)]
Merge pull request #7630 from rzarzynski/wip-rgw-admin-token-cache

rgw: add support for caching of Keystone admin token.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7825 from ceph/wip-rgw-openssl
Yehuda Sadeh [Sat, 27 Feb 2016 14:17:15 +0000 (06:17 -0800)]
Merge pull request #7825 from ceph/wip-rgw-openssl

rgw: link civetweb with openssl (Sage, Marcus Watts)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agopackaging: pkg_resources.py runtime dependency
Nathan Cutler [Sat, 27 Feb 2016 13:58:19 +0000 (14:58 +0100)]
packaging: pkg_resources.py runtime dependency

ceph-detect-init uses pkg_resources.py

http://tracker.ceph.com/issues/14864 Fixes: #14864

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoceph.spec.in: move ceph-disk runtime dependency to ceph-osd
Nathan Cutler [Fri, 26 Feb 2016 23:02:00 +0000 (00:02 +0100)]
ceph.spec.in: move ceph-disk runtime dependency to ceph-osd

ceph-disk uses sgdisk, which resides in the gdisk and gptfdisk packages on
RHEL and SUSE derivatives, respectively.

ceph-disk is included in the ceph-osd package, so the sgdisk dependency
belongs there.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoceph.spec.in: drop support for ancient SUSE versions
Nathan Cutler [Fri, 26 Feb 2016 22:56:10 +0000 (23:56 +0100)]
ceph.spec.in: drop support for ancient SUSE versions

In Jewel, there is no reason to support anything less than openSUSE 13.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agopackaging: move python-flask runtime dependency to ceph-mon, radosgw
Nathan Cutler [Fri, 26 Feb 2016 21:23:01 +0000 (22:23 +0100)]
packaging: move python-flask runtime dependency to ceph-mon, radosgw

Flask is used by MON (in the Ceph REST API) and by RGW (powerdns).
Therefore, it only needs to be in the ceph-mon and ceph-radosgw packages.

Also, this commit encloses the specification of the python-flask runtime
dependency in distro-conditional blocks to account for a minor difference
in the package name between RHEL and SUSE.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoRPM: align runtime dependencies with Debian packaging
Nathan Cutler [Fri, 26 Feb 2016 20:51:26 +0000 (21:51 +0100)]
RPM: align runtime dependencies with Debian packaging

The ceph package is now a metapackage, so move all its runtime dependencies
to ceph-base as we already have done in the Debian packaging.

Signed-off-by: Nathan Cutler <ncutler@suse.com>