]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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 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 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 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>
9 years agoMerge pull request #9919 from tchaikov/wip-cmake-ceph-disk
Ali Maredia [Mon, 27 Jun 2016 20:18:38 +0000 (16:18 -0400)]
Merge pull request #9919 from tchaikov/wip-cmake-ceph-disk

cmake,test: run ceph-disk tests with cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9897 from liewegas/wip-cmake
Sage Weil [Mon, 27 Jun 2016 18:35:46 +0000 (14:35 -0400)]
Merge pull request #9897 from liewegas/wip-cmake

init-ceph: make it behave when run from a cmake build dir

9 years agoREADME.md: update a few things
Sage Weil [Mon, 27 Jun 2016 18:16:23 +0000 (11:16 -0700)]
README.md: update a few things

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoREADME.md: fix whitespace
Sage Weil [Mon, 27 Jun 2016 18:03:11 +0000 (11:03 -0700)]
README.md: fix whitespace

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agolibrbd: removal of partially deleted image needs id lookup 9923/head
Jason Dillaman [Fri, 24 Jun 2016 14:52:16 +0000 (10:52 -0400)]
librbd: removal of partially deleted image needs id lookup

Several operations depend on the image id but if the image cannot be
opened to retrieve the id, these cleanup operations cannot be executed.

Fixes: http://tracker.ceph.com/issues/16471
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomsg/AsyncMessenger.h: add override to virtual func 9966/head
Michal Jarzabek [Mon, 27 Jun 2016 17:53:13 +0000 (18:53 +0100)]
msg/AsyncMessenger.h: add override to virtual func

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9945 from rjfd/wip-16488
Mykola Golub [Mon, 27 Jun 2016 16:13:12 +0000 (19:13 +0300)]
Merge pull request #9945 from rjfd/wip-16488

rbd-mirror: fix potential race condition in resync listener removal

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9962 from liewegas/wip-bluestore-unused
Sage Weil [Mon, 27 Jun 2016 15:18:13 +0000 (11:18 -0400)]
Merge pull request #9962 from liewegas/wip-bluestore-unused

os/bluestore: replace interval_set with bitmap for unused

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: replace bluestore_blob_t::unused from interval to bitmap 9962/head
Igor Fedotov [Fri, 24 Jun 2016 19:40:51 +0000 (22:40 +0300)]
os/bluestore: replace bluestore_blob_t::unused from interval to bitmap

Signed-off-by: Igor Fedotov <ifedotov@miranitis.com>
9 years agoos/bluestore: move add_unused call after csum initialization as it should depend...
Igor Fedotov [Fri, 24 Jun 2016 13:42:19 +0000 (16:42 +0300)]
os/bluestore: move add_unused call after csum initialization as it should depend on chunk size.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/bluestore: introduce bluestore_blob_t::get_chunk_size method
Igor Fedotov [Fri, 24 Jun 2016 13:30:45 +0000 (16:30 +0300)]
os/bluestore: introduce bluestore_blob_t::get_chunk_size method

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/bluestore: cleanup _pad_zeros to eliminate redundant length param
Igor Fedotov [Fri, 24 Jun 2016 12:05:28 +0000 (15:05 +0300)]
os/bluestore: cleanup _pad_zeros to eliminate redundant length param

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #9959 from xiexingguo/xxg-wip-bluestore-cache-clean
Sage Weil [Mon, 27 Jun 2016 14:33:37 +0000 (10:33 -0400)]
Merge pull request #9959 from xiexingguo/xxg-wip-bluestore-cache-clean

os/bluestore: add  some sanity checks

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agorbd-mirror: tests: Support for inflight image sync point update 9699/head
Ricardo Dias [Tue, 14 Jun 2016 15:43:19 +0000 (16:43 +0100)]
rbd-mirror: tests: Support for inflight image sync point update

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: image-sync: Periodically update sync point object number
Ricardo Dias [Thu, 2 Jun 2016 09:04:41 +0000 (10:04 +0100)]
rbd-mirror: image-sync: Periodically update sync point object number

Fixes: http://tracker.ceph.com/issues/15108
Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agoos/bluestore: audit buffer bytes before applying delta 9959/head
xie xingguo [Mon, 27 Jun 2016 13:44:12 +0000 (21:44 +0800)]
os/bluestore: audit buffer bytes before applying delta

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: fix typo
xie xingguo [Mon, 27 Jun 2016 06:27:38 +0000 (14:27 +0800)]
os/bluestore: fix typo

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: add sanity check when try to trim onode from cache
xie xingguo [Mon, 27 Jun 2016 01:29:50 +0000 (09:29 +0800)]
os/bluestore: add sanity check when try to trim onode from cache

We have verified that the onode size to be trimmed is positive ahead,
so "p" shall never point to onode_lru.begin() below here.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9951 from Yan-waller/yj-wip-rgwtestcompilingwarning
Casey Bodley [Mon, 27 Jun 2016 13:33:30 +0000 (09:33 -0400)]
Merge pull request #9951 from Yan-waller/yj-wip-rgwtestcompilingwarning

rgw/test: use variable type 'size_t' instead of 'int'

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9839 from renhwztetecs/renhw-wip-cdir-cleanup
John Spray [Mon, 27 Jun 2016 13:07:15 +0000 (14:07 +0100)]
Merge pull request #9839 from renhwztetecs/renhw-wip-cdir-cleanup

mds: unused classes and cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agorbd-mirror: clean up ImageReplayer before stopping state machine 9958/head
Jason Dillaman [Mon, 27 Jun 2016 13:05:33 +0000 (09:05 -0400)]
rbd-mirror: clean up ImageReplayer before stopping state machine

Fixes: http://tracker.ceph.com/issues/16489
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9677 from stiopaa1/mds_removeUnneededLineAndAddConst
John Spray [Mon, 27 Jun 2016 13:03:57 +0000 (14:03 +0100)]
Merge pull request #9677 from stiopaa1/mds_removeUnneededLineAndAddConst

mds/SessionMap.h: remove duplicated line and add const to member functions

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9877 from batrick/mds-comm-locks
John Spray [Mon, 27 Jun 2016 12:22:39 +0000 (13:22 +0100)]
Merge pull request #9877 from batrick/mds-comm-locks

mds: add missing mds_lock locks

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9942 from jcsp/wip-doc-netdev
Yan, Zheng [Mon, 27 Jun 2016 12:07:16 +0000 (07:07 -0500)]
Merge pull request #9942 from jcsp/wip-doc-netdev

doc: add _netdev to cephfs fstab lines

9 years agoMerge pull request #9949 from trociny/fix-use-after-free
Jason Dillaman [Mon, 27 Jun 2016 11:51:08 +0000 (07:51 -0400)]
Merge pull request #9949 from trociny/fix-use-after-free

librbd: potential use after free on refresh error

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: potential use after free on refresh error 9949/head
Mykola Golub [Mon, 27 Jun 2016 11:45:02 +0000 (14:45 +0300)]
librbd: potential use after free on refresh error

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agorgw/test: use variable type 'size_t' instead of 'int' seems to be more reasonable 9951/head
Yan Jun [Mon, 27 Jun 2016 10:57:36 +0000 (18:57 +0800)]
rgw/test: use variable type 'size_t' instead of 'int' seems to be more reasonable

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
9 years agorbd-mirror: image-replayer: Fix bug in resync listener remotion 9945/head
Ricardo Dias [Mon, 27 Jun 2016 10:07:41 +0000 (11:07 +0100)]
rbd-mirror: image-replayer: Fix bug in resync listener remotion

Fixes: http://tracker.ceph.com/issues/16488
Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agodoc: add _netdev to cephfs fstab lines 9942/head
John Spray [Mon, 27 Jun 2016 09:39:02 +0000 (10:39 +0100)]
doc: add _netdev to cephfs fstab lines

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agorbd discard return -EINVAL if len > MAX_INT32 9856/head
Huan Zhang [Fri, 24 Jun 2016 03:27:53 +0000 (11:27 +0800)]
rbd discard return -EINVAL if len > MAX_INT32

rbd discard use 'int' to return discarded length, but the 'len' user
passed is 'uint64', in some case, the ret value will be truncated
and return a negative value which means discard failed. ret -EINVAL
if len > MAX_INT32 to indicate support len <= MAX_INT32 only.

Fixes: http://tracker.ceph.com/issues/16465
Signed-off-by: Huan Zhang <zhanghuan@chinac.com>
9 years agoMerge pull request #9742 from xiexingguo/xxg-wip-server_cmode
Yan, Zheng [Mon, 27 Jun 2016 06:42:27 +0000 (01:42 -0500)]
Merge pull request #9742 from xiexingguo/xxg-wip-server_cmode

mds/server: fix rare race when waitting for osdmap

9 years agomds/server: fix rare race when waitting for osdmap 9742/head
xie xingguo [Thu, 16 Jun 2016 09:16:28 +0000 (17:16 +0800)]
mds/server: fix rare race when waitting for osdmap

If wait_for_map() returns true, we have got the requested osdmap
at the specified epoch, so we shall try again to do further
verification whether we have the specific pool or not.

The above case can happen because we drop the objecter internal
rwlock during the switch between the objecter->with_osdmap()
and objecter->wait_for_map() methods.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agotest: ceph-disk: run ceph-disk with cmake 9919/head
Kefu Chai [Fri, 24 Jun 2016 07:26:54 +0000 (15:26 +0800)]
test: ceph-disk: run ceph-disk with cmake

* CMakeLists.txt: do not run ceph-disk/run-tox.sh in its source
  directory anymore, "ceph" cli needs to run in the build directory.
* CMakeLists.txt, run-tox.sh:
  - pass $CEPH_BUILD_DIR down to tox.ini, so tox can set the working
    directory to $CEPH_BUILD_DIR to $CMAKE_BINARY_DIR, in which the
    "ceph" cli will be able to figure out where the pybind dso are
    located, and respawn itself with the necessary paths set accordingly.
  - pass $CEPH_BUILD_VIRTUALENV to tox, so ceph-helpers.sh is able to
    set the paths to ceph-disk and ceph-detect-init right.
* run-tox.sh: specify the full path of tox.ini, since we will call
  "tox" in the build directory.
* tox.ini:
  - move the non-flake8 related settings into [testenv:py27] section.
  - always use absolute path, as we will call "tox" in the build
    directory, instead where "tox.ini" lives.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest: ceph-disk.sh: remove unused paths from from $PATH
Kefu Chai [Fri, 24 Jun 2016 07:26:09 +0000 (15:26 +0800)]
test: ceph-disk.sh: remove unused paths from from $PATH

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest: chmod +x ceph-disk.sh
Kefu Chai [Fri, 24 Jun 2016 07:25:19 +0000 (15:25 +0800)]
test: chmod +x ceph-disk.sh

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomsg/AsyncMessenger: move Worker class to cc file 9937/head
Michal Jarzabek [Sun, 26 Jun 2016 07:10:39 +0000 (08:10 +0100)]
msg/AsyncMessenger: move Worker class to cc file

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9922 from dillaman/wip-16470
Mykola Golub [Sat, 25 Jun 2016 17:00:30 +0000 (20:00 +0300)]
Merge pull request #9922 from dillaman/wip-16470

librbd: do not propagate mirror status notification failures

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9913 from xiexingguo/xxg-wip-fix-bitallocatorut
Sage Weil [Sat, 25 Jun 2016 16:51:35 +0000 (12:51 -0400)]
Merge pull request #9913 from xiexingguo/xxg-wip-fix-bitallocatorut

os/bluestore: fix ut failure when switching to bitmap-allocator

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoos/bluestore: fix memory leak during bit_alloc ut 9913/head
xie xingguo [Sat, 25 Jun 2016 08:21:11 +0000 (16:21 +0800)]
os/bluestore: fix memory leak during bit_alloc ut

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorbd: restrict mirror enable/disable actions on parents/clones 9500/head
zhuangzeqiang [Sat, 25 Jun 2016 02:21:25 +0000 (10:21 +0800)]
rbd: restrict mirror enable/disable actions on parents/clones

Fixes: http://tracker.ceph.com/issues/16056
Signed-off-by: zhuangzeqiang zhuang.zeqiang@h3c.com
9 years agoos/bluestore: use std limits for int16_t/int32_t
xie xingguo [Sat, 25 Jun 2016 00:50:10 +0000 (08:50 +0800)]
os/bluestore: use std limits for int16_t/int32_t

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: update comment
xie xingguo [Sat, 25 Jun 2016 00:43:04 +0000 (08:43 +0800)]
os/bluestore: update comment

We have decreased the default concurrent scans to 1,
so the comment is misleading.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: allow total blocks fall into one single zone
xie xingguo [Sat, 25 Jun 2016 00:36:24 +0000 (08:36 +0800)]
os/bluestore: allow total blocks fall into one single zone

So the blusfs ut will be happy with this.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: update output of offset/length pair to hex version
xie xingguo [Fri, 24 Jun 2016 02:23:43 +0000 (10:23 +0800)]
os/bluestore: update output of offset/length pair to hex version

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9905 from dillaman/wip-16450
Mykola Golub [Fri, 24 Jun 2016 19:21:52 +0000 (22:21 +0300)]
Merge pull request #9905 from dillaman/wip-16450

librbd: mark exclusive lock as released after journal is closed

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9899 from dillaman/wip-16350
Mykola Golub [Fri, 24 Jun 2016 19:21:11 +0000 (22:21 +0300)]
Merge pull request #9899 from dillaman/wip-16350

librbd: ignore missing object map during snap remove

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9896 from dillaman/wip-16446
Mykola Golub [Fri, 24 Jun 2016 19:20:24 +0000 (22:20 +0300)]
Merge pull request #9896 from dillaman/wip-16446

librbd: delete ExclusiveLock instance when switching to snapshot

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9895 from dillaman/wip-16445
Mykola Golub [Fri, 24 Jun 2016 19:19:19 +0000 (22:19 +0300)]
Merge pull request #9895 from dillaman/wip-16445

librbd: ignore snap unprotect -EBUSY errors during journal replay

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoinit-ceph: make it behave when run from a cmake build dir 9897/head
Sage Weil [Fri, 24 Jun 2016 15:31:46 +0000 (11:31 -0400)]
init-ceph: make it behave when run from a cmake build dir

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9746 from xiexingguo/xxg-wip-mdcache_hoir
John Spray [Fri, 24 Jun 2016 14:58:06 +0000 (15:58 +0100)]
Merge pull request #9746 from xiexingguo/xxg-wip-mdcache_hoir

mds/MDCache: fix leak of MMDSOpenInoReply

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agolibrbd: do not propagate mirror status notification failures 9922/head
Jason Dillaman [Fri, 24 Jun 2016 14:03:53 +0000 (10:03 -0400)]
librbd: do not propagate mirror status notification failures

These should be treated as a broadcast since no ACK is required. The
peer will eventually see the notification or its watch will have timed
out and it will re-sync.

Fixes: http://tracker.ceph.com/issues/16470
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9921 from liewegas/wip-bluestore-fix-discard
Igor Fedotov [Fri, 24 Jun 2016 13:20:17 +0000 (15:20 +0200)]
Merge pull request #9921 from liewegas/wip-bluestore-fix-discard

os/bluestore: fix discard

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/bluestore: un-inline some 2Q methods
Sage Weil [Thu, 23 Jun 2016 21:09:20 +0000 (17:09 -0400)]
os/bluestore: un-inline some 2Q methods

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: fix buffer discard accounting for 2Q
Sage Weil [Thu, 23 Jun 2016 21:08:32 +0000 (17:08 -0400)]
os/bluestore: fix buffer discard accounting for 2Q

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: simplify and fix blob invalidation 9921/head
Sage Weil [Fri, 24 Jun 2016 12:56:44 +0000 (08:56 -0400)]
os/bluestore: simplify and fix blob invalidation

We can't invalidate based on any particular lextent we drop, as there may
be other lextents (in this onode or in another one) that reference the
same data.  This can break even a single multi-write transaction that
relies on the buffer cache to fill out blocks.

Fix by just doing the unallocated version unconditionally.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9920 from zhouyuan/librd_remove
Jason Dillaman [Fri, 24 Jun 2016 12:56:28 +0000 (08:56 -0400)]
Merge pull request #9920 from zhouyuan/librd_remove

librbd: remove unused code block

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9916 from xiexingguo/xxg-wip-fix-decode-bnode
Sage Weil [Fri, 24 Jun 2016 12:38:32 +0000 (08:38 -0400)]
Merge pull request #9916 from xiexingguo/xxg-wip-fix-decode-bnode

os/bluestore: fix decoding pool from bnode key

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9910 from tchaikov/wip-cmake-drop-ceph-ra
Sage Weil [Fri, 24 Jun 2016 12:32:37 +0000 (08:32 -0400)]
Merge pull request #9910 from tchaikov/wip-cmake-drop-ceph-ra

cmake: ocf: drop ceph ra

9 years agolibrbd: memory leak possible if journal op event failed 9895/head
Jason Dillaman [Thu, 23 Jun 2016 13:03:24 +0000 (09:03 -0400)]
librbd: memory leak possible if journal op event failed

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: trivial fix to remove unused code block 9920/head
Yuan Zhou [Fri, 24 Jun 2016 07:44:28 +0000 (15:44 +0800)]
librbd: trivial fix to remove unused code block

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
9 years agoos/bluestore: literal tidy-ups 9916/head
xie xingguo [Fri, 24 Jun 2016 07:13:15 +0000 (15:13 +0800)]
os/bluestore: literal tidy-ups

There error codes are improperly arranged, which looks weird.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: make fsck can catch bad bnode key too
xie xingguo [Fri, 24 Jun 2016 06:57:30 +0000 (14:57 +0800)]
os/bluestore: make fsck can catch bad bnode key too

The case may be rare but the check shall do no harm.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: fix decoding pool from bnode key
xie xingguo [Fri, 24 Jun 2016 06:53:39 +0000 (14:53 +0800)]
os/bluestore: fix decoding pool from bnode key

The current result is raw and not properly translated.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agocmake: ocf: drop ceph ra 9910/head
Kefu Chai [Fri, 24 Jun 2016 01:30:02 +0000 (09:30 +0800)]
cmake: ocf: drop ceph ra

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoos/bluestore: default to bitmap allocator
Sage Weil [Thu, 23 Jun 2016 20:48:17 +0000 (16:48 -0400)]
os/bluestore: default to bitmap allocator

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9906 from stiopaa1/msg_asyncmess_workepool_deleteCopycontrAndAss
Kefu Chai [Fri, 24 Jun 2016 01:16:20 +0000 (09:16 +0800)]
Merge pull request #9906 from stiopaa1/msg_asyncmess_workepool_deleteCopycontrAndAss

msg/AsyncMessenger:delete cpy constr and assign op

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9273 from stiopaa1/osd_removeClosingBrace_
David Zafman [Thu, 23 Jun 2016 21:59:55 +0000 (14:59 -0700)]
Merge pull request #9273 from stiopaa1/osd_removeClosingBrace_

osd/OSD.h: remove closing brace } from comment

Reviewed-by: David Zafman <dzafman@redhat.com>