]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoCMakeLists: nss only, ignore cryptopp
Sage Weil [Thu, 23 Jun 2016 18:22:30 +0000 (14:22 -0400)]
CMakeLists: nss only, ignore cryptopp

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodebian/rules: build deb with cmake
Kefu Chai [Fri, 20 May 2016 18:18:46 +0000 (02:18 +0800)]
debian/rules: build deb with cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodebian/rules: package in a more debhelper way
Kefu Chai [Fri, 20 May 2016 15:45:20 +0000 (23:45 +0800)]
debian/rules: package in a more debhelper way

this helps to keep the build rule simpler, and easier to customize

* -j$(NUMJOBS) is taken care of by 'dh --parallel'
* use 'autoreconf' dh add-on to autoconf cleanup
* add dh-autoreconf to Build-Depends
* bump debhelper compatibility level to 8, as jewel's supported
  debian based distro is jessie (with debhelper 9.20150101),
  ubuntu trusty (with debhelper 9.20131227ubuntu1)

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9992 from yuyuyu101/wip-fix-rebase
Kefu Chai [Wed, 29 Jun 2016 06:21:03 +0000 (14:21 +0800)]
Merge pull request #9992 from yuyuyu101/wip-fix-rebase

msg/async: add "queue_reset" argument

this fixes the broken build

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomsg/async: add "queue_reset" argument 9992/head
Haomai Wang [Wed, 29 Jun 2016 05:56:39 +0000 (13:56 +0800)]
msg/async: add "queue_reset" argument

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #9991 from stiopaa1/msg_asyncmess_moveCProcessorAccept_class
Haomai Wang [Wed, 29 Jun 2016 05:52:52 +0000 (13:52 +0800)]
Merge pull request #9991 from stiopaa1/msg_asyncmess_moveCProcessorAccept_class

msg/AsyncMessenger: move C_processor_accept class

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #9783 from yuyuyu101/wip-16366
Haomai Wang [Wed, 29 Jun 2016 05:47:28 +0000 (13:47 +0800)]
Merge pull request #9783 from yuyuyu101/wip-16366

msg/async: Support close idle connection feature

9 years agoRevert "msg/AsyncMessenger: move Worker class to cc file" 9783/head
Haomai Wang [Tue, 28 Jun 2016 14:33:25 +0000 (22:33 +0800)]
Revert "msg/AsyncMessenger: move Worker class to cc file"

This reverts commit 23d4488e376de8f1a5c369365d91021ee8c9a324.

9 years agomsg/async/Event: change to use pthread_t to indicate whether the same thread
Haomai Wang [Tue, 28 Jun 2016 04:11:13 +0000 (12:11 +0800)]
msg/async/Event: change to use pthread_t to indicate whether the same thread

thread_local has problem in TmapMigratePP.DataScan case that it will be
assigned to zero unexpectedly.

pthread_t is much cheaper than gettid since it's a library implementation.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/AsyncConnection: avoid dup RETRYGLOBAL sending
Haomai Wang [Sun, 26 Jun 2016 15:07:18 +0000 (23:07 +0800)]
msg/async/AsyncConnection: avoid dup RETRYGLOBAL sending

if two accept all going to dispatch RETRYGLOBAL sending, it will cause
invalid connect side receiver.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/Event: don't execute inline if nonwait
Haomai Wang [Sun, 19 Jun 2016 16:03:03 +0000 (00:03 +0800)]
msg/async/Event: don't execute inline if nonwait

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: change submit_to related to cephcontext
Haomai Wang [Sat, 28 May 2016 15:03:33 +0000 (23:03 +0800)]
Event: change submit_to related to cephcontext

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: avoid multi global conflict
Haomai Wang [Sat, 4 Jun 2016 14:57:34 +0000 (22:57 +0800)]
Event: avoid multi global conflict

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncMessenger: remove extra release_worker path
Haomai Wang [Fri, 27 May 2016 03:31:38 +0000 (11:31 +0800)]
AsyncMessenger: remove extra release_worker path

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncConnection: ensure delay_state empty when building a new session
Haomai Wang [Thu, 26 May 2016 02:25:16 +0000 (10:25 +0800)]
AsyncConnection: ensure delay_state empty when building a new session

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncConnection: make delete_time_event async
Haomai Wang [Wed, 25 May 2016 09:55:04 +0000 (17:55 +0800)]
AsyncConnection: make delete_time_event async

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoperf_local: fix api adjust
Haomai Wang [Wed, 25 May 2016 04:29:29 +0000 (12:29 +0800)]
perf_local: fix api adjust

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: change id to idx
Haomai Wang [Wed, 25 May 2016 02:24:13 +0000 (10:24 +0800)]
Event: change id to idx

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncConnection: execute existing fault in another
Haomai Wang [Wed, 25 May 2016 02:07:18 +0000 (10:07 +0800)]
AsyncConnection: execute existing fault in another

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: add submit_to apis
Haomai Wang [Wed, 25 May 2016 01:45:52 +0000 (09:45 +0800)]
Event: add submit_to apis

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncConnection: add EventCenter id
Haomai Wang [Wed, 25 May 2016 01:42:14 +0000 (09:42 +0800)]
AsyncConnection: add EventCenter id

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncConnection: move delete timers to cleanup handler
Haomai Wang [Wed, 25 May 2016 01:36:35 +0000 (09:36 +0800)]
AsyncConnection: move delete timers to cleanup handler

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agotest_msgr: add connection read timeout tests
Haomai Wang [Tue, 24 May 2016 17:24:04 +0000 (01:24 +0800)]
test_msgr: add connection read timeout tests

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncConnection: add tick timer
Haomai Wang [Tue, 24 May 2016 17:22:47 +0000 (01:22 +0800)]
AsyncConnection: add tick timer

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agotest_async_driver: add missing headers
Haomai Wang [Tue, 24 May 2016 09:10:15 +0000 (17:10 +0800)]
test_async_driver: add missing headers

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncConnection: make connection timeout when idle a lot
Haomai Wang [Tue, 24 May 2016 09:09:07 +0000 (17:09 +0800)]
AsyncConnection: make connection timeout when idle a lot

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: implement effective delete_time_event
Haomai Wang [Tue, 24 May 2016 08:34:19 +0000 (16:34 +0800)]
Event: implement effective delete_time_event

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: remove next_time which isn't needed
Haomai Wang [Tue, 24 May 2016 08:24:12 +0000 (16:24 +0800)]
Event: remove next_time which isn't needed

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: remove extra header files
Haomai Wang [Tue, 24 May 2016 07:52:44 +0000 (15:52 +0800)]
Event: remove extra header files

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: replace Mutex with c++ mutex
Haomai Wang [Tue, 8 Mar 2016 06:35:17 +0000 (14:35 +0800)]
Event: replace Mutex with c++ mutex

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: replace atomic_t with c++ atomic
Haomai Wang [Tue, 8 Mar 2016 06:33:45 +0000 (14:33 +0800)]
Event: replace atomic_t with c++ atomic

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: remove time_lock which is no need
Haomai Wang [Tue, 8 Mar 2016 06:31:19 +0000 (14:31 +0800)]
Event: remove time_lock which is no need

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: use local_center instead of pthread id
Haomai Wang [Tue, 24 May 2016 07:34:29 +0000 (15:34 +0800)]
Event: use local_center instead of pthread id

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: remove clock skew detect since we use mono clock now
Haomai Wang [Tue, 24 May 2016 07:24:50 +0000 (15:24 +0800)]
Event: remove clock skew detect since we use mono clock now

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: use multimap instead of map
Haomai Wang [Tue, 24 May 2016 07:23:50 +0000 (15:23 +0800)]
Event: use multimap instead of map

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #9781 from yuyuyu101/wip-epoll
Haomai Wang [Wed, 29 Jun 2016 04:08:33 +0000 (12:08 +0800)]
Merge pull request #9781 from yuyuyu101/wip-epoll

msg/async: harden error logic handle

9 years agoMerge pull request #9990 from dillaman/wip-rbd-mirror-cmake
Kefu Chai [Wed, 29 Jun 2016 02:58:28 +0000 (10:58 +0800)]
Merge pull request #9990 from dillaman/wip-rbd-mirror-cmake

cmake: fix unittest_rbd_mirror failures under non-optimized builds

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9794 from xiexingguo/xxg-wip-fix-libcephfs
John Spray [Wed, 29 Jun 2016 00:11:53 +0000 (01:11 +0100)]
Merge pull request #9794 from xiexingguo/xxg-wip-fix-libcephfs

libcephfs: fix portability-related error settings

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9835 from dx9/wip-client-accessperms
John Spray [Wed, 29 Jun 2016 00:01:45 +0000 (01:01 +0100)]
Merge pull request #9835 from dx9/wip-client-accessperms

client: added def for ACCESSPERMS when undefined

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9884 from david-z/wip-fix-async-msg-shutdown
John Spray [Tue, 28 Jun 2016 23:57:34 +0000 (00:57 +0100)]
Merge pull request #9884 from david-z/wip-fix-async-msg-shutdown

mds: fix shutting down mds timed-out due to deadlock

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9809 from xiexingguo/xxg-wip-fix-fuse-ll
Gregory Farnum [Tue, 28 Jun 2016 21:55:15 +0000 (14:55 -0700)]
Merge pull request #9809 from xiexingguo/xxg-wip-fix-fuse-ll

fuse_ll: fix incorrect error settings of fuse_ll_mkdir()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9803 from xiexingguo/xxg-wip-fix-client_hexscope
Gregory Farnum [Tue, 28 Jun 2016 21:55:01 +0000 (14:55 -0700)]
Merge pull request #9803 from xiexingguo/xxg-wip-fix-client_hexscope

client: fast abort if underlying statsf() call failed; end scope of std::hex properly

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9793 from xiexingguo/xxg-wip-client-mr
Gregory Farnum [Tue, 28 Jun 2016 21:54:50 +0000 (14:54 -0700)]
Merge pull request #9793 from xiexingguo/xxg-wip-client-mr

client: fix access violation

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9774 from xiexingguo/xxg-wip-client_dupmdsmap
Gregory Farnum [Tue, 28 Jun 2016 21:54:14 +0000 (14:54 -0700)]
Merge pull request #9774 from xiexingguo/xxg-wip-client_dupmdsmap

client: discard mds map if it is identical to ours

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9773 from xiexingguo/xxg-wip-cinode_finleak
Gregory Farnum [Tue, 28 Jun 2016 21:53:58 +0000 (14:53 -0700)]
Merge pull request #9773 from xiexingguo/xxg-wip-cinode_finleak

mds/CInode: fix potential fin hanging

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9769 from ukernel/wip-16358
Gregory Farnum [Tue, 28 Jun 2016 21:53:06 +0000 (14:53 -0700)]
Merge pull request #9769 from ukernel/wip-16358

mds: fix Session::check_access()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agomsg/AsyncMessenger: move C_processor_accept class 9991/head
Michal Jarzabek [Tue, 28 Jun 2016 18:34:03 +0000 (19:34 +0100)]
msg/AsyncMessenger: move C_processor_accept class

Move C_processor_accept class to cc file.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agotest: ensure unique template specializations per test case 9990/head
Jason Dillaman [Tue, 28 Jun 2016 19:18:51 +0000 (15:18 -0400)]
test: ensure unique template specializations per test case

With optimizations disabled, there can be cross translation unit
symbol leaking that is not present when inlining is enabled.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: missing template specialization for unittest_rbd_mirror
Jason Dillaman [Tue, 28 Jun 2016 18:59:17 +0000 (14:59 -0400)]
test: missing template specialization for unittest_rbd_mirror

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocmake: add missing cls object dependencies
Jason Dillaman [Tue, 28 Jun 2016 18:58:43 +0000 (14:58 -0400)]
cmake: add missing cls object dependencies

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9975 from ceph/wip-cmake
Ali Maredia [Tue, 28 Jun 2016 18:46:26 +0000 (14:46 -0400)]
Merge pull request #9975 from ceph/wip-cmake

cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9986 from liewegas/wip-make-dist
Dan Mick [Tue, 28 Jun 2016 18:43:10 +0000 (11:43 -0700)]
Merge pull request #9986 from liewegas/wip-make-dist

make-dist: generate ceph.spec

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoMerge pull request #9964 from dillaman/wip-16491
Mykola Golub [Tue, 28 Jun 2016 18:11:18 +0000 (21:11 +0300)]
Merge pull request #9964 from dillaman/wip-16491

rbd-mirror: 'wait_for_scheduled_deletion' callback might deadlock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agov11.0.0 v11.0.0
Sage Weil [Tue, 28 Jun 2016 15:41:51 +0000 (11:41 -0400)]
v11.0.0

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomake-dist: generate ceph.spec 9986/head
Sage Weil [Tue, 28 Jun 2016 15:40:37 +0000 (11:40 -0400)]
make-dist: generate ceph.spec

Fixes: http://tracker.ceph.com/issues/16501
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9889 from Yan-waller/yj-wip-rgwbucketcc
Casey Bodley [Tue, 28 Jun 2016 15:17:55 +0000 (11:17 -0400)]
Merge pull request #9889 from Yan-waller/yj-wip-rgwbucketcc

rgw: add string describing for error number

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9888 from weiqiaomiao/wqm-wip-clean-swiftapi
Casey Bodley [Tue, 28 Jun 2016 15:17:33 +0000 (11:17 -0400)]
Merge pull request #9888 from weiqiaomiao/wqm-wip-clean-swiftapi

rgw: duplicate check for acl op in RGWHandler_REST_Bucket_SWIFT::op_get()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9854 from Yan-waller/yj-wip-rgwunlinkbucket
Casey Bodley [Tue, 28 Jun 2016 15:17:13 +0000 (11:17 -0400)]
Merge pull request #9854 from Yan-waller/yj-wip-rgwunlinkbucket

rgw: remove unused bufferlist variable

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9822 from Yan-waller/yj-wiph-rgwfixinitwatch
Casey Bodley [Tue, 28 Jun 2016 15:16:50 +0000 (11:16 -0400)]
Merge pull request #9822 from Yan-waller/yj-wiph-rgwfixinitwatch

rgw: fix the missing return value of init_watch

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9808 from Yan-waller/yj-wip-rgwtoolsinitreturn
Casey Bodley [Tue, 28 Jun 2016 15:16:23 +0000 (11:16 -0400)]
Merge pull request #9808 from Yan-waller/yj-wip-rgwtoolsinitreturn

rgw: add error return code checking for rgw_tools_init and rgw_perf_start

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9796 from Yan-waller/yj-wip-rgwremoveuser
Casey Bodley [Tue, 28 Jun 2016 15:16:00 +0000 (11:16 -0400)]
Merge pull request #9796 from Yan-waller/yj-wip-rgwremoveuser

rgw: miscellaneous cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9780 from theanalyst/rgw/create-bucket-cleanup
Casey Bodley [Tue, 28 Jun 2016 15:15:14 +0000 (11:15 -0400)]
Merge pull request #9780 from theanalyst/rgw/create-bucket-cleanup

rgw_bucket: remove unused bufferlist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9987 from jcsp/wip-cmake-fortify-source
Kefu Chai [Tue, 28 Jun 2016 14:58:56 +0000 (22:58 +0800)]
Merge pull request #9987 from jcsp/wip-cmake-fortify-source

cmake: fix FORTIFY_SOURCE check

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: fix FORTIFY_SOURCE check 9987/head
John Spray [Tue, 28 Jun 2016 14:54:13 +0000 (15:54 +0100)]
cmake: fix FORTIFY_SOURCE check

This got broken in 6f3e3cf6.  The -Werror part wasn't
having the desired effect, so we were enabling FORTIFY_SOURCE
even when in -O0

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agomsg/async/AsyncMessenger: make sure all connections closed then shutdown dq 9781/head
Haomai Wang [Mon, 27 Jun 2016 15:23:20 +0000 (23:23 +0800)]
msg/async/AsyncMessenger: make sure all connections closed then shutdown dq

1. ensure stop accepter before shutdown dispatcherqueue
2. ensure we don't generate new item after dispatcher queue shutdown

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: keep out_seq inc/dec with sent messages
Haomai Wang [Sat, 25 Jun 2016 08:57:59 +0000 (16:57 +0800)]
msg/async: keep out_seq inc/dec with sent messages

Partial revert 84b9088e164b39919065194831455e441a06ef85
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/AsyncConnection: handle send buffer overflow case
Haomai Wang [Fri, 17 Jun 2016 14:01:09 +0000 (22:01 +0800)]
msg/async/AsyncConnection: handle send buffer overflow case

It's rare happen in real env, because each socket has enough write buffer
to store a little handshake info.

Just harden the current codes

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: Consolidate accept error handle
Haomai Wang [Fri, 17 Jun 2016 13:55:03 +0000 (21:55 +0800)]
msg/async: Consolidate accept error handle

The original logic is from
https://github.com/ceph/ceph/commit/ba140b5a6d1bafe7f953819f682758ab552edfd4
I think it doesn't make sense in detail errno case.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/Epoll: make sure error event can be handle
Haomai Wang [Fri, 17 Jun 2016 13:41:08 +0000 (21:41 +0800)]
msg/async/Epoll: make sure error event can be handle

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #9984 from tchaikov/wip-fix-test_crush_bucket.sh
Loic Dachary [Tue, 28 Jun 2016 14:25:29 +0000 (16:25 +0200)]
Merge pull request #9984 from tchaikov/wip-fix-test_crush_bucket.sh

test/test_crush_bucket.sh: source detect-build-env-vars.sh for settin…

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #9771 from yuyuyu101/wip-async-priority
Sage Weil [Tue, 28 Jun 2016 14:21:37 +0000 (10:21 -0400)]
Merge pull request #9771 from yuyuyu101/wip-async-priority

msg/async: set socket priority for heartbeat socket

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoqa/workunits/rbd: remove temporary image exports 9964/head
Jason Dillaman [Mon, 27 Jun 2016 17:01:13 +0000 (13:01 -0400)]
qa/workunits/rbd: remove temporary image exports

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: fix potential image replayer state transition race
Jason Dillaman [Mon, 27 Jun 2016 15:13:29 +0000 (11:13 -0400)]
rbd-mirror: fix potential image replayer state transition race

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: cancel image deletion callback on shut down
Jason Dillaman [Mon, 27 Jun 2016 15:06:57 +0000 (11:06 -0400)]
rbd-mirror: cancel image deletion callback on shut down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: fixed potential leaking image deletion context callback
Jason Dillaman [Mon, 27 Jun 2016 14:58:09 +0000 (10:58 -0400)]
rbd-mirror: fixed potential leaking image deletion context callback

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: ImageReplayer doesn't need image deleted callback
Jason Dillaman [Mon, 27 Jun 2016 13:45:25 +0000 (09:45 -0400)]
rbd-mirror: ImageReplayer doesn't need image deleted callback

The Replayer will detect that the ImageReplayer is stopped and will
schedule the "wait for deleted" callback before attempting to
restart the ImageReplayer.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: use async callback when deletion not in-progress
Jason Dillaman [Mon, 27 Jun 2016 13:21:05 +0000 (09:21 -0400)]
rbd-mirror: use async callback when deletion not in-progress

Fixes: http://tracker.ceph.com/issues/16491
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9958 from dillaman/wip-16489
Mykola Golub [Tue, 28 Jun 2016 13:02:41 +0000 (16:02 +0300)]
Merge pull request #9958 from dillaman/wip-16489

rbd-mirror: clean up ImageReplayer before stopping state machine

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9923 from dillaman/wip-16471
Mykola Golub [Tue, 28 Jun 2016 13:01:39 +0000 (16:01 +0300)]
Merge pull request #9923 from dillaman/wip-16471

librbd: removal of partially deleted image needs id lookup

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agotest/test_crush_bucket.sh: source detect-build-env-vars.sh for settings paths 9984/head
Kefu Chai [Tue, 28 Jun 2016 11:41:58 +0000 (19:41 +0800)]
test/test_crush_bucket.sh: source detect-build-env-vars.sh for settings paths

this fixes errors like

../qa/workunits/ceph-helpers.sh:354: run_mon:  ceph-mon --id a
--mon-osd-full-ratio=.99 --mon-data-avail-crit=1
--paxos-propose-interval=0.1 --osd-crush-chooseleaf-type=0
--erasure-code-dir= --plugin-dir= --debug-mon 20 --debug-ms 20
--debug-paxos 20 --chdir= --mon-data=testdir/testcrushbucket/a
'--log-file=testdir/testcrushbucket/$name.log'
'--admin-socket=testdir/testcrushbucket/$cluster-$name.asok'
--mon-cluster-log-file=testdir/testcrushbucket/log
--run-dir=testdir/testcrushbucket
'--pid-file=testdir/testcrushbucket/$name.pid'
2016-06-28 11:24:24.105884 2b1bbd3d0380 -1 load
dlopen(/libec_jerasure.so): /libec_jerasure.so: cannot open shared
object file: No such file or directory
../qa/workunits/ceph-helpers.sh:371: run_mon:  return 1

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9539 from cxwshawn/wip-tc9-fix
Jason Dillaman [Tue, 28 Jun 2016 12:20:10 +0000 (08:20 -0400)]
Merge pull request #9539 from cxwshawn/wip-tc9-fix

librbd: optimize header file dependency and modify related files

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9500 from zhuangzeqiang/wip-16056
Jason Dillaman [Tue, 28 Jun 2016 12:19:28 +0000 (08:19 -0400)]
Merge pull request #9500 from zhuangzeqiang/wip-16056

librbd: restrict mirror enable/disable actions on parents/clones

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9623 from rjfd/wip-15239
Jason Dillaman [Tue, 28 Jun 2016 12:18:48 +0000 (08:18 -0400)]
Merge pull request #9623 from rjfd/wip-15239

rbd-mirror: Throttle in-flight image syncs to only a N concurrent

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9856 from hzhang-wx/master
Jason Dillaman [Tue, 28 Jun 2016 12:18:14 +0000 (08:18 -0400)]
Merge pull request #9856 from hzhang-wx/master

librbd: discard should return error if length too large

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: tests: ImageSyncThrottler unit tests 9623/head
Ricardo Dias [Thu, 9 Jun 2016 09:40:23 +0000 (10:40 +0100)]
rbd-mirror: tests: ImageSyncThrottler unit tests

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: Usage of image-sync throttler in BootstrapRequest
Ricardo Dias [Wed, 8 Jun 2016 15:38:01 +0000 (16:38 +0100)]
rbd-mirror: Usage of image-sync throttler in BootstrapRequest

Fixes: http://tracker.ceph.com/issues/15239
Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: Implementation of image-sync throttler
Ricardo Dias [Wed, 8 Jun 2016 15:37:20 +0000 (16:37 +0100)]
rbd-mirror: Implementation of image-sync throttler

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agoMerge pull request #9699 from rjfd/wip-15108
Jason Dillaman [Tue, 28 Jun 2016 12:14:41 +0000 (08:14 -0400)]
Merge pull request #9699 from rjfd/wip-15108

rbd-mirror:  Update the sync point object number during sync

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agocmake: remove -DNDEBUG from CXXFLAGS of release builds 9975/head
Kefu Chai [Tue, 28 Jun 2016 04:57:21 +0000 (12:57 +0800)]
cmake: remove -DNDEBUG from CXXFLAGS of release builds

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add missing bits for rados/test.sh
Kefu Chai [Mon, 27 Jun 2016 04:20:29 +0000 (12:20 +0800)]
cmake: add missing bits for rados/test.sh

some executables named ceph_test_rados_* are missing in the ceph-test
package. and they are called by rados/test.sh.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomsg/async: set socket priority for heartbeat socket 9771/head
Haomai Wang [Fri, 17 Jun 2016 06:10:59 +0000 (14:10 +0800)]
msg/async: set socket priority for heartbeat socket

To prioritize the heartbeat packets in the the diffserv-aware device.

Learn/copy from https://github.com/ceph/ceph/pull/3353

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #8086 from jaemyoun/wip-doc-rados-java-api
Kefu Chai [Tue, 28 Jun 2016 04:18:41 +0000 (12:18 +0800)]
Merge pull request #8086 from jaemyoun/wip-doc-rados-java-api

doc: adding JAVA Example in Step 4: Closing Sessions

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: add closing session in Java 8086/head
Jaemyoun [Mon, 14 Mar 2016 11:33:24 +0000 (20:33 +0900)]
doc: add closing session in Java

9 years agoMerge pull request #9973 from xiexingguo/xxg-wip-fix-blob-ut-failure
Sage Weil [Tue, 28 Jun 2016 00:38:28 +0000 (20:38 -0400)]
Merge pull request #9973 from xiexingguo/xxg-wip-fix-blob-ut-failure

os/bluestore: fix ut failure due to incorrect test instance

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: fix ut failure due to incorrect test instance 9973/head
xie xingguo [Tue, 28 Jun 2016 00:30:06 +0000 (08:30 +0800)]
os/bluestore: fix ut failure due to incorrect test instance

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9795 from cyb70289/yibocai
Yuri Weinstein [Mon, 27 Jun 2016 22:02:05 +0000 (15:02 -0700)]
Merge pull request #9795 from cyb70289/yibocai

common: Improve linux dcache hash algorithm

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9824 from stiopaa1/msg_asyncmess_removeCount
Yuri Weinstein [Mon, 27 Jun 2016 22:01:01 +0000 (15:01 -0700)]
Merge pull request #9824 from stiopaa1/msg_asyncmess_removeCount

msg/async: remove unneeded use of count

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #9861 from songbaisen/a12
Yuri Weinstein [Mon, 27 Jun 2016 22:00:21 +0000 (15:00 -0700)]
Merge pull request #9861 from songbaisen/a12

 mon: remove the redundant min_last_epoch_clean judge in PGMap

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9937 from stiopaa1/msg_asyncMess_moveWorkerClass
Sage Weil [Mon, 27 Jun 2016 21:58:52 +0000 (17:58 -0400)]
Merge pull request #9937 from stiopaa1/msg_asyncMess_moveWorkerClass

msg/AsyncMessenger: move Worker class to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9966 from stiopaa1/msg_asyncmess_addOverride
Sage Weil [Mon, 27 Jun 2016 21:44:03 +0000 (17:44 -0400)]
Merge pull request #9966 from stiopaa1/msg_asyncmess_addOverride

msg/AsyncMessenger.h: add override to virtual func

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