Commit Graph

67705 Commits

Author SHA1 Message Date
Zhang Shaowen
a142de3a9b rgw: remove useless length comparison in lifecycle validate.
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
2017-01-12 09:28:00 +08:00
yaoning
ca652104fe mon: no delay for single message MSG_ALIVE and MSG_PGTEMP
delay and batch proposed as before if lots of messages arrive at the same time

if too many messages are MSG_ALIVE and MSG_PGTEMP, wait a long period as before

Signed-off-by: yaoning <yaoning@unitedstack.com>
2017-01-12 09:04:19 +08:00
John Spray
6048704d2f Merge pull request #12465 from jcsp/wip-18159
mount: do not print "unknown" option to kclient

Reviewed-by: Jeff Layton <jlayton@redhat.com>
2017-01-12 00:48:29 +00:00
John Spray
3db51ae52d Merge pull request #12794 from ukernel/wip-multimds-misc2
mds: misc multimds fixes part2

Reviewed-by: John Spray <john.spray@redhat.com>
2017-01-12 00:32:55 +00:00
Jason Dillaman
2e86a67b1b Merge pull request #12842 from trociny/wip-break_lock_test
test/librbd: add break_lock test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-01-11 19:30:36 -05:00
Bassam Tabbara
853d5221e9 rgw: make fcgi optional during build
fcgi can now be compiled out of the binary. this reduces the system
dependencies when fcgi is not needed or used.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
2017-01-11 14:06:08 -08:00
Bassam Tabbara
cf8c782f6c embedded: add RGW to libcephd
added RGW and rgw-admin to libcephd.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
2017-01-11 14:02:59 -08:00
Bassam Tabbara
3721790fcf embedded: add MDS to libcephd
Added MDS to libcephd

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
2017-01-11 13:59:17 -08:00
Willem Jan Withagen
cbb2d65b87 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>
2017-01-11 17:14:59 +01:00
Mykola Golub
3aca476a97 Merge pull request #12839 from dillaman/wip-17993
librbd: delay mirror registration when creating clones

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-01-11 18:13:57 +02:00
Mykola Golub
31f76d1778 Merge pull request #12838 from dillaman/wip-18419
librbd: possible deadlock with flush if refresh in-progress

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-01-11 18:13:24 +02:00
Mykola Golub
e0da839dd9 Merge pull request #12837 from dillaman/wip-18441
rbd-mirror: avoid processing new events after stop requested

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-01-11 18:12:16 +02:00
Jason Dillaman
5341e1fc18 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>
2017-01-11 10:53:33 -05:00
Casey Bodley
a0974fdcf6 rgw: fix off-by-one in RGWDataChangesLog::get_info
Fixes: http://tracker.ceph.com/issues/18488

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-01-11 09:33:02 -05:00
Igor Fedotov
96581a7542 os/bluestore: pass Collection* to access BlueStore instance and other needed stuff rather than have additional referencing members in BlueStore child classes.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2017-01-11 11:48:46 +00:00
Igor Fedotov
061fb4b15f os/bluestore: refactor to avoid both SharedBlobSet and Cache pointers tracking in SharedBlob & BufferSpace respectively. Use Collection* in SharedBlob instead.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2017-01-11 11:48:46 +00:00
Igor Fedotov
bc97ce0635 os/bluestore: make BufferSpace offsets 32-bit wide.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2017-01-11 11:48:46 +00:00
Kefu Chai
025446ac78 Merge pull request #12832 from wjin/clean_async
msg/async: cleanups

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-01-11 18:25:19 +08:00
Yan, Zheng
2f50921492 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>
2017-01-11 17:16:45 +08:00
xie xingguo
f9799e3153 os/bluestore: conditionally load crr option
And moving COMP_NONE checking ahead, since this is the preferred option.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-01-11 17:00:15 +08:00
Yan, Zheng
2213cc2dcc mds: propagate error encountered during opening inode by number
Fixes: http://tracker.ceph.com/issues/18179
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2017-01-11 15:21:41 +08:00
liuchang0812
3d023cf1b4 test: clean up unused variable
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-01-11 14:00:55 +08:00
Kefu Chai
03db36f354 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>
2017-01-11 13:07:20 +08:00
Kefu Chai
87256a1fbc Merge pull request #12809 from wjin/optimize_atomic
msg/async: avoid atomic variable overhead

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-01-11 13:02:17 +08:00
Kefu Chai
55c5fdd747 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>
2017-01-11 13:00:27 +08:00
xie xingguo
ea5d71cabc os/bluestore/BitmapFreelistManager: readability improvements
Be slightly nice to who is looking at get_next_clear[set]_bit().

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-01-11 11:50:13 +08:00
xie xingguo
573918b692 os/bluestore/BitmapFreelistManager: formatting nits
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-01-11 11:36:58 +08:00
Sage Weil
ab9d375df2 Merge pull request #12871 from xiexingguo/xxg-wip-bluestore-20170111
os/bluestore: kill BufferSpace.empty()

Reviewed-by: Sage Weil <sage@redhat.com>
2017-01-10 21:15:35 -06:00
Xiaoxi Chen
52fe52baf9 mds/server: skip unwanted dn in handle_client_readdir
We can skip unwanted dn which  < (offset_key, snap) via map.lower_bound, rather than
iterate across them.

Previously we iterate and skip dn which < (offset_key, dn->last), as dn->last >= snap
 means (offset_key, dn->last) >= (offset_key, snap), and such iterate_and_skip logic
still keep, so this commit doesnt change code logic but an optimization.

Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
2017-01-10 20:04:56 -07:00
xie xingguo
985514b278 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>
2017-01-11 10:43:58 +08:00
Haomai Wang
2945bf1b50 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>
2017-01-11 10:17:07 +08:00
Vasu Kulkarni
2d4ed95f2b use the create option during instantiation
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-01-10 15:43:12 -08:00
Alfredo Deza
ebb02c8ef5 Merge pull request #12867 from ceph/wip-ceph-deploy-workaround
qa/tasks/ceph-deploy: create-keys explicitly

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-01-10 15:47:26 -05:00
Sage Weil
9f54e9f5e4 Merge pull request #12626 from adamemerson/wip-denconstruction
include/denc: improvements

Reviewed-by: Sage Weil <sage@redhat.com>
2017-01-10 14:15:10 -06:00
Haomai Wang
17589d5826 Merge pull request #12862 from optimistyzy/110_1
os/bluestore/NVMEdevice: fix the unrelease segs issue

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-01-11 00:48:07 +08:00
Kefu Chai
7b8eca5be7 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>
2017-01-11 00:43:24 +08:00
Adam C. Emerson
ea52d39be2 denc: Support boost::optional
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-01-10 11:40:34 -05:00
Adam C. Emerson
cf044f7aef 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>
2017-01-10 11:40:34 -05:00
Adam C. Emerson
26d622c48f denc: Add support for std::array
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-01-10 11:40:34 -05:00
Adam C. Emerson
c92cc9fe51 denc: Support boost::container::flat_set
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-01-10 11:40:34 -05:00
Adam C. Emerson
b7df89b519 denc: Scrap the container boilerplate!
Using template templates, kill off the reduplication in
container encoding.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-01-10 11:40:34 -05:00
Willem Jan Withagen
89a61ae2cd 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>
2017-01-10 16:07:40 +01:00
Gaurav Kumar Garg
6ab73e5f42 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>
2017-01-10 16:02:01 +01:00
Jason Dillaman
60b79473fe 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>
2017-01-10 09:29:11 -05:00
Jason Dillaman
5f2689b62a librbd: resolve static analyser warnings
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-01-10 08:34:38 -05:00
Sage Weil
c96cb2d02e 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>
2017-01-10 07:33:18 -06:00
Jason Dillaman
0dd25f240a 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>
2017-01-10 08:32:53 -05:00
Sage Weil
a7da1eb092 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>
2017-01-10 07:31:43 -06:00
Sage Weil
533311e999 Merge pull request #12856 from xiexingguo/xxg-wip-clean-kd
os/bluestore/KernelDevice: kill zeros

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-01-10 07:27:57 -06:00
Sage Weil
f70b6fdec6 Merge pull request #12858 from yangdongsheng/rbd_cleanup
rbd: cleanup: fix the typo in namespace comment
2017-01-10 07:26:12 -06:00