]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agomgr: remove unnecessary C_StdFunction 11883/head
John Spray [Wed, 9 Nov 2016 19:52:03 +0000 (19:52 +0000)]
mgr: remove unnecessary C_StdFunction

FunctionContext works fine and already existed.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11832 from ceph/wip-python-rgw
Sage Weil [Wed, 9 Nov 2016 17:42:09 +0000 (11:42 -0600)]
Merge pull request #11832 from ceph/wip-python-rgw

deb: add python-rgw packages

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
8 years agodebian: add python-rgw package 11832/head
Sage Weil [Tue, 8 Nov 2016 21:29:35 +0000 (16:29 -0500)]
debian: add python-rgw package

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11845 from xiexingguo/xxg-wip-bs-1109
Sage Weil [Wed, 9 Nov 2016 17:13:58 +0000 (11:13 -0600)]
Merge pull request #11845 from xiexingguo/xxg-wip-bs-1109

os/bluestore: remove duplicated namespace of tx state

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11859 from ceph/wip-py-rgw
Kefu Chai [Wed, 9 Nov 2016 16:45:43 +0000 (00:45 +0800)]
Merge pull request #11859 from ceph/wip-py-rgw

doc: add python-rgw doc

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #11823 from xiexingguo/xxg-wip-bluestore-1108
Sage Weil [Wed, 9 Nov 2016 14:18:07 +0000 (08:18 -0600)]
Merge pull request #11823 from xiexingguo/xxg-wip-bluestore-1108

os/bluestore: refactor _do_write(); move initializaiton of csum out of loop

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #10748 from yuyuyu101/wip-dpdk8
Sage Weil [Wed, 9 Nov 2016 14:13:48 +0000 (08:13 -0600)]
Merge pull request #10748 from yuyuyu101/wip-dpdk8

msg/async: DPDKStack as AsyncMessenger backend

8 years agodoc: add doc for pybind of rgw 11859/head
Kefu Chai [Tue, 8 Nov 2016 09:12:26 +0000 (17:12 +0800)]
doc: add doc for pybind of rgw

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agopybind: rename rgw_file.pyx to rgw.pyx
Kefu Chai [Wed, 9 Nov 2016 11:08:29 +0000 (19:08 +0800)]
pybind: rename rgw_file.pyx to rgw.pyx

so the init function offered by rgw python extension is named "initrgw"
instead of "initrgw_file". and "initrgw" is the expected name by python
intepreter when loading an extension.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11847 from yuyuyu101/wip-fix-rgw-spec
Loic Dachary [Wed, 9 Nov 2016 12:48:00 +0000 (13:48 +0100)]
Merge pull request #11847 from yuyuyu101/wip-fix-rgw-spec

ceph.spec: add pybind rgwfile

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoceph.spec: add pybind rgwfile 11847/head
Haomai Wang [Wed, 9 Nov 2016 10:49:48 +0000 (18:49 +0800)]
ceph.spec: add pybind rgwfile

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoos/bluestore: remove duplicated namespace of tx state 11845/head
xie xingguo [Wed, 9 Nov 2016 09:55:52 +0000 (17:55 +0800)]
os/bluestore: remove duplicated namespace of tx state

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agotest/CMakeLists: only enable ceph_test_userspace when dpdk is true 10748/head
Haomai Wang [Wed, 2 Nov 2016 16:24:03 +0000 (00:24 +0800)]
test/CMakeLists: only enable ceph_test_userspace when dpdk is true

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agomsg/async/dpdk: change error to warning
Haomai Wang [Wed, 2 Nov 2016 16:18:50 +0000 (00:18 +0800)]
msg/async/dpdk: change error to warning

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoupdate dpdk submodule to ceph/dpdk
Haomai Wang [Sun, 16 Oct 2016 16:02:20 +0000 (00:02 +0800)]
update dpdk submodule to ceph/dpdk

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agomsg/async/Stack: allow to setup dpdkstack
Haomai Wang [Fri, 5 Aug 2016 07:46:16 +0000 (15:46 +0800)]
msg/async/Stack: allow to setup dpdkstack

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agotest_async_networkstack: fix unmatched create/delete file event
Haomai Wang [Tue, 9 Aug 2016 08:02:36 +0000 (16:02 +0800)]
test_async_networkstack: fix unmatched create/delete file event

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agotest/test_async_networkstack: add dpdk backend test
Haomai Wang [Fri, 5 Aug 2016 07:40:22 +0000 (15:40 +0800)]
test/test_async_networkstack: add dpdk backend test

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agotest: add userspace_event
Haomai Wang [Sun, 28 Feb 2016 06:02:47 +0000 (14:02 +0800)]
test: add userspace_event

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoEvent: don't wakeup dpdk driver since it's spinning on cpu
Haomai Wang [Wed, 10 Feb 2016 17:07:47 +0000 (01:07 +0800)]
Event: don't wakeup dpdk driver since it's spinning on cpu

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agomsg/async/Event: add DPDKDriver type to allow userspace event
Haomai Wang [Tue, 2 Aug 2016 16:10:42 +0000 (00:10 +0800)]
msg/async/Event: add DPDKDriver type to allow userspace event

Like epoll, kqueue, select, dpdk backend also need to allow notify EventCenter
when a connection is ready to read/write. So we need to let DPDKStack can kick
EventCenter. DPDKDriver which introduced UserspaceEvent to simulate epoll
event achieve the goal.

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agomsg/async: add dpdk stack plugin
Haomai Wang [Tue, 2 Aug 2016 15:50:13 +0000 (23:50 +0800)]
msg/async: add dpdk stack plugin

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agobuffer: add new ptr type which destruct with passed deleter
Haomai Wang [Wed, 3 Aug 2016 13:54:27 +0000 (21:54 +0800)]
buffer: add new ptr type which destruct with passed deleter

deleter is a wrapper for lambda which can used to free resource associated
with object

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agomsg/async/Event: add Poller to allow event thread spin on Poller::poll
Haomai Wang [Tue, 2 Aug 2016 16:17:40 +0000 (00:17 +0800)]
msg/async/Event: add Poller to allow event thread spin on Poller::poll

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoEvent: Add get_driver to return driver backend
Haomai Wang [Wed, 23 Dec 2015 06:42:22 +0000 (14:42 +0800)]
Event: Add get_driver to return driver backend

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoThrottler: Add reset support
Haomai Wang [Wed, 23 Dec 2015 06:41:59 +0000 (14:41 +0800)]
Throttler: Add reset support

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoos/bluestore: move selectiong of csum/crr out of for loop 11823/head
xie xingguo [Tue, 8 Nov 2016 08:54:04 +0000 (16:54 +0800)]
os/bluestore: move selectiong of csum/crr out of for loop

We don't have to trace the csum/compression_required_ration option changing
at such a small granularity, which costs too much.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: refactor _do_write()
xie xingguo [Tue, 8 Nov 2016 07:45:21 +0000 (15:45 +0800)]
os/bluestore: refactor _do_write()

By moving garbage collection logic into a separate method.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11681 from stiopaa1/mds_mdstableclient_addConsttoMemFun
Gregory Farnum [Tue, 8 Nov 2016 22:49:34 +0000 (14:49 -0800)]
Merge pull request #11681 from stiopaa1/mds_mdstableclient_addConsttoMemFun

mds/MDSTableClient.h: add const to member funct

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11818 from liewegas/wip-bluestore-aio-stalls3
Sage Weil [Tue, 8 Nov 2016 21:22:06 +0000 (15:22 -0600)]
Merge pull request #11818 from liewegas/wip-bluestore-aio-stalls3

os/bluestore: optional debug mode to identify aio stalls

8 years agoMerge pull request #11826 from ovh/wip-doc-update-xattr-config-documentation
Sage Weil [Tue, 8 Nov 2016 20:46:27 +0000 (14:46 -0600)]
Merge pull request #11826 from ovh/wip-doc-update-xattr-config-documentation

doc: Update filestore xattr config documentation.

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11831 from ceph/wip-dang-rgw-pybind
Matt Benjamin [Tue, 8 Nov 2016 19:22:05 +0000 (14:22 -0500)]
Merge pull request #11831 from ceph/wip-dang-rgw-pybind

RGW Python bindings - use explicit array

8 years agoRGW Python bindings - use explicit array 11831/head
Daniel Gryniewicz [Tue, 8 Nov 2016 17:32:08 +0000 (12:32 -0500)]
RGW Python bindings - use explicit array

Older Cython doesn't to implicit simple arrays, so use an explicit array
for stat output.

Revert change removing stat

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
8 years agoMerge pull request #11816 from cbodley/wip-17812
Yehuda Sadeh [Tue, 8 Nov 2016 17:31:26 +0000 (09:31 -0800)]
Merge pull request #11816 from cbodley/wip-17812

rgw: delete entries_index in RGWFetchAllMetaCR

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #11817 from linuxbox2/wip-boost-3
Sage Weil [Tue, 8 Nov 2016 16:13:06 +0000 (10:13 -0600)]
Merge pull request #11817 from linuxbox2/wip-boost-3

boost: embedded

8 years agoMerge pull request #11825 from ceph/wip-11820
Kefu Chai [Tue, 8 Nov 2016 14:15:22 +0000 (22:15 +0800)]
Merge pull request #11825 from ceph/wip-11820

pybind: fix build failure of rgwfile binding

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agodoc: Update filestore xattr config documentation. 11826/head
Bartłomiej Święcki [Tue, 8 Nov 2016 10:08:24 +0000 (11:08 +0100)]
doc: Update filestore xattr config documentation.

Signed-off-by: Bartłomiej Święcki <bartlomiej.swiecki@corp.ovh.com>
8 years agopybind: fix build failure of rgwfile binding 11825/head
Kefu Chai [Tue, 8 Nov 2016 11:39:33 +0000 (19:39 +0800)]
pybind: fix build failure of rgwfile binding

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #9624 from gaurav36/coverity-1355603-dead-code
Sage Weil [Tue, 8 Nov 2016 02:59:30 +0000 (20:59 -0600)]
Merge pull request #9624 from gaurav36/coverity-1355603-dead-code

coverity fix: fixing few coverity issue

8 years agoMerge pull request #11798 from stiopaa1/mds_fsmap_preventcopyinginloop
Sage Weil [Tue, 8 Nov 2016 02:44:08 +0000 (20:44 -0600)]
Merge pull request #11798 from stiopaa1/mds_fsmap_preventcopyinginloop

mds/FSMap.cc: prevent unneeded copy of map entry

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11802 from stiopaa1/mds_fsmap_constReference
Sage Weil [Tue, 8 Nov 2016 02:43:49 +0000 (20:43 -0600)]
Merge pull request #11802 from stiopaa1/mds_fsmap_constReference

mds/FSMap.h: add const and reference

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11819 from stiopaa1/mds_migrator_addConstTomemFun
Sage Weil [Tue, 8 Nov 2016 02:39:34 +0000 (20:39 -0600)]
Merge pull request #11819 from stiopaa1/mds_migrator_addConstTomemFun

mds/Migrator.h: add const to member functions

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11807 from xiexingguo/xxg-wip-bs-1107
Sage Weil [Tue, 8 Nov 2016 02:38:20 +0000 (20:38 -0600)]
Merge pull request #11807 from xiexingguo/xxg-wip-bs-1107

os/bluestore: speed up omap-key generation for same onode

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: speed up omap-key generation for same onode 11807/head
xie xingguo [Mon, 7 Nov 2016 07:03:25 +0000 (15:03 +0800)]
os/bluestore: speed up omap-key generation for same onode

This is useful if we have to batch-process omap kvs.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11754 from athanatos/wip-17789
Sage Weil [Mon, 7 Nov 2016 23:07:08 +0000 (17:07 -0600)]
Merge pull request #11754 from athanatos/wip-17789

osd/ReplicatedPG: do_update_log_missing: take the pg lock in the callback

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore/KernelDevice: debug support to detect stalled aios 11818/head
Sage Weil [Mon, 7 Nov 2016 22:57:01 +0000 (17:57 -0500)]
os/bluestore/KernelDevice: debug support to detect stalled aios

This is additional bookkeeping to track the oldest aio in flight, so we
make it optional, and disabled by default.  It is useful for identifying
buggy kernel aio or bad devices.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/fs: add aio_list_t type
Sage Weil [Mon, 7 Nov 2016 22:47:55 +0000 (17:47 -0500)]
os/fs: add aio_list_t type

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/fs: uninline aio methods
Sage Weil [Mon, 7 Nov 2016 22:51:01 +0000 (17:51 -0500)]
os/fs: uninline aio methods

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomds/Migrator.h: add const to member functions 11819/head
Michal Jarzabek [Mon, 7 Nov 2016 22:49:49 +0000 (22:49 +0000)]
mds/Migrator.h: add const to member functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoboost: pull up boost to enable boost_python build 11817/head
Matt Benjamin [Mon, 7 Nov 2016 21:01:29 +0000 (16:01 -0500)]
boost:  pull up boost to enable boost_python build

Pullup to just the merges on Sep 10 fixes an obvious compile
problem, but there are other relevant changes.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoAdapt for ceph-manager
Matt Benjamin [Wed, 26 Oct 2016 21:36:22 +0000 (17:36 -0400)]
Adapt for ceph-manager

The ceph manager change added a separate Boost dependency
check, add it to the combined section.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agodo_cmake.sh: set BOOST_J to $(nproc)
Sage Weil [Thu, 29 Sep 2016 16:27:51 +0000 (12:27 -0400)]
do_cmake.sh: set BOOST_J to $(nproc)

This lets us build boost with all processors.

Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoboost: update boost to 8/29
Matt Benjamin [Wed, 28 Sep 2016 15:12:39 +0000 (11:12 -0400)]
boost:  update boost to 8/29

Pull-up Boost to the commit which merged the upstream fix for
upstream Boost/iostreams bug #11860 (template arity warnings),
per discussion in core.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agocmake: find and build bundled boost
Matt Benjamin [Thu, 22 Sep 2016 15:41:53 +0000 (11:41 -0400)]
cmake:  find and build bundled boost

Build Boost using the src/boost submodule, unless overridden
by -DWITH_SYSTEM_BOOST.

If -DBOOST_J=<n> is provided, builds Boost with <n> jobs.

Boost builds in the configured Build directory.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoboost: add submodule at tag boost-1.61.0
Matt Benjamin [Mon, 26 Sep 2016 22:05:28 +0000 (18:05 -0400)]
boost: add submodule at tag boost-1.61.0

This implements option #4 for external boost, based on upstream
discussion.  In option #4:

1. boost is added as a submodule
2. builds default to using the attached boost module
3. building against a system-provided boost is supported, but
   must be configured explicitly

Because all of the boost components are attached as nested
submodules in the upstream boost repository, neither the nested
submodules nor the root boost submodule have been cloned into
modules in github.com/ceph (acked by Sage).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #11647 from ceph/wip-jlayton-cephfs
John Spray [Mon, 7 Nov 2016 20:07:40 +0000 (21:07 +0100)]
Merge pull request #11647 from ceph/wip-jlayton-cephfs

libcephfs client API overhaul and update

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11425 from weiqiaomiao/wqm-rgw-oplog
Yehuda Sadeh [Mon, 7 Nov 2016 18:45:10 +0000 (10:45 -0800)]
Merge pull request #11425 from weiqiaomiao/wqm-rgw-oplog

rgw: fix the field 'total_time'  of log entry in log show opt

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #8712 from diwakargoel/master
Yehuda Sadeh [Mon, 7 Nov 2016 18:41:04 +0000 (10:41 -0800)]
Merge pull request #8712 from diwakargoel/master

doc: Correcting the sample python tempurl generation script.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #11648 from cbodley/wip-17698
Yehuda Sadeh [Mon, 7 Nov 2016 18:36:29 +0000 (10:36 -0800)]
Merge pull request #11648 from cbodley/wip-17698

rgw: fix for bucket delete racing with mdlog sync

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoMerge pull request #11598 from cbodley/wip-rgw-bucket-sync
Yehuda Sadeh [Mon, 7 Nov 2016 18:35:26 +0000 (10:35 -0800)]
Merge pull request #11598 from cbodley/wip-rgw-bucket-sync

rgw multisite: move lease up to RunBucketSync instead of child crs

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agorgw: delete entries_index in RGWFetchAllMetaCR 11816/head
Casey Bodley [Fri, 4 Nov 2016 16:18:32 +0000 (12:18 -0400)]
rgw: delete entries_index in RGWFetchAllMetaCR

use a unique_ptr to ensure the entries_index is freed on destruction

Fixes: http://tracker.ceph.com/issues/17812
Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #11715 from dzafman/wip-test-ec-eio
Loic Dachary [Mon, 7 Nov 2016 16:26:53 +0000 (17:26 +0100)]
Merge pull request #11715 from dzafman/wip-test-ec-eio

Fix racey test by setting noout flag (tracker 17757)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11624 from yuyuyu101/wip-rgwfile-pybind
Daniel Gryniewicz [Mon, 7 Nov 2016 16:08:35 +0000 (11:08 -0500)]
Merge pull request #11624 from yuyuyu101/wip-rgwfile-pybind

Wip rgwfile pybind

8 years agopybind/rgwfile: change description 11624/head
Haomai Wang [Mon, 7 Nov 2016 16:04:07 +0000 (00:04 +0800)]
pybind/rgwfile: change description

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agopybind/rgwfile: fixes hardcode way to find include dir
Haomai Wang [Mon, 7 Nov 2016 16:00:57 +0000 (00:00 +0800)]
pybind/rgwfile: fixes hardcode way to find include dir

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agopybind/rgwfile: raise Exception when failing to umount
Haomai Wang [Mon, 7 Nov 2016 15:58:59 +0000 (23:58 +0800)]
pybind/rgwfile: raise Exception when failing to umount

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agopybind/rgwfile: change FileHandler to FileHandle
Haomai Wang [Mon, 7 Nov 2016 15:56:05 +0000 (23:56 +0800)]
pybind/rgwfile: change FileHandler to FileHandle

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #11794 from rzarzynski/wip-rgw-17803
Casey Bodley [Mon, 7 Nov 2016 15:13:45 +0000 (10:13 -0500)]
Merge pull request #11794 from rzarzynski/wip-rgw-17803

rgw: fix uncompressed object size deduction in RGWRados::copy_obj_data.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #11797 from yuyuyu101/wip-bluestore-pending
Sage Weil [Mon, 7 Nov 2016 14:16:18 +0000 (08:16 -0600)]
Merge pull request #11797 from yuyuyu101/wip-bluestore-pending

os/bluestore: reap collection after all pending ios done

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11713 from stiopaa1/mds_mantle_passByConstRef
John Spray [Mon, 7 Nov 2016 13:13:58 +0000 (14:13 +0100)]
Merge pull request #11713 from stiopaa1/mds_mantle_passByConstRef

mds/Mantle: pass parameters by const ref

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11727 from stiopaa1/mds_mdsrank_addOverideToThreadClass
John Spray [Mon, 7 Nov 2016 13:13:34 +0000 (14:13 +0100)]
Merge pull request #11727 from stiopaa1/mds_mdsrank_addOverideToThreadClass

mds/MDSRank.h: add override to virtual function

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11781 from trociny/wip-qa-rbd-nbd-sudo
Jason Dillaman [Mon, 7 Nov 2016 13:02:46 +0000 (08:02 -0500)]
Merge pull request #11781 from trociny/wip-qa-rbd-nbd-sudo

qa/workunits/rbd: simplify running nbd test under build env

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #11806 from david-z/wip-remove-dup-log
Yan, Zheng [Mon, 7 Nov 2016 09:02:48 +0000 (17:02 +0800)]
Merge pull request #11806 from david-z/wip-remove-dup-log

mds: remove duplicated log in handle_client_readdir

8 years agomds: remove duplicated log in handle_client_readdir 11806/head
Zhi Zhang [Mon, 7 Nov 2016 08:41:39 +0000 (16:41 +0800)]
mds: remove duplicated log in handle_client_readdir

Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
8 years agomds/FSMap.h: add const and reference 11802/head
Michal Jarzabek [Sun, 6 Nov 2016 18:55:51 +0000 (18:55 +0000)]
mds/FSMap.h: add const and reference

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoMerge pull request #11343 from ceph/wip-civetweb-1.8
Yehuda Sadeh [Sat, 5 Nov 2016 19:53:23 +0000 (12:53 -0700)]
Merge pull request #11343 from ceph/wip-civetweb-1.8

Update version of civetweb to 1.8

8 years agomds/FSMap.cc: prevent unneeded copy of map entry 11798/head
Michal Jarzabek [Sat, 5 Nov 2016 19:06:16 +0000 (19:06 +0000)]
mds/FSMap.cc: prevent unneeded copy of map entry

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoos/bluestore: reap collection after all pending ios done 11797/head
Haomai Wang [Sat, 5 Nov 2016 18:55:24 +0000 (02:55 +0800)]
os/bluestore: reap collection after all pending ios done

Otherwise when umount finish reap and wait for pending io done, the last
pending io may aim to remove collection and make removed_collection not
empty. So the leaked collection ref will result in BlueStore deconstruction
segment failt

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #11251 from stiopaa1/osd_replicatedpg_removeCount2
Kefu Chai [Sat, 5 Nov 2016 17:50:37 +0000 (01:50 +0800)]
Merge pull request #11251 from stiopaa1/osd_replicatedpg_removeCount2

osd/ReplicatedPG: remove unneeded use of count

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11510 from vshankar/wip-17356
Jason Dillaman [Sat, 5 Nov 2016 17:15:27 +0000 (13:15 -0400)]
Merge pull request #11510 from vshankar/wip-17356

librbd: batch object map updates during trim

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #11766 from trociny/wip-rbd-info-fix-upgrade-client
Jason Dillaman [Sat, 5 Nov 2016 17:15:08 +0000 (13:15 -0400)]
Merge pull request #11766 from trociny/wip-rbd-info-fix-upgrade-client

librbd: snap_get_limit compatibility check

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #10907 from jecluis/wip-mon-features
Sage Weil [Sat, 5 Nov 2016 12:58:14 +0000 (07:58 -0500)]
Merge pull request #10907 from jecluis/wip-mon-features

mon: have mon-specific features & rework internal monmap structures

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11772 from liewegas/wip-sortbitwise
Sage Weil [Sat, 5 Nov 2016 12:57:17 +0000 (07:57 -0500)]
Merge pull request #11772 from liewegas/wip-sortbitwise

osd,mon: require sortbitwise flag to upgrade beyond jewel

8 years agoMerge pull request #11791 from liewegas/wip-remove-move-ranges
Sage Weil [Sat, 5 Nov 2016 12:57:07 +0000 (07:57 -0500)]
Merge pull request #11791 from liewegas/wip-remove-move-ranges

os: remove move_ranges_destroy_src

8 years agorgw: fix uncompressed object size deduction in RGWRados::copy_obj_data. 11794/head
Radoslaw Zarzynski [Sat, 5 Nov 2016 11:46:16 +0000 (12:46 +0100)]
rgw: fix uncompressed object size deduction in RGWRados::copy_obj_data.

Fixes: http://tracker.ceph.com/issues/17803
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #10447 from stiopaa1/msg_pipe_moveDelayedDelivery2
Kefu Chai [Sat, 5 Nov 2016 06:53:13 +0000 (14:53 +0800)]
Merge pull request #10447 from stiopaa1/msg_pipe_moveDelayedDelivery2

msg/Pipe: move DelayedDelivery class to cc file

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11780 from xiexingguo/xxg-wip-bluestore-1104
Sage Weil [Sat, 5 Nov 2016 02:33:54 +0000 (21:33 -0500)]
Merge pull request #11780 from xiexingguo/xxg-wip-bluestore-1104

os/bluestore: a few more cleanups

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #11498 from liewegas/wip-stop-at-jewel
Sage Weil [Sat, 5 Nov 2016 02:24:50 +0000 (21:24 -0500)]
Merge pull request #11498 from liewegas/wip-stop-at-jewel

mon: prevent post-jewel OSDs from booting if require_jewel_osds is not set

8 years agoos/bluestore: fix output message when passing the end of list range 11780/head
xie xingguo [Sat, 5 Nov 2016 00:28:30 +0000 (08:28 +0800)]
os/bluestore: fix output message when passing the end of list range

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: fix typo in comments
xie xingguo [Sat, 5 Nov 2016 00:26:36 +0000 (08:26 +0800)]
os/bluestore: fix typo in comments

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: add sanity check against collection existence
xie xingguo [Fri, 4 Nov 2016 06:50:49 +0000 (14:50 +0800)]
os/bluestore: add sanity check against collection existence

To keep pace with other methods.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: narrow boundary check for fiemap
xie xingguo [Fri, 4 Nov 2016 06:47:53 +0000 (14:47 +0800)]
os/bluestore: narrow boundary check for fiemap

By including off-by-one.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agotest-erasure-eio: Avoid racing recovery by setting noout 11715/head
David Zafman [Fri, 4 Nov 2016 23:24:36 +0000 (16:24 -0700)]
test-erasure-eio: Avoid racing recovery by setting noout

Fixes: http://tracker.ceph.com/issues/17757
Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoRevert "tests: disable failing test-erasure-eio.sh"
David Zafman [Tue, 1 Nov 2016 01:28:48 +0000 (18:28 -0700)]
Revert "tests: disable failing test-erasure-eio.sh"

This reverts commit f018c9ec08242c6d32e041b868be14e0a4d3d34c.

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #11527 from wjwithagen/wip-wjw-readable.sh
Sage Weil [Fri, 4 Nov 2016 22:16:32 +0000 (17:16 -0500)]
Merge pull request #11527 from wjwithagen/wip-wjw-readable.sh

test/encoding/readable.sh: fix shell script warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11775 from jdurgin/wip-jewel-osds-warning
Sage Weil [Fri, 4 Nov 2016 22:15:30 +0000 (17:15 -0500)]
Merge pull request #11775 from jdurgin/wip-jewel-osds-warning

mon/OSDMonitor: remove duplicate jewel/kraken flag warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #9345 from SUSE/wip_remove_mon_startup_magic
Sage Weil [Fri, 4 Nov 2016 22:14:37 +0000 (17:14 -0500)]
Merge pull request #9345 from SUSE/wip_remove_mon_startup_magic

mon: remove ceph-create-keys from mon startup

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agosrc/init-ceph.in:Remove ceph-create-keys for sysv 9345/head
Owen Synge [Tue, 10 May 2016 08:59:12 +0000 (10:59 +0200)]
src/init-ceph.in:Remove ceph-create-keys for sysv

ceph-create-keys should not be started on boot of mons with sysv init.

Signed-off-by: Owen Synge <osynge@suse.com>
8 years agosystemd/CMakeLists.txt:Remove ceph-create-keys cmake
Owen Synge [Mon, 12 Sep 2016 10:08:03 +0000 (12:08 +0200)]
systemd/CMakeLists.txt:Remove ceph-create-keys cmake

ceph-create-keys should not be started on boot of mons with systemd so should
not exist as 'After' or 'Wants' for the ceph-mon.service

Signed-off-by: Owen Synge <osynge@suse.com>
8 years agosystemd/ceph-mon@.service:Remove ceph-create-keys for mon in systemd
Owen Synge [Wed, 25 May 2016 11:18:37 +0000 (13:18 +0200)]
systemd/ceph-mon@.service:Remove ceph-create-keys for mon in systemd

ceph-create-keys should not be started on boot of mons with systemd so should
not exist as 'After' or 'Wants' for the ceph-mon.service

Signed-off-by: Owen Synge <osynge@suse.com>