]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoqa/tasks: add test_open_ino_errors 12749/head
Yan, Zheng [Wed, 11 Jan 2017 07:50:52 +0000 (15:50 +0800)]
qa/tasks: add test_open_ino_errors

Validate that errors encountered during opening inos are properly
propagated

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: propagate error encountered during opening inode by number
Yan, Zheng [Tue, 3 Jan 2017 03:11:12 +0000 (11:11 +0800)]
mds: propagate error encountered during opening inode by number

Fixes: http://tracker.ceph.com/issues/18179
Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #12849 from xiexingguo/xxg-wip-fix-compile-crash
Jason Dillaman [Tue, 10 Jan 2017 02:45:41 +0000 (21:45 -0500)]
Merge pull request #12849 from xiexingguo/xxg-wip-fix-compile-crash

librados: fix compile errors from simplified aio completions

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #9032 from tchaikov/wip-15786
Kefu Chai [Tue, 10 Jan 2017 02:23:39 +0000 (10:23 +0800)]
Merge pull request #9032 from tchaikov/wip-15786

doc: document repair/scrub features

Reviewed-by: David Zafman <dzafman@redhat.com>
8 years agolibrados: fix building crash 12849/head
xie xingguo [Tue, 10 Jan 2017 02:01:54 +0000 (10:01 +0800)]
librados: fix building crash

See https://github.com/ceph/ceph/pull/12607

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #12726 from liewegas/wip-18372
Sage Weil [Mon, 9 Jan 2017 22:24:22 +0000 (16:24 -0600)]
Merge pull request #12726 from liewegas/wip-18372

osd: _exit() intead of exit() for failure injection

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12607 from liewegas/wip-librados-killack
Sage Weil [Mon, 9 Jan 2017 22:17:43 +0000 (16:17 -0600)]
Merge pull request #12607 from liewegas/wip-librados-killack

librados,osdc: kill ack vs commit distinction

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #12695 from hjwsm1989/mark-unfound-lost
Sage Weil [Mon, 9 Jan 2017 22:17:07 +0000 (16:17 -0600)]
Merge pull request #12695 from hjwsm1989/mark-unfound-lost

osd/PrimaryLogPG: optimal pick_newest_available

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12724 from kylinstorage/wip-fix-coverity-warning-for-uninitialize...
Sage Weil [Mon, 9 Jan 2017 22:14:52 +0000 (16:14 -0600)]
Merge pull request #12724 from kylinstorage/wip-fix-coverity-warning-for-uninitialized-members

osd: fix coverity warning for uninitialized members

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12725 from liewegas/wip-bluestore-bluefs-reclaim
Sage Weil [Mon, 9 Jan 2017 22:07:15 +0000 (16:07 -0600)]
Merge pull request #12725 from liewegas/wip-bluestore-bluefs-reclaim

os/bluestore/BlueFS: fix reclaim_blocks

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
8 years agoMerge pull request #12727 from liewegas/wip-18369
Sage Weil [Mon, 9 Jan 2017 22:05:30 +0000 (16:05 -0600)]
Merge pull request #12727 from liewegas/wip-18369

osd/PG: publish PG stats when backfill-related states change

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12731 from oritwas/wip-rgw-realm-set
Casey Bodley [Mon, 9 Jan 2017 15:54:15 +0000 (10:54 -0500)]
Merge pull request #12731 from oritwas/wip-rgw-realm-set

rgw realm set fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #12274 from ukernel/wip-multimds-misc
John Spray [Mon, 9 Jan 2017 13:05:51 +0000 (13:05 +0000)]
Merge pull request #12274 from ukernel/wip-multimds-misc

mds: misc multimds fixes

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #12588 from jcsp/wip-18311
John Spray [Mon, 9 Jan 2017 11:02:32 +0000 (11:02 +0000)]
Merge pull request #12588 from jcsp/wip-18311

mds: check for errors decoding backtraces

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #12580 from Liuchang0812/fix-clang-warn-client
John Spray [Mon, 9 Jan 2017 11:02:02 +0000 (11:02 +0000)]
Merge pull request #12580 from Liuchang0812/fix-clang-warn-client

client: fix clang warn of "argument is an uninitialized value"

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12557 from stiopaa1/libcephfs_memoryLeakCephContext
John Spray [Mon, 9 Jan 2017 10:36:39 +0000 (10:36 +0000)]
Merge pull request #12557 from stiopaa1/libcephfs_memoryLeakCephContext

libcephfs.cc: fix memory leak

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12161 from jcsp/wip-remove-cap
John Spray [Mon, 9 Jan 2017 10:30:27 +0000 (10:30 +0000)]
Merge pull request #12161 from jcsp/wip-remove-cap

client: simplify remove_cap interface

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #12515 from kylinstorage/wip-safe-trace
John Spray [Mon, 9 Jan 2017 10:29:47 +0000 (10:29 +0000)]
Merge pull request #12515 from kylinstorage/wip-safe-trace

client: fix potential buffer overflow

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12560 from wjwithagen/wip-wjw-rocksdb-NO-FAIL
Kefu Chai [Mon, 9 Jan 2017 10:16:29 +0000 (18:16 +0800)]
Merge pull request #12560 from wjwithagen/wip-wjw-rocksdb-NO-FAIL

src/CMakeLists.txt: disable -Werror on rocksdb

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12799 from tchaikov/wip-sepia-bt
Kefu Chai [Mon, 9 Jan 2017 02:59:47 +0000 (10:59 +0800)]
Merge pull request #12799 from tchaikov/wip-sepia-bt

script/sepia_bt.sh: download packages from shaman not gitbuilder

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #12816 from SUSE/wip-18440
Jason Dillaman [Sun, 8 Jan 2017 14:57:36 +0000 (09:57 -0500)]
Merge pull request #12816 from SUSE/wip-18440

tests: subst repo and branch in git.ceph.com URL in qa/tasks/cram.py and qa/tasks/qemu.py

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12818 from SUSE/wip-drop-rbd_functional_tests
Jason Dillaman [Sun, 8 Jan 2017 14:56:59 +0000 (09:56 -0500)]
Merge pull request #12818 from SUSE/wip-drop-rbd_functional_tests

tests: drop unused rbd_functional_tests.pl script

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12639 from dillaman/wip-18327
Mykola Golub [Sun, 8 Jan 2017 12:23:12 +0000 (14:23 +0200)]
Merge pull request #12639 from dillaman/wip-18327

librbd: new API method to force break a peer's exclusive lock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoradosgw-admin: check for name mistmatch in realm set 12731/head
Orit Wasserman [Sun, 1 Jan 2017 10:56:44 +0000 (12:56 +0200)]
radosgw-admin: check for name mistmatch in realm set

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
8 years agoradosgw-admin: relam set can use input redirection
Orit Wasserman [Sun, 1 Jan 2017 10:40:37 +0000 (12:40 +0200)]
radosgw-admin: relam set can use input redirection

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
8 years agoradosgw-admin: realm set should create a new realm
Orit Wasserman [Sun, 1 Jan 2017 10:36:04 +0000 (12:36 +0200)]
radosgw-admin: realm set should create a new realm

Fixes: http://tracker.ceph.com/issues/18333
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #12812 from optimistyzy/16_0
Haomai Wang [Sun, 8 Jan 2017 05:17:37 +0000 (13:17 +0800)]
Merge pull request #12812 from optimistyzy/16_0

NVMEDevice: fix bug in data_buf_next_sge

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12767 from linuxbox2/rgw-invalid-aio-read4
Yehuda Sadeh [Sun, 8 Jan 2017 01:08:58 +0000 (17:08 -0800)]
Merge pull request #12767 from linuxbox2/rgw-invalid-aio-read4

rgw: remove invalid read size4

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoNVMEDevice: Eliminate virt to physical address translation in data_buf_next_sge 12812/head
optimistyzy [Fri, 6 Jan 2017 12:16:00 +0000 (20:16 +0800)]
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>
8 years agorgw_rados: sanitize dout print in GWRados::get_obj_iterate_cb(...) 12767/head
Matt Benjamin [Fri, 6 Jan 2017 20:16:32 +0000 (15:16 -0500)]
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>
8 years agorgw_rados: add guard assert in add_io()
Matt Benjamin [Fri, 6 Jan 2017 17:30:42 +0000 (12:30 -0500)]
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>
8 years agotests: drop unused rbd_functional_tests.pl script 12818/head
Nathan Cutler [Sat, 7 Jan 2017 22:33:12 +0000 (23:33 +0100)]
tests: drop unused rbd_functional_tests.pl script

This script is no longer used.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotests: subst repo and branch in qemu test urls 12816/head
Nathan Cutler [Sat, 7 Jan 2017 12:48:51 +0000 (13:48 +0100)]
tests: subst repo and branch in qemu test urls

References: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotests: subst branch and repo in qa/tasks/qemu.py
Nathan Cutler [Sat, 7 Jan 2017 12:45:10 +0000 (13:45 +0100)]
tests: subst branch and repo in qa/tasks/qemu.py

References: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotests: subst repo name in krbd/unmap/tasks/unmap.yaml
Nathan Cutler [Fri, 6 Jan 2017 20:09:23 +0000 (21:09 +0100)]
tests: subst repo name in krbd/unmap/tasks/unmap.yaml

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotests: subst repo name in qa/tasks/cram.py
Nathan Cutler [Fri, 6 Jan 2017 20:06:11 +0000 (21:06 +0100)]
tests: subst repo name in qa/tasks/cram.py

Inspired by bcbe45d948f1c4da02e27b3be5f29a8b52745e28

Fixes: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #12549 from trociny/wip-16555
Jason Dillaman [Fri, 6 Jan 2017 22:57:53 +0000 (17:57 -0500)]
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>
8 years agoMerge pull request #12638 from yangdongsheng/rbd_remove_incompatible
Jason Dillaman [Fri, 6 Jan 2017 22:56:53 +0000 (17:56 -0500)]
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>
8 years agoMerge pull request #12787 from jamincollins/arch-linux
Dan Mick [Fri, 6 Jan 2017 21:12:26 +0000 (13:12 -0800)]
Merge pull request #12787 from jamincollins/arch-linux

ceph-detect-init: adding Arch Linux support

Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agoMerge pull request #11776 from ceph/wip-rgw-openssl-7
Matt Benjamin [Fri, 6 Jan 2017 17:08:38 +0000 (12:08 -0500)]
Merge pull request #11776 from ceph/wip-rgw-openssl-7

Wip rgw openssl 7

8 years agolibrados: blacklist_add should wait for latest OSD map 12639/head
Jason Dillaman [Fri, 6 Jan 2017 16:17:10 +0000 (11:17 -0500)]
librados: blacklist_add should wait for latest OSD map

This ensures that future operations against the OSDs force
a OSD map update to notice the blacklisted client.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: prevent assertion failure when journal IO is blacklisted
Jason Dillaman [Thu, 5 Jan 2017 18:31:57 +0000 (13:31 -0500)]
librbd: prevent assertion failure when journal IO is blacklisted

Fixes: http://tracker.ceph.com/issues/18429
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: ignore blacklist error when releasing exclusive lock
Jason Dillaman [Wed, 4 Jan 2017 17:12:27 +0000 (12:12 -0500)]
librbd: ignore blacklist error when releasing exclusive lock

This ensures the journal and object map are properly closed so that the
image can be properly closed w/o failing any assertions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: fail immediately if the exclusive lock cannot be acquired
Jason Dillaman [Tue, 3 Jan 2017 20:29:17 +0000 (15:29 -0500)]
librbd: fail immediately if the exclusive lock cannot be acquired

Fixes: http://tracker.ceph.com/issues/16988
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: add new lock_get_owners / lock_break_lock API methods
Jason Dillaman [Tue, 3 Jan 2017 19:51:14 +0000 (14:51 -0500)]
librbd: add new lock_get_owners / lock_break_lock API methods

If the client application supports failover, let the application
force break the current lock and blacklist the owner. This is
required in case the current lock owner is alive from the point-of-view
of librbd but failover was required due to a higher level reason.

Fixes: http://tracker.ceph.com/issues/18327
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12096 from wjwithagen/wip-wjw-readme-20161121
Kefu Chai [Fri, 6 Jan 2017 15:56:26 +0000 (23:56 +0800)]
Merge pull request #12096 from wjwithagen/wip-wjw-readme-20161121

README.FreeBSD: update current status

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12628 from SUSE/wip-18309-alt
Kefu Chai [Fri, 6 Jan 2017 15:28:49 +0000 (23:28 +0800)]
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>
8 years agolibrbd: separate break lock logic into standalone state machine
Jason Dillaman [Thu, 22 Dec 2016 20:00:23 +0000 (15:00 -0500)]
librbd: separate break lock logic into standalone state machine

The current lockers are now queried before the lock is attempted to
prevent any possible race conditions when one or more clients attempt
to break the lock of a dead client.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: separate locker query into standalone state machine
Jason Dillaman [Thu, 22 Dec 2016 22:24:47 +0000 (17:24 -0500)]
librbd: separate locker query into standalone state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12811 from wjwithagen/wip-wjw-rbd-udev-blkid
Kefu Chai [Fri, 6 Jan 2017 14:26:39 +0000 (22:26 +0800)]
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>
8 years agoMerge pull request #12478 from renhwztetecs/renhw-wip-client-lookup_parent
John Spray [Fri, 6 Jan 2017 13:19:15 +0000 (13:19 +0000)]
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>
8 years agoMerge pull request #12276 from kylinstorage/wip-cleanup-makeshared
John Spray [Fri, 6 Jan 2017 13:11:03 +0000 (13:11 +0000)]
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>
8 years agotests: add no_client_pidfile override to fs/recovery tests 12628/head
Nathan Cutler [Thu, 5 Jan 2017 20:29:09 +0000 (21:29 +0100)]
tests: add no_client_pidfile override to fs/recovery tests

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotests: override yaml to set client pid file to empty string
Nathan Cutler [Thu, 5 Jan 2017 20:22:58 +0000 (21:22 +0100)]
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>
8 years agoCmake: cleanup the use of udev and blkid in target_link_lib() 12811/head
Willem Jan Withagen [Fri, 6 Jan 2017 10:05:55 +0000 (11:05 +0100)]
Cmake: cleanup the use of udev and blkid in target_link_lib()

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agodoc: update troubleshooting-pg with scrub/repair feature 9032/head
Kefu Chai [Tue, 10 May 2016 09:48:27 +0000 (17:48 +0800)]
doc: update troubleshooting-pg with scrub/repair feature

update rados/troubleshooting/troubleshooting-pg.rst with the
scrub/repair feature

Fixes: http://tracker.ceph.com/issues/15786
Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: update rados.8 with list-inconsistent-* commands
Kefu Chai [Tue, 10 May 2016 08:11:36 +0000 (16:11 +0800)]
doc: update rados.8 with list-inconsistent-* commands

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12780 from optimistyzy/201714_1
Haomai Wang [Fri, 6 Jan 2017 03:21:32 +0000 (11:21 +0800)]
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>
8 years agoMerge pull request #12776 from optimistyzy/201714
Haomai Wang [Fri, 6 Jan 2017 03:20:27 +0000 (11:20 +0800)]
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>
8 years agoMerge pull request #12806 from yuriw/wip-fix-distro-master
Josh Durgin [Fri, 6 Jan 2017 00:53:09 +0000 (16:53 -0800)]
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>
8 years agoUsing centos 7.2 as latest version 12806/head
Yuri Weinstein [Thu, 5 Jan 2017 23:42:07 +0000 (23:42 +0000)]
Using centos 7.2 as latest version

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
8 years agoMerge pull request #12804 from yuriw/wip-fix-distro-master
Josh Durgin [Thu, 5 Jan 2017 22:31:38 +0000 (14:31 -0800)]
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>
8 years agoqa: Cleaned up distros to use `latest` versions 12804/head
Yuri Weinstein [Thu, 5 Jan 2017 21:28:39 +0000 (13:28 -0800)]
qa: Cleaned up distros to use `latest` versions

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
8 years agofuse: remove dead code after usage() call
Nathan Cutler [Thu, 22 Dec 2016 21:15:32 +0000 (22:15 +0100)]
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>
8 years agoceph_fuse: pid_file default to empty
Nathan Cutler [Thu, 22 Dec 2016 17:21:18 +0000 (18:21 +0100)]
ceph_fuse: pid_file default to empty

Fixes: http://tracker.ceph.com/issues/18309
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #12788 from athanatos/wip-oi-mismatch
Samuel Just [Thu, 5 Jan 2017 20:13:54 +0000 (12:13 -0800)]
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>
8 years agoMerge pull request #12413 from ovh/wip-support-hammer-in-rbd_recover_tool
Jason Dillaman [Thu, 5 Jan 2017 15:27:41 +0000 (10:27 -0500)]
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>
8 years agoMerge pull request #12050 from dillaman/wip-16180
Mykola Golub [Thu, 5 Jan 2017 15:18:11 +0000 (17:18 +0200)]
Merge pull request #12050 from dillaman/wip-16180

librados: asynchronous selfmanaged_snap_create/selfmanaged_snap_remove APIs

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #12763 from wjwithagen/wip-wjw-freebsd-boostpython
Kefu Chai [Thu, 5 Jan 2017 14:21:59 +0000 (22:21 +0800)]
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>
8 years agoMerge pull request #12562 from majianpeng/rockdb-option
Kefu Chai [Thu, 5 Jan 2017 14:12:57 +0000 (22:12 +0800)]
Merge pull request #12562 from majianpeng/rockdb-option

rocksdb: add option: writable_file_max_buffer_size = 0

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12760 from tchaikov/wip-18371
Loic Dachary [Thu, 5 Jan 2017 14:08:49 +0000 (15:08 +0100)]
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>
8 years agoMerge pull request #12728 from Liuchang0812/fix-17861
Kefu Chai [Thu, 5 Jan 2017 14:07:31 +0000 (22:07 +0800)]
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>
8 years agoMerge pull request #12775 from xiexingguo/xxg-wip-shutup-warning
Kefu Chai [Thu, 5 Jan 2017 13:59:30 +0000 (21:59 +0800)]
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>
8 years agoqa/tasks: add test_corrupt_backtrace 12588/head
John Spray [Thu, 5 Jan 2017 13:40:41 +0000 (13:40 +0000)]
qa/tasks: add test_corrupt_backtrace

Validate that we get EIO and a damage table entry
when seeing a decode error on a backtrace.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: check for errors decoding backtraces
John Spray [Tue, 20 Dec 2016 18:04:47 +0000 (18:04 +0000)]
mds: check for errors decoding backtraces

Fixes: http://tracker.ceph.com/issues/18311
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #12769 from bachp/cmake-keyutils
Kefu Chai [Thu, 5 Jan 2017 12:49:46 +0000 (20:49 +0800)]
Merge pull request #12769 from bachp/cmake-keyutils

cmake: search for Keyutils in default paths

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12785 from wjwithagen/wip-wjw-cmake-parse_secret_objs
Kefu Chai [Thu, 5 Jan 2017 12:43:34 +0000 (20:43 +0800)]
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>
8 years agoscript/sepia_bt.sh: download packages from shaman not gitbuilder 12799/head
Kefu Chai [Thu, 5 Jan 2017 12:20:12 +0000 (20:20 +0800)]
script/sepia_bt.sh: download packages from shaman not gitbuilder

also download ceph-test packages if we are debugging ceph_test_*.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agotools: Support hammer in rbd_recover_tool 12413/head
Bartłomiej Święcki [Wed, 5 Oct 2016 14:33:01 +0000 (14:33 +0000)]
tools: Support hammer in rbd_recover_tool

Signed-off-by: Bartłomiej Święcki <bartlomiej.swiecki@corp.ovh.com>
8 years agoNVMEDevice: optimize sector_size usage 12780/head
optimistyzy [Wed, 4 Jan 2017 06:15:01 +0000 (14:15 +0800)]
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>
8 years agoMerge pull request #12772 from hjwsm1989/mempool
Xie Xingguo [Thu, 5 Jan 2017 00:30:12 +0000 (08:30 +0800)]
Merge pull request #12772 from hjwsm1989/mempool

  include/mempool: fix typo in comments

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #12779 from badone/wip-check_new_interval-comment
Samuel Just [Wed, 4 Jan 2017 22:03:19 +0000 (14:03 -0800)]
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>
8 years agoMerge pull request #12610 from tmuthamizhan/wip-ansible-suite
Yuri Weinstein [Wed, 4 Jan 2017 20:51:51 +0000 (12:51 -0800)]
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>
8 years agoCMakeLists.txt/FreeBSD: Boost_python needs explicit linking with libpython*.so 12763/head
Willem Jan Withagen [Tue, 3 Jan 2017 14:08:25 +0000 (15:08 +0100)]
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>
8 years agoMerge pull request #12181 from SUSE/wip-18037
Nathan Cutler [Wed, 4 Jan 2017 18:06:25 +0000 (19:06 +0100)]
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>
8 years agoAdding Arch Linux support 12787/head
Jamin W. Collins [Wed, 4 Jan 2017 15:15:59 +0000 (07:15 -0800)]
Adding Arch Linux support

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
8 years agoceph-disk: convert none str to str before printing it 12760/head
Kefu Chai [Tue, 3 Jan 2017 12:40:00 +0000 (20:40 +0800)]
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>
8 years agoMerge pull request #12697 from kylinstorage/wip-rbd-bench
Jason Dillaman [Wed, 4 Jan 2017 15:58:59 +0000 (10:58 -0500)]
Merge pull request #12697 from kylinstorage/wip-rbd-bench

rbd: additional validation for 'bench' optional parameters

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12319 from gaurav36/bug-18125-rbd-mirror-enable-disable
Jason Dillaman [Wed, 4 Jan 2017 15:21:50 +0000 (10:21 -0500)]
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>
8 years agoMerge pull request #12191 from wjwithagen/wip-wjw-freebsd-radosgw-admin
Kefu Chai [Wed, 4 Jan 2017 15:09:06 +0000 (23:09 +0800)]
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>
8 years agoMerge pull request #12737 from amirv/refactor
Haomai Wang [Wed, 4 Jan 2017 15:07:24 +0000 (23:07 +0800)]
Merge pull request #12737 from amirv/refactor

Move code from .h into .cc

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agosrc/CMakeLists.txt: Move parse_secret_objs setting within definition block 12785/head
Willem Jan Withagen [Wed, 4 Jan 2017 12:29:45 +0000 (13:29 +0100)]
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>
8 years agocmake: search for Keyutils in default paths and cleanup 12769/head
Pascal Bach [Sun, 1 Jan 2017 22:38:59 +0000 (23:38 +0100)]
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>
8 years agoMerge pull request #12705 from badone/wip-ceph_test_rados_api_tier-valgrind-fixes
Kefu Chai [Wed, 4 Jan 2017 10:08:46 +0000 (18:08 +0800)]
Merge pull request #12705 from badone/wip-ceph_test_rados_api_tier-valgrind-fixes

test/librados/tier.cc: Fix valgrind errors

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agorbd: warning message for mirroring pool option 12319/head
Gaurav Kumar Garg [Mon, 5 Dec 2016 14:09:55 +0000 (15:09 +0100)]
rbd: warning message for mirroring pool option

When user enable/disable mirroring option on a pool, than
re-enabling/disabling mirroring option should give warning
message if it is already enable/disable.
It should also give warning when changing the mode from pool
to image or vice versa.

Fixes: http://tracker.ceph.com/issues/18125
Reported-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
8 years agoMerge pull request #12544 from hjwsm1989/oc
Kefu Chai [Wed, 4 Jan 2017 10:06:13 +0000 (18:06 +0800)]
Merge pull request #12544 from hjwsm1989/oc

osdc/ObjectCacher: use state instead of get_state()

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #8942 from majianpeng/Finisher-optimize
Kefu Chai [Wed, 4 Jan 2017 10:05:11 +0000 (18:05 +0800)]
Merge pull request #8942 from majianpeng/Finisher-optimize

common/Finisher: Using queue(list<context*>) instead queue(context*).

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #9760 from stiopaa1/msg_messengercc_move
Kefu Chai [Wed, 4 Jan 2017 10:02:47 +0000 (18:02 +0800)]
Merge pull request #9760 from stiopaa1/msg_messengercc_move

msg/Messenger.cc: add std::move

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12732 from Liuchang0812/wip-issue-17449
Kefu Chai [Wed, 4 Jan 2017 09:57:34 +0000 (17:57 +0800)]
Merge pull request #12732 from Liuchang0812/wip-issue-17449

mgr: Make stats period configurable

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoosd: add asock command to dump the scrub queue 12728/head
liuchang0812 [Sun, 1 Jan 2017 04:47:03 +0000 (12:47 +0800)]
osd: add asock command to dump the scrub queue

* add a public method to dumps scrubs
* register new command "dump_scrubs" to asock_admin

Fixes: http://tracker.ceph.com/issues/17861
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>