]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agotest/run-cli-tests: enable RBD testing 12798/head
Willem Jan Withagen [Thu, 5 Jan 2017 11:28:25 +0000 (12:28 +0100)]
test/run-cli-tests: enable RBD testing

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agotest/librbd/Clang: Clang complains about reinterpret_cast where static_cast is sufficient
Willem Jan Withagen [Thu, 5 Jan 2017 11:24:47 +0000 (12:24 +0100)]
test/librbd/Clang: Clang complains about reinterpret_cast where static_cast is sufficient

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agotools/rbd/action/Kernel.cc: create stubs for FreeBSD
Willem Jan Withagen [Thu, 5 Jan 2017 11:20:38 +0000 (12:20 +0100)]
tools/rbd/action/Kernel.cc: create stubs for FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoinclude/rbd_types.h: include/types.h for __le*
Willem Jan Withagen [Thu, 5 Jan 2017 11:16:28 +0000 (12:16 +0100)]
include/rbd_types.h: include/types.h for __le*

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoinclude/compat.h: define EREMOTEIO for FreeBSD
Willem Jan Withagen [Thu, 5 Jan 2017 11:14:33 +0000 (12:14 +0100)]
include/compat.h: define EREMOTEIO for FreeBSD

 - and combined some FreeBSD defines with Apple's

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agocommon/event_socket.h: include errno.h to use errno
Willem Jan Withagen [Thu, 5 Jan 2017 11:13:07 +0000 (12:13 +0100)]
common/event_socket.h: include errno.h to use errno

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years ago./do_freebsd.sh: Do not use KRBD
Willem Jan Withagen [Thu, 5 Jan 2017 11:01:57 +0000 (12:01 +0100)]
./do_freebsd.sh: Do not use KRBD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoCMakeLists.txt: Introduce WITH_KBRD for kernel RBD
Willem Jan Withagen [Thu, 5 Jan 2017 10:59:42 +0000 (11:59 +0100)]
CMakeLists.txt: Introduce WITH_KBRD for kernel RBD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #12843 from trociny/wip-18465
Jason Dillaman [Thu, 12 Jan 2017 14:54:20 +0000 (09:54 -0500)]
Merge pull request #12843 from trociny/wip-18465

librbd: metadata_set API operation should not change global config setting

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12880 from wjwithagen/wip-wjw-static_cast-NULL
Jason Dillaman [Thu, 12 Jan 2017 14:53:06 +0000 (09:53 -0500)]
Merge pull request #12880 from wjwithagen/wip-wjw-static_cast-NULL

tests: fix NULL references to be acceptable by Clang

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12683 from SUSE/wip-run-make-check-deps
Nathan Cutler [Thu, 12 Jan 2017 14:22:19 +0000 (15:22 +0100)]
Merge pull request #12683 from SUSE/wip-run-make-check-deps

build/ops: add sanity checks to run-make-check.sh

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #12864 from gaurav36/bug-18422-rbd-bench-write-crash-4G-io-size
Jason Dillaman [Thu, 12 Jan 2017 14:14:30 +0000 (09:14 -0500)]
Merge pull request #12864 from gaurav36/bug-18422-rbd-bench-write-crash-4G-io-size

rbd: bench-write should return error if io-size >= 4G

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12863 from dillaman/wip-rbd-coverity
Mykola Golub [Thu, 12 Jan 2017 10:48:18 +0000 (12:48 +0200)]
Merge pull request #12863 from dillaman/wip-rbd-coverity

librbd: resolve static analyser warnings

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #12820 from trociny/wip-18447
Jason Dillaman [Thu, 12 Jan 2017 02:36:09 +0000 (21:36 -0500)]
Merge pull request #12820 from trociny/wip-18447

rbd-mirror: check remote image mirroring state when bootstrapping

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12465 from jcsp/wip-18159
John Spray [Thu, 12 Jan 2017 00:48:29 +0000 (00:48 +0000)]
Merge pull request #12465 from jcsp/wip-18159

mount: do not print "unknown" option to kclient

Reviewed-by: Jeff Layton <jlayton@redhat.com>
8 years agoMerge pull request #12794 from ukernel/wip-multimds-misc2
John Spray [Thu, 12 Jan 2017 00:32:55 +0000 (00:32 +0000)]
Merge pull request #12794 from ukernel/wip-multimds-misc2

mds: misc multimds fixes part2

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #12842 from trociny/wip-break_lock_test
Jason Dillaman [Thu, 12 Jan 2017 00:30:36 +0000 (19:30 -0500)]
Merge pull request #12842 from trociny/wip-break_lock_test

test/librbd: add break_lock test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agotests: fix NULL references to be acceptable by Clang 12880/head
Willem Jan Withagen [Wed, 11 Jan 2017 10:18:32 +0000 (11:18 +0100)]
tests: fix NULL references to be acceptable by Clang

 - On some platforms NULL evaluates to nullptr, which will require a
   cast to the right type to be able to compile.
      error: reinterpret_cast from 'nullptr_t' to 'ContextWQ *'

 - It is a delicate change since otherwise GCC will start complaining
   about the reverse:
      error: invalid static_cast from type 'const long int' to type 'ContextWQ*'

 By casting right at the instance of NULL both compilers are happy.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #12839 from dillaman/wip-17993
Mykola Golub [Wed, 11 Jan 2017 16:13:57 +0000 (18:13 +0200)]
Merge pull request #12839 from dillaman/wip-17993

librbd: delay mirror registration when creating clones

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #12838 from dillaman/wip-18419
Mykola Golub [Wed, 11 Jan 2017 16:13:24 +0000 (18:13 +0200)]
Merge pull request #12838 from dillaman/wip-18419

librbd: possible deadlock with flush if refresh in-progress

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #12837 from dillaman/wip-18441
Mykola Golub [Wed, 11 Jan 2017 16:12:16 +0000 (18:12 +0200)]
Merge pull request #12837 from dillaman/wip-18441

rbd-mirror: avoid processing new events after stop requested

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #12846 from dillaman/wip-rbd-mirror-ha-merge
Jason Dillaman [Wed, 11 Jan 2017 15:53:33 +0000 (10:53 -0500)]
Merge pull request #12846 from dillaman/wip-rbd-mirror-ha-merge

librbd: refactor exclusive lock support into generic managed lock

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
8 years agoMerge pull request #12832 from wjin/clean_async
Kefu Chai [Wed, 11 Jan 2017 10:25:19 +0000 (18:25 +0800)]
Merge pull request #12832 from wjin/clean_async

msg/async: cleanups

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agomds: fix MDCache::trim() with max == 0 12794/head
Yan, Zheng [Wed, 11 Jan 2017 09:14:53 +0000 (17:14 +0800)]
mds: fix MDCache::trim() with max == 0

MDCache::shutdown_pass call MDCache::trim with max == 0. If the last
dentry is non-null, MDCache::trim does nothing

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #12840 from tchaikov/wip-libceph-common
Kefu Chai [Wed, 11 Jan 2017 05:07:20 +0000 (13:07 +0800)]
Merge pull request #12840 from tchaikov/wip-libceph-common

cmake: turn libcommon into a shared library

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
8 years agoMerge pull request #12809 from wjin/optimize_atomic
Kefu Chai [Wed, 11 Jan 2017 05:02:17 +0000 (13:02 +0800)]
Merge pull request #12809 from wjin/optimize_atomic

msg/async: avoid atomic variable overhead

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12826 from LiumxNL/fix-op-tracker-initiate
Kefu Chai [Wed, 11 Jan 2017 05:00:27 +0000 (13:00 +0800)]
Merge pull request #12826 from LiumxNL/fix-op-tracker-initiate

mon: optracker's initiated_at timestamp should not be NULL

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12871 from xiexingguo/xxg-wip-bluestore-20170111
Sage Weil [Wed, 11 Jan 2017 03:15:35 +0000 (21:15 -0600)]
Merge pull request #12871 from xiexingguo/xxg-wip-bluestore-20170111

os/bluestore: kill BufferSpace.empty()

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: kill BufferSpace.empty() 12871/head
xie xingguo [Wed, 11 Jan 2017 02:20:54 +0000 (10:20 +0800)]
os/bluestore: kill BufferSpace.empty()

Because:
1. All other public methods are called under the protection of cache->lock,
which makes the usage of this method is weird.

2. The only caller is _dump_extent_map(), and we can do it without this
in a simpler way.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #12860 from liupan1111/wip-fix-dpdk-prefix
Haomai Wang [Wed, 11 Jan 2017 02:17:07 +0000 (10:17 +0800)]
Merge pull request #12860 from liupan1111/wip-fix-dpdk-prefix

async: fixed the error "Cause: Cannot create lock on '/var/run/.rte_c…

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12867 from ceph/wip-ceph-deploy-workaround
Alfredo Deza [Tue, 10 Jan 2017 20:47:26 +0000 (15:47 -0500)]
Merge pull request #12867 from ceph/wip-ceph-deploy-workaround

qa/tasks/ceph-deploy: create-keys explicitly

Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agoMerge pull request #12626 from adamemerson/wip-denconstruction
Sage Weil [Tue, 10 Jan 2017 20:15:10 +0000 (14:15 -0600)]
Merge pull request #12626 from adamemerson/wip-denconstruction

include/denc: improvements

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12862 from optimistyzy/110_1
Haomai Wang [Tue, 10 Jan 2017 16:48:07 +0000 (00:48 +0800)]
Merge pull request #12862 from optimistyzy/110_1

os/bluestore/NVMEdevice: fix the unrelease segs issue

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12091 from wjwithagen/wip-wjw-nosetests
Kefu Chai [Tue, 10 Jan 2017 16:43:24 +0000 (00:43 +0800)]
Merge pull request #12091 from wjwithagen/wip-wjw-nosetests

nosetests: use /usr/bin/env to find nosetests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agodenc: Support boost::optional 12626/head
Adam C. Emerson [Wed, 28 Dec 2016 02:26:25 +0000 (21:26 -0500)]
denc: Support boost::optional

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agodenc: Support tuples
Adam C. Emerson [Tue, 3 Jan 2017 15:44:16 +0000 (10:44 -0500)]
denc: Support tuples

We could support zero-length tuples, but contiguous appender doesn't
like zero-length writes, so I've ruled them out for now.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agodenc: Add support for std::array
Adam C. Emerson [Tue, 27 Dec 2016 17:55:18 +0000 (12:55 -0500)]
denc: Add support for std::array

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agodenc: Support boost::container::flat_set
Adam C. Emerson [Fri, 23 Dec 2016 17:43:06 +0000 (12:43 -0500)]
denc: Support boost::container::flat_set

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agodenc: Scrap the container boilerplate!
Adam C. Emerson [Thu, 22 Dec 2016 22:43:03 +0000 (17:43 -0500)]
denc: Scrap the container boilerplate!

Using template templates, kill off the reduplication in
container encoding.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agonosetests: start using /usr/bin/env to find noestests 12091/head
Willem Jan Withagen [Mon, 21 Nov 2016 00:27:28 +0000 (01:27 +0100)]
nosetests: start using /usr/bin/env to find noestests

 - Option nocapture is not really required so no problem
   with the fact that FreeBSD env does not work for params
   for nosetests

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agorbd: bench-write should return error if io-size >= 4G 12864/head
Gaurav Kumar Garg [Tue, 10 Jan 2017 14:25:13 +0000 (15:25 +0100)]
rbd: bench-write should return error if io-size >= 4G

Currently if user perform bench-write with io-size > 4G
then its crashing because currently during memory allocation
bufferptr taking size of buffer as a unsigned and io-size > 4G
will overflow with unsigned. so during memset operation it will
try to set io_size size of memory area pointed by bufferptr,
(bufferptr area is:  (4G - io_size)), so it will cause
segmentation fault.

Fix is to return error if io-size >= 4G

Fixes: http://tracker.ceph.com/issues/18422
Reported-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
8 years agoMerge pull request #12821 from SUSE/wip-drop-rbd_cli_tests
Jason Dillaman [Tue, 10 Jan 2017 14:29:11 +0000 (09:29 -0500)]
Merge pull request #12821 from SUSE/wip-drop-rbd_cli_tests

tests: drop rbd_cli_tests.pl and RbdLib.pm

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: resolve static analyser warnings 12863/head
Jason Dillaman [Tue, 10 Jan 2017 13:33:30 +0000 (08:33 -0500)]
librbd: resolve static analyser warnings

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12850 from xiexingguo/xxg-wip-bluestore-20170110
Sage Weil [Tue, 10 Jan 2017 13:33:18 +0000 (07:33 -0600)]
Merge pull request #12850 from xiexingguo/xxg-wip-bluestore-20170110

os/bluestore: shrink buffer_map key into uint32_t

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #12815 from rjfd/wip-journal-unittest-build-error
Jason Dillaman [Tue, 10 Jan 2017 13:32:53 +0000 (08:32 -0500)]
Merge pull request #12815 from rjfd/wip-journal-unittest-build-error

tests: fix template specialization of PromoteRequest class

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12853 from xiexingguo/xxg-wip-kill-orphan
Sage Weil [Tue, 10 Jan 2017 13:31:43 +0000 (07:31 -0600)]
Merge pull request #12853 from xiexingguo/xxg-wip-kill-orphan

os/bluestore: kill orphan declaration of do_write_check_depth()

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #12856 from xiexingguo/xxg-wip-clean-kd
Sage Weil [Tue, 10 Jan 2017 13:27:57 +0000 (07:27 -0600)]
Merge pull request #12856 from xiexingguo/xxg-wip-clean-kd

os/bluestore/KernelDevice: kill zeros

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #12858 from yangdongsheng/rbd_cleanup
Sage Weil [Tue, 10 Jan 2017 13:26:12 +0000 (07:26 -0600)]
Merge pull request #12858 from yangdongsheng/rbd_cleanup

rbd: cleanup: fix the typo in namespace comment

8 years agoNVMEdevice: fix the unrelease segs issue 12862/head
optimistyzy [Tue, 10 Jan 2017 13:01:59 +0000 (21:01 +0800)]
NVMEdevice: fix the unrelease segs issue

When the read or flush command fails, we need to
release segs. Or we can abort it like what we do
for write.

Signed-off-by: optimistyzy <optimistyzy@gmail.com>
8 years agocmake: s/snappy/${SNAPPY_LIBRARIES}/ 12840/head
Kefu Chai [Mon, 9 Jan 2017 17:49:12 +0000 (01:49 +0800)]
cmake: s/snappy/${SNAPPY_LIBRARIES}/

also s/z/${ZLIB_LIBARIES}/

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: turn libcommon into a shared library
Kefu Chai [Mon, 9 Jan 2017 15:45:07 +0000 (23:45 +0800)]
cmake: turn libcommon into a shared library

prior to this change, libcommon is a convenient library which gets
linked into librados, librbd and libcephfs and all ceph executables.
this incurs some problems:
 - double dose of libcommon in memory space and HDD: waste of memory
   and disk space.
 - if an application links to two libraries including libcommon at the
   same time. take librados and libcephfs as an example, they could
   interfere with each other by changing the other guy's status.
after this change, libcommon is tuned into a shared library and
renamed to libceph-common. it will be installed into $prefix/lib/ceph,
and packaged in librados2.

ceph.spec.in,debian/librados2.install: package libceph-common in
  librados2.
CMakeLists.txt:
  - do not link against libboost-* if not necessary.
  - s/common/ceph-common/g
  - install libceph-common into $prefix/lib/ceph
  - set rpath to $prefix/lib/ceph
  - link against ceph-common if an executable needs access to non public
    symbols in ceph.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: shrink buffer_map key into uint32_t 12850/head
xie xingguo [Tue, 10 Jan 2017 03:23:52 +0000 (11:23 +0800)]
os/bluestore: shrink buffer_map key into uint32_t

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoasync: fixed the error "Cause: Cannot create lock on '/var/run/.rte_config'.", 12860/head
Pan Liu [Tue, 10 Jan 2017 10:49:20 +0000 (18:49 +0800)]
async: fixed the error "Cause: Cannot create lock on '/var/run/.rte_config'.",
when invoke more than one osds in same server and enable dpdk.

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agorbd: cleanup: fix the typo in namespace comment 12858/head
Dongsheng Yang [Tue, 10 Jan 2017 09:26:43 +0000 (04:26 -0500)]
rbd: cleanup: fix the typo in namespace comment

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
8 years agoMerge pull request #12855 from badone/wip-md_config_t-_apply_changes-unchangeable
Brad Hubbard [Tue, 10 Jan 2017 08:17:52 +0000 (18:17 +1000)]
Merge pull request #12855 from badone/wip-md_config_t-_apply_changes-unchangeable

config: Improve warning for unobserved value

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore/KernelDevice: reuse r 12856/head
xie xingguo [Tue, 10 Jan 2017 07:53:25 +0000 (15:53 +0800)]
os/bluestore/KernelDevice: reuse r

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore/KernelDevice: drop redundant assignment statements
xie xingguo [Tue, 10 Jan 2017 07:50:23 +0000 (15:50 +0800)]
os/bluestore/KernelDevice: drop redundant assignment statements

The memset() call has already done it.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore/NVMeDevice: kill zeros
xie xingguo [Tue, 10 Jan 2017 07:46:32 +0000 (15:46 +0800)]
os/bluestore/NVMeDevice: kill zeros

See https://github.com/ceph/ceph/commit/2cd63d2209aaa0221a3f0a69b3f49ab1e01d9e20
The aio_zero() interface is deprecated.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore/KernelDevice: kill zeros
xie xingguo [Tue, 10 Jan 2017 07:07:20 +0000 (15:07 +0800)]
os/bluestore/KernelDevice: kill zeros

This is not needed anymore and can save us 1MB memory.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomds: don't abort request that has already started slave operation
Yan, Zheng [Thu, 5 Jan 2017 03:39:42 +0000 (11:39 +0800)]
mds: don't abort request that has already started slave operation

Access check and fragment size check can fail after start slave
operation. This causes mds to crash.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: use locked dentry trace to compose slave rmdir/rename request
Yan, Zheng [Tue, 27 Dec 2016 08:58:07 +0000 (16:58 +0800)]
mds: use locked dentry trace to compose slave rmdir/rename request

{rmdir/rename}_prepare_witness() use full path to compose slave
requests. But they do not lock all dentries in the path. So someone
else changes the unlocked dentry and causes path travsese of slave
request to fail.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: add replicas of destdn to rename witness list
Yan, Zheng [Wed, 28 Dec 2016 08:48:33 +0000 (16:48 +0800)]
mds: add replicas of destdn to rename witness list

it's possible that null dentry is replicated

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: properly put unexpired dentry back to lru
Yan, Zheng [Tue, 27 Dec 2016 03:12:11 +0000 (11:12 +0800)]
mds: properly put unexpired dentry back to lru

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: cleanup Server::rdlock_path_xlock_dentry
Yan, Zheng [Fri, 23 Dec 2016 11:12:18 +0000 (19:12 +0800)]
mds: cleanup Server::rdlock_path_xlock_dentry

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: add -ESTALE recovery code for unlink/rmdir
Yan, Zheng [Fri, 23 Dec 2016 08:36:41 +0000 (16:36 +0800)]
mds: add -ESTALE recovery code for unlink/rmdir

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: limit number of pending exports when thash exports is enabled
Yan, Zheng [Wed, 21 Dec 2016 09:47:32 +0000 (17:47 +0800)]
mds: limit number of pending exports when thash exports is enabled

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: make MDCache::show_subtree less verbose when thrash exports is enabled
Yan, Zheng [Wed, 21 Dec 2016 09:52:40 +0000 (17:52 +0800)]
mds: make MDCache::show_subtree less verbose when thrash exports is enabled

Subtree map can be very large when thrash exports is enabled.
Printing subtree map causes size log to increase quickly.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: don't journal inode when merging subtrees
Yan, Zheng [Wed, 21 Dec 2016 09:32:52 +0000 (17:32 +0800)]
mds: don't journal inode when merging subtrees

When doing subtree migration or cross subtree rename, we rdlock
fragtreelock of subtree boundaries' inodes. rdlock fragtreelock
has already journaled dirfragtree updates. I can't see why we
need to journal it again when merging subtrees.

The resaon I want to remove this code is that it can journal
unconnected dirfrag in the Migrator::export_reverse() case.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: fix MDSMap::is_rejoining()
Yan, Zheng [Tue, 20 Dec 2016 08:52:02 +0000 (16:52 +0800)]
mds: fix MDSMap::is_rejoining()

the function checks if all recovering mds reach rejoin state. It
need to consider damaged mds set.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: remove stale warning in log replay code
Yan, Zheng [Fri, 9 Dec 2016 08:51:26 +0000 (16:51 +0800)]
mds: remove stale warning in log replay code

we don't re-fill prealloc_inos each time a prealloc ino get used

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: don't modify session->info before ESession get journaled
Yan, Zheng [Fri, 9 Dec 2016 02:53:39 +0000 (10:53 +0800)]
mds: don't modify session->info before ESession get journaled

Server::journal_close_session() modifies session->info before
corresponding ESession get journaled. It's possible the updated
session gets saved to sessionmap before Server::_session_logged()
increases sessionmap's version. This confuses the journal replay
code.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agoconfig: Improve warning for unobserved value 12855/head
Brad Hubbard [Thu, 5 Jan 2017 02:45:01 +0000 (12:45 +1000)]
config: Improve warning for unobserved value

When a variable is not being observed we currently mark it
"unchangable". This can be misleading so try something hopefully a
little more informative.

Fixes: http://tracker.ceph.com/issues/18424
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #12854 from liupan1111/wip-fix-async-dpdk-issue
Haomai Wang [Tue, 10 Jan 2017 05:09:40 +0000 (13:09 +0800)]
Merge pull request #12854 from liupan1111/wip-fix-async-dpdk-issue

async: fixed coredump when enable dpdk.

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoasync: fixed coredump when enable dpdk. 12854/head
Pan Liu [Tue, 10 Jan 2017 03:58:23 +0000 (11:58 +0800)]
async: fixed coredump when enable dpdk.

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agoos/bluestore: kill orphan declaration of do_write_check_depth() 12853/head
xie xingguo [Tue, 10 Jan 2017 03:47:36 +0000 (11:47 +0800)]
os/bluestore: kill orphan declaration of do_write_check_depth()

The gc logic is gone and this is not relevant anymore.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #12849 from xiexingguo/xxg-wip-fix-compile-crash
Jason Dillaman [Tue, 10 Jan 2017 02:45:41 +0000 (21:45 -0500)]
Merge pull request #12849 from xiexingguo/xxg-wip-fix-compile-crash

librados: fix compile errors from simplified aio completions

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agomon: we may track a self-initiated message, recv_stamp remain unset 12826/head
Mingxin Liu [Mon, 9 Jan 2017 02:44:19 +0000 (10:44 +0800)]
mon: we may track a self-initiated message, recv_stamp remain unset

so using ceph_clock_now() instead to make optracker happy

Signed-off-by: Mingxin Liu <mingxin@xsky.com>
8 years agoMerge pull request #9032 from tchaikov/wip-15786
Kefu Chai [Tue, 10 Jan 2017 02:23:39 +0000 (10:23 +0800)]
Merge pull request #9032 from tchaikov/wip-15786

doc: document repair/scrub features

Reviewed-by: David Zafman <dzafman@redhat.com>
8 years agolibrados: fix building crash 12849/head
xie xingguo [Tue, 10 Jan 2017 02:01:54 +0000 (10:01 +0800)]
librados: fix building crash

See https://github.com/ceph/ceph/pull/12607

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoRemove debug overrides 12867/head
Vasu Kulkarni [Tue, 10 Jan 2017 01:59:20 +0000 (17:59 -0800)]
Remove debug overrides

the high level of debug for mon/osd is causing remoto to hang during get key

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
8 years agoAdd ceph-create-keys to explicitly create admin/bootstrap keys
Vasu Kulkarni [Tue, 10 Jan 2017 00:45:01 +0000 (16:45 -0800)]
Add ceph-create-keys to explicitly create admin/bootstrap keys

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
8 years agolibrbd: potential nullptr dereference in ManagedLock 12846/head
Jason Dillaman [Mon, 9 Jan 2017 22:40:42 +0000 (17:40 -0500)]
librbd: potential nullptr dereference in ManagedLock

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12726 from liewegas/wip-18372
Sage Weil [Mon, 9 Jan 2017 22:24:22 +0000 (16:24 -0600)]
Merge pull request #12726 from liewegas/wip-18372

osd: _exit() intead of exit() for failure injection

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12607 from liewegas/wip-librados-killack
Sage Weil [Mon, 9 Jan 2017 22:17:43 +0000 (16:17 -0600)]
Merge pull request #12607 from liewegas/wip-librados-killack

librados,osdc: kill ack vs commit distinction

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #12695 from hjwsm1989/mark-unfound-lost
Sage Weil [Mon, 9 Jan 2017 22:17:07 +0000 (16:17 -0600)]
Merge pull request #12695 from hjwsm1989/mark-unfound-lost

osd/PrimaryLogPG: optimal pick_newest_available

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12724 from kylinstorage/wip-fix-coverity-warning-for-uninitialize...
Sage Weil [Mon, 9 Jan 2017 22:14:52 +0000 (16:14 -0600)]
Merge pull request #12724 from kylinstorage/wip-fix-coverity-warning-for-uninitialized-members

osd: fix coverity warning for uninitialized members

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12725 from liewegas/wip-bluestore-bluefs-reclaim
Sage Weil [Mon, 9 Jan 2017 22:07:15 +0000 (16:07 -0600)]
Merge pull request #12725 from liewegas/wip-bluestore-bluefs-reclaim

os/bluestore/BlueFS: fix reclaim_blocks

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
8 years agoMerge pull request #12727 from liewegas/wip-18369
Sage Weil [Mon, 9 Jan 2017 22:05:30 +0000 (16:05 -0600)]
Merge pull request #12727 from liewegas/wip-18369

osd/PG: publish PG stats when backfill-related states change

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agolibrbd: rewatch complete callback should be invoked w/o lock
Jason Dillaman [Fri, 6 Jan 2017 14:29:02 +0000 (09:29 -0500)]
librbd: rewatch complete callback should be invoked w/o lock

It's currently being incorrectly invoked twice -- but the direct
callback is holding the Watcher lock. This results in a recursive
lock when ManagedLock attempts to retrieve the watch id from the
Watcher.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: metadata_set API operation should not change global config setting 12843/head
Mykola Golub [Mon, 9 Jan 2017 17:31:21 +0000 (18:31 +0100)]
librbd: metadata_set API operation should not change global config setting

Fixes: http://tracker.ceph.com/issues/18465
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agotest/librbd: add break_lock test 12842/head
Mykola Golub [Fri, 6 Jan 2017 11:17:56 +0000 (13:17 +0200)]
test/librbd: add break_lock test

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #12731 from oritwas/wip-rgw-realm-set
Casey Bodley [Mon, 9 Jan 2017 15:54:15 +0000 (10:54 -0500)]
Merge pull request #12731 from oritwas/wip-rgw-realm-set

rgw realm set fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agorbd: fix template specialization of PromoteRequest class 12815/head
Ricardo Dias [Fri, 6 Jan 2017 16:41:29 +0000 (16:41 +0000)]
rbd: fix template specialization of PromoteRequest class

Signed-off-by: Ricardo Dias <rdias@suse.com>
8 years agolibrbd: delay mirror registration when creating clones 12839/head
Jason Dillaman [Tue, 6 Dec 2016 20:51:51 +0000 (15:51 -0500)]
librbd: delay mirror registration when creating clones

Fixes: http://tracker.ceph.com/issues/17993
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: check image mirroring state when bootstrapping 12820/head
Mykola Golub [Mon, 9 Jan 2017 09:40:46 +0000 (10:40 +0100)]
rbd-mirror: check image mirroring state when bootstrapping

Fixes: http://tracker.ceph.com/issues/18447
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agorbd-mirror: async request to test if image is primary
Mykola Golub [Mon, 9 Jan 2017 08:23:19 +0000 (09:23 +0100)]
rbd-mirror: async request to test if image is primary

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agolibrbd: possible deadlock with flush if refresh in-progress 12838/head
Jason Dillaman [Thu, 5 Jan 2017 17:12:57 +0000 (12:12 -0500)]
librbd: possible deadlock with flush if refresh in-progress

Fixes: http://tracker.ceph.com/issues/18419
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: avoid processing new events after stop requested 12837/head
Jason Dillaman [Fri, 6 Jan 2017 20:59:22 +0000 (15:59 -0500)]
rbd-mirror: avoid processing new events after stop requested

Fixes: http://tracker.ceph.com/issues/18441
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: hold owner lock when testing if lock owner
Mykola Golub [Mon, 9 Jan 2017 14:02:02 +0000 (15:02 +0100)]
rbd-mirror: hold owner lock when testing if lock owner

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #12274 from ukernel/wip-multimds-misc
John Spray [Mon, 9 Jan 2017 13:05:51 +0000 (13:05 +0000)]
Merge pull request #12274 from ukernel/wip-multimds-misc

mds: misc multimds fixes

Reviewed-by: Greg Farnum <gfarnum@redhat.com>