Commit Graph

55211 Commits

Author SHA1 Message Date
Kefu Chai
5de4a9cef6 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>
2016-06-28 12:18:41 +08:00
Jaemyoun
319d3c8ac9 doc: add closing session in Java 2016-06-28 13:02:48 +09:00
Sage Weil
5a8070f3c8 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>
2016-06-27 20:38:28 -04:00
xie xingguo
b0d354c5f2 os/bluestore: fix ut failure due to incorrect test instance
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-28 08:30:06 +08:00
Yuri Weinstein
0fd11ec358 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>
2016-06-27 15:02:05 -07:00
Yuri Weinstein
7c673b25dc Merge pull request #9824 from stiopaa1/msg_asyncmess_removeCount
msg/async: remove unneeded use of count

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-06-27 15:01:01 -07:00
Yuri Weinstein
641180fc63 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>
2016-06-27 15:00:21 -07:00
Sage Weil
356d96dbd5 Merge pull request #9937 from stiopaa1/msg_asyncMess_moveWorkerClass
msg/AsyncMessenger: move Worker class to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-27 17:58:52 -04:00
Sage Weil
d2dcb3d861 Merge pull request #9966 from stiopaa1/msg_asyncmess_addOverride
msg/AsyncMessenger.h: add override to virtual func

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-27 17:44:03 -04:00
Ali Maredia
0db1328536 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>
2016-06-27 16:18:38 -04:00
Sage Weil
084592d0f2 Merge pull request #9897 from liewegas/wip-cmake
init-ceph: make it behave when run from a cmake build dir
2016-06-27 14:35:46 -04:00
Sage Weil
09919ce683 README.md: update a few things
Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-27 11:16:23 -07:00
Sage Weil
9bc6f6e614 README.md: fix whitespace
Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-27 11:03:11 -07:00
Michal Jarzabek
eeb32c0f16 msg/AsyncMessenger.h: add override to virtual func
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-06-27 18:53:13 +01:00
Mykola Golub
c56e782aca 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>
2016-06-27 19:13:12 +03:00
Sage Weil
aaedffb08c 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>
2016-06-27 11:18:13 -04:00
Igor Fedotov
9ee134e295 os/bluestore: replace bluestore_blob_t::unused from interval to bitmap
Signed-off-by: Igor Fedotov <ifedotov@miranitis.com>
2016-06-27 08:08:02 -07:00
Igor Fedotov
b159dd770c os/bluestore: move add_unused call after csum initialization as it should depend on chunk size.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-27 08:05:31 -07:00
Igor Fedotov
0d83c935d8 os/bluestore: introduce bluestore_blob_t::get_chunk_size method
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-27 08:05:30 -07:00
Igor Fedotov
b788261b26 os/bluestore: cleanup _pad_zeros to eliminate redundant length param
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-27 08:05:30 -07:00
Sage Weil
1b6450b117 Merge pull request #9959 from xiexingguo/xxg-wip-bluestore-cache-clean
os/bluestore: add  some sanity checks

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-27 10:33:37 -04:00
xie xingguo
fb51d64d19 os/bluestore: audit buffer bytes before applying delta
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-27 21:44:12 +08:00
xie xingguo
969a8db626 os/bluestore: fix typo
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-27 21:40:04 +08:00
xie xingguo
06923a5f20 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>
2016-06-27 21:37:10 +08:00
Casey Bodley
4d4e6330d9 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>
2016-06-27 09:33:30 -04:00
John Spray
e5502f3951 Merge pull request #9839 from renhwztetecs/renhw-wip-cdir-cleanup
mds: unused classes and cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-27 14:07:15 +01:00
John Spray
02b99e9f22 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>
2016-06-27 14:03:57 +01:00
John Spray
3bf1c590d0 Merge pull request #9877 from batrick/mds-comm-locks
mds: add missing mds_lock locks

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-27 13:22:39 +01:00
Yan, Zheng
a3f0c572d1 Merge pull request #9942 from jcsp/wip-doc-netdev
doc: add _netdev to cephfs fstab lines
2016-06-27 07:07:16 -05:00
Jason Dillaman
872d835e71 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>
2016-06-27 07:51:08 -04:00
Mykola Golub
e92b3950cd librbd: potential use after free on refresh error
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-06-27 14:45:02 +03:00
Yan Jun
334066bfc0 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>
2016-06-27 19:06:31 +08:00
Ricardo Dias
11a5851e90
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>
2016-06-27 11:07:41 +01:00
John Spray
2499a568c2 doc: add _netdev to cephfs fstab lines
Signed-off-by: John Spray <john.spray@redhat.com>
2016-06-27 10:39:02 +01:00
Yan, Zheng
2cd0475ff9 Merge pull request #9742 from xiexingguo/xxg-wip-server_cmode
mds/server: fix rare race when waitting for osdmap
2016-06-27 01:42:27 -05:00
xie xingguo
68682775d4 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>
2016-06-27 11:11:49 +08:00
Kefu Chai
4af50e2e5f 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>
2016-06-27 09:24:07 +08:00
Kefu Chai
0fbe2d2c3e test: ceph-disk.sh: remove unused paths from from $PATH
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-27 09:24:07 +08:00
Kefu Chai
13cd850c37 test: chmod +x ceph-disk.sh
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-27 09:24:07 +08:00
Michal Jarzabek
23d4488e37 msg/AsyncMessenger: move Worker class to cc file
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-06-26 08:10:39 +01:00
Mykola Golub
63b82de32f Merge pull request #9922 from dillaman/wip-16470
librbd: do not propagate mirror status notification failures

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-25 20:00:30 +03:00
Sage Weil
145402f570 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>
2016-06-25 12:51:35 -04:00
xie xingguo
56b23890eb os/bluestore: fix memory leak during bit_alloc ut
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-25 16:21:11 +08:00
xie xingguo
fea2cd2a61 os/bluestore: use std limits for int16_t/int32_t
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-25 10:20:26 +08:00
xie xingguo
b5695cdc52 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>
2016-06-25 10:20:26 +08:00
xie xingguo
5163d47563 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>
2016-06-25 10:20:26 +08:00
xie xingguo
aeb990c210 os/bluestore: update output of offset/length pair to hex version
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-25 10:20:26 +08:00
Mykola Golub
3f60a67524 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>
2016-06-24 22:21:52 +03:00
Mykola Golub
828710ef39 Merge pull request #9899 from dillaman/wip-16350
librbd: ignore missing object map during snap remove

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-24 22:21:11 +03:00
Mykola Golub
b1576c5519 Merge pull request #9896 from dillaman/wip-16446
librbd: delete ExclusiveLock instance when switching to snapshot

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-24 22:20:24 +03:00