Commit Graph

67350 Commits

Author SHA1 Message Date
Haomai Wang
e3c54bc8eb Merge pull request #12812 from optimistyzy/16_0
NVMEDevice: fix bug in data_buf_next_sge

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-01-08 13:17:37 +08:00
Yehuda Sadeh
5e633a9d5c Merge pull request #12767 from linuxbox2/rgw-invalid-aio-read4
rgw: remove invalid read size4

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-01-07 17:08:58 -08:00
optimistyzy
201d4fc606 NVMEDevice: Eliminate virt to physical address translation in data_buf_next_sge
After SPDK is updated, SPDK requires virtual address
instead of physical address in huge page memory. Thus,
we do not need to pass the physical address since SPDK
library will do the address translation work.If we
still use the original code, it seems a bug.

In this patch, we will also use spdk_zmalloc instead of
dpdk's rte_malloc_socket function.

Signed-off-by: optimistyzy <optimistyzy@gmail.com>
2017-01-08 08:17:32 +08:00
Matt Benjamin
c0233c4abb rgw_rados: sanitize dout print in GWRados::get_obj_iterate_cb(...)
We cannot assume pbl may be deferenced.  Per review, move the dout
print into the r < 0 condition--since it's now an error, make it's
trace level 0.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-01-07 18:34:47 -05:00
Matt Benjamin
d10c37adf9 rgw_rados: add guard assert in add_io()
Use the iterator-returning insert operation in std::map, check
assert the insert case.  As a side effect, this makes use of the
inserted object record more clear.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-01-07 18:22:33 -05:00
Jason Dillaman
a159f3d1c0 Merge pull request #12549 from trociny/wip-16555
librbd: permit removal of image being bootstrapped by rbd-mirror

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-01-06 17:57:53 -05:00
Jason Dillaman
21a8c69313 Merge pull request #12638 from yangdongsheng/rbd_remove_incompatible
librbd: don't continue to remove an image w/ incompatible features

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-01-06 17:56:53 -05:00
Dan Mick
54c2880152 Merge pull request #12787 from jamincollins/arch-linux
ceph-detect-init: adding Arch Linux support

Reviewed-by: Dan Mick <dmick@redhat.com>
2017-01-06 13:12:26 -08:00
Matt Benjamin
437a187c77 Merge pull request #11776 from ceph/wip-rgw-openssl-7
Wip rgw openssl 7
2017-01-06 12:08:38 -05:00
Kefu Chai
cad369754f Merge pull request #12096 from wjwithagen/wip-wjw-readme-20161121
README.FreeBSD: update current status

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-06 23:56:26 +08:00
Kefu Chai
0e0b7a0d58 Merge pull request #12628 from SUSE/wip-18309-alt
ceph_fuse: pid_file default to empty

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-06 23:28:49 +08:00
Kefu Chai
9b430a8a04 Merge pull request #12811 from wjwithagen/wip-wjw-rbd-udev-blkid
cmake: cleanup the use of udev and blkid in target_link_lib()

Reviewed-by: Kefu Chai <kefu@redhat.com>
2017-01-06 22:26:39 +08:00
John Spray
9114d60d23 Merge pull request #12478 from renhwztetecs/renhw-wip-client-lookup_parent
client: don't request lookup parent if ino is root

Reviewed-by: John Spray <john.spray@redhat.com>
2017-01-06 13:19:15 +00:00
John Spray
a7b0b1f37d Merge pull request #12276 from kylinstorage/wip-cleanup-makeshared
cleanup: use std::make_shared to replace new

Reviewed-by: John Spray <john.spray@redhat.com>
2017-01-06 13:11:03 +00:00
Nathan Cutler
53ec76c7d0 tests: add no_client_pidfile override to fs/recovery tests
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-01-06 12:06:25 +01:00
Nathan Cutler
fe13664c8e tests: override yaml to set client pid file to empty string
Due to http://tracker.ceph.com/issues/18309 the pid file for fuse clients
should always be set to the empty string. (Teuthology's default ceph.conf
sets it to /var/run/ceph/$cluster-$name.pid)

This commit adds a reusable yaml facet for this purpose.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-01-06 12:05:31 +01:00
Willem Jan Withagen
b38aa145b2 Cmake: cleanup the use of udev and blkid in target_link_lib()
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-01-06 11:40:31 +01:00
Haomai Wang
95bc52abce Merge pull request #12780 from optimistyzy/201714_1
NVMEDevice: optimize sector_size usage

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Pan Liu <pan.liu@istuary.com>
2017-01-06 11:21:32 +08:00
Haomai Wang
836c5686b5 Merge pull request #12776 from optimistyzy/201714
cmake: remove Findpciaccess.cmake

Reviewed-by: Kefu Chai <kefu@redhat.com>
Reviewed-by: Pan Liu <pan.liu@istuary.com>
2017-01-06 11:20:27 +08:00
Josh Durgin
86f0ddb6c5 Merge pull request #12806 from yuriw/wip-fix-distro-master
qa: Using centos 7.2 for `latest` version

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-01-05 16:53:09 -08:00
Yuri Weinstein
6c00a64e87 Using centos 7.2 as latest version
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2017-01-06 00:26:13 +00:00
Josh Durgin
aa644c4ce2 Merge pull request #12804 from yuriw/wip-fix-distro-master
qa: Cleaned up distros to use `latest` versions

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-01-05 14:31:38 -08:00
Yuri Weinstein
b29faef354 qa: Cleaned up distros to use latest versions
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2017-01-05 13:38:04 -08:00
Nathan Cutler
dd0c4a5685 fuse: remove dead code after usage() call
usage() calls generic_client_usage(), which calls exit(-1), which never
returns.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-01-05 21:26:46 +01:00
Nathan Cutler
2258f2f166 ceph_fuse: pid_file default to empty
Fixes: http://tracker.ceph.com/issues/18309
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-01-05 21:26:46 +01:00
Samuel Just
9d5fb726c6 Merge pull request #12788 from athanatos/wip-oi-mismatch
PrimaryLogPG: don't update digests for objects with mismatched names

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-01-05 12:13:54 -08:00
Jason Dillaman
9ad8fec43f Merge pull request #12413 from ovh/wip-support-hammer-in-rbd_recover_tool
tools: support hammer in rbd_recover_tool

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-01-05 10:27:41 -05:00
Mykola Golub
18567fb9f9 Merge pull request #12050 from dillaman/wip-16180
librados: asynchronous selfmanaged_snap_create/selfmanaged_snap_remove APIs

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-01-05 17:18:11 +02:00
Kefu Chai
d58dcba22f Merge pull request #12763 from wjwithagen/wip-wjw-freebsd-boostpython
CMakeLists.txt: boost_python.so requires libpython.*.so on FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-05 22:21:59 +08:00
Kefu Chai
053d40fc17 Merge pull request #12562 from majianpeng/rockdb-option
rocksdb: add option: writable_file_max_buffer_size = 0

Reviewed-by: Sage Weil <sage@redhat.com>
2017-01-05 22:12:57 +08:00
Loic Dachary
23e6de2b7d Merge pull request #12760 from tchaikov/wip-18371
ceph-disk: convert none str to str before printing it

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-01-05 15:08:49 +01:00
Kefu Chai
0d5780c93d Merge pull request #12728 from Liuchang0812/fix-17861
osd: add asock command to dump the scrub queue

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-05 22:07:31 +08:00
Kefu Chai
14d8d5d10f Merge pull request #12775 from xiexingguo/xxg-wip-shutup-warning
common: get rid of "warning: ignoring return value of ‘strerror_r’"

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-05 21:59:30 +08:00
Kefu Chai
752ef9bfde Merge pull request #12769 from bachp/cmake-keyutils
cmake: search for Keyutils in default paths

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-05 20:49:46 +08:00
Kefu Chai
9681c49905 Merge pull request #12785 from wjwithagen/wip-wjw-cmake-parse_secret_objs
src/CMakeLists.txt: Move parse_secret_objs setting within definition block

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-05 20:43:34 +08:00
Bartłomiej Święcki
1380a39018 tools: Support hammer in rbd_recover_tool
Signed-off-by: Bartłomiej Święcki <bartlomiej.swiecki@corp.ovh.com>
2017-01-05 10:24:16 +00:00
optimistyzy
dfd212a014 NVMEDevice: optimize sector_size usage
spdk_nvme_ns_get_sector_size returns 32 bit size,
so we just use 32 bit size for sector_size.

Signed-off-by: optimistyzy <optimistyzy@gmail.com>
2017-01-05 11:37:15 +08:00
Xie Xingguo
71fa695edd Merge pull request #12772 from hjwsm1989/mempool
include/mempool: fix typo in comments

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-01-05 08:30:12 +08:00
Samuel Just
5ead0588e8 Merge pull request #12779 from badone/wip-check_new_interval-comment
osd/osd_types: Move comment to more relevant position

Reviewed-by: Samuel Just <sjust@redhat.com>
2017-01-04 14:03:19 -08:00
Yuri Weinstein
dd51d2e09b Merge pull request #12610 from tmuthamizhan/wip-ansible-suite
qa/suite: Added a smoke suite for ceph-ansible

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
2017-01-04 12:51:51 -08:00
Willem Jan Withagen
4db092cee0 CMakeLists.txt/FreeBSD: Boost_python needs explicit linking with libpython*.so
- Otherwise losts of unresolved errors will result.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-01-04 21:50:22 +01:00
Nathan Cutler
cc4551485a Merge pull request #12181 from SUSE/wip-18037
osd: improve error message when FileStore op fails due to EPERM

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-01-04 19:06:25 +01:00
Jamin W. Collins
4405e4906e Adding Arch Linux support
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2017-01-04 09:36:50 -08:00
Kefu Chai
5e0dd1e7df ceph-disk: convert none str to str before printing it
Error('somethings goes wrong', e) is thrown if exception `e` is caught
in ceph-disk, where e is not a string. so we can not just concat it in
Error's __str__(). so cast it to str before doing so.

introduced by d0e29c7

Fixes: http://tracker.ceph.com/issues/18371
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-01-05 00:12:55 +08:00
Jason Dillaman
cc6b6fbb58 Merge pull request #12697 from kylinstorage/wip-rbd-bench
rbd: additional validation for 'bench' optional parameters

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-01-04 10:58:59 -05:00
Jason Dillaman
92a54190c2 Merge pull request #12319 from gaurav36/bug-18125-rbd-mirror-enable-disable
librbd: warning message for mirroring pool option

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-01-04 10:21:50 -05:00
Kefu Chai
28622f88ae Merge pull request #12191 from wjwithagen/wip-wjw-freebsd-radosgw-admin
rgw_file: radosgw-admin can be built under FreeBSD

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-01-04 23:09:06 +08:00
Haomai Wang
0940e7e1a2 Merge pull request #12737 from amirv/refactor
Move code from .h into .cc

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-01-04 23:07:24 +08:00
Willem Jan Withagen
cabc409bf5 src/CMakeLists.txt: Move parse_secret_objs setting within definition block
- parse_secret_objs is only used when secret.c is actually used
   and that is with CEPHFS or RBD

This removes a Cmake warning on FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-01-04 13:29:45 +01:00
Pascal Bach
c79bf93d02 cmake: search for Keyutils in default paths and cleanup
This makes it more portable

Remove /usr/include as it is searched by find_path anyway.
Remove unnecessary include that weren't used.


Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch>
2017-01-04 12:47:17 +01:00