]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years ago[MON] Fixed calculation of %USED. Now it is shows (space used by all replicas)/(raw... 7881/head
Adam Kupczyk [Wed, 2 Mar 2016 11:31:01 +0000 (12:31 +0100)]
[MON] Fixed calculation of %USED. Now it is shows (space used by all replicas)/(raw space available on OSDs). Before it was (size of pool)/(raw space available on OSDs).

Signed-off-by: Adam Kupczyk akupczyk@mirantis.com
9 years agoMerge pull request #7854 from yehudasa/wip-authors-update
Kefu Chai [Wed, 2 Mar 2016 02:18:25 +0000 (10:18 +0800)]
Merge pull request #7854 from yehudasa/wip-authors-update

AUTHORS: update email

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7846 from dillaman/wip-14551
Josh Durgin [Wed, 2 Mar 2016 01:18:04 +0000 (17:18 -0800)]
Merge pull request #7846 from dillaman/wip-14551

rbd: update default image features

Conflicts:
PendingReleaseNotes (trivial)

9 years agoMerge pull request #7841 from dillaman/wip-14550
Josh Durgin [Wed, 2 Mar 2016 01:18:18 +0000 (17:18 -0800)]
Merge pull request #7841 from dillaman/wip-14550

rbd: deprecate image format 1

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7839 from dillaman/wip-14809
Josh Durgin [Wed, 2 Mar 2016 01:18:05 +0000 (17:18 -0800)]
Merge pull request #7839 from dillaman/wip-14809

librbd: remove last synchronous librados calls from open/close state machine

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7785 from dillaman/wip-14822
Josh Durgin [Wed, 2 Mar 2016 01:17:50 +0000 (17:17 -0800)]
Merge pull request #7785 from dillaman/wip-14822

librbd: journal replay needs to support re-executing maintenance ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7776 from dillaman/wip-librbd-journal-tweaks
Josh Durgin [Wed, 2 Mar 2016 01:17:31 +0000 (17:17 -0800)]
Merge pull request #7776 from dillaman/wip-librbd-journal-tweaks

journal: improve commit position tracking

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoAUTHORS: update email 7854/head
Yehuda Sadeh [Tue, 1 Mar 2016 04:13:11 +0000 (20:13 -0800)]
AUTHORS: update email

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7767 from athanatos/wip-sam-journal-throttle-4
Samuel Just [Tue, 1 Mar 2016 20:51:15 +0000 (12:51 -0800)]
Merge pull request #7767 from athanatos/wip-sam-journal-throttle-4

osd: filestore: restructure journal and op queue throttling

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7837 from rldleblanc/wpq-documentation
Sage Weil [Tue, 1 Mar 2016 14:27:21 +0000 (09:27 -0500)]
Merge pull request #7837 from rldleblanc/wpq-documentation

doc: osd-config Add Configuration Options for op queue.

9 years agoMerge pull request #7851 from jupiturliu/obj-bencher-bug
Sage Weil [Tue, 1 Mar 2016 14:25:51 +0000 (09:25 -0500)]
Merge pull request #7851 from jupiturliu/obj-bencher-bug

rados: fix bug for write bench

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7729 from yuyuyu101/wip-spdk2
Sage Weil [Tue, 1 Mar 2016 14:18:15 +0000 (09:18 -0500)]
Merge pull request #7729 from yuyuyu101/wip-spdk2

osd: bluestore: Revert NVMEDevice task cstor and refresh interface changes

9 years agoMerge pull request #7739 from xiexingguo/xxg-wip-14387
Sage Weil [Tue, 1 Mar 2016 13:46:08 +0000 (08:46 -0500)]
Merge pull request #7739 from xiexingguo/xxg-wip-14387

osd: fix race condition for heartbeat_need_update

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7703 from xiexingguo/xxg-wip-statfs
Sage Weil [Tue, 1 Mar 2016 13:45:39 +0000 (08:45 -0500)]
Merge pull request #7703 from xiexingguo/xxg-wip-statfs

osd: filestore: fast abort if statfs encounters ENOENT

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7766 from adamemerson/wip-portable-mutex
Sage Weil [Tue, 1 Mar 2016 13:45:00 +0000 (08:45 -0500)]
Merge pull request #7766 from adamemerson/wip-portable-mutex

common: Do not use non-portable constants in mutex_debug

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #7799 from xiexingguo/xxg-wip-fixnvme
Sage Weil [Tue, 1 Mar 2016 13:44:21 +0000 (08:44 -0500)]
Merge pull request #7799 from xiexingguo/xxg-wip-fixnvme

osd: bluestore: NVMEDevice: fix error handling

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7804 from jjhuo/fixes
Sage Weil [Tue, 1 Mar 2016 13:43:49 +0000 (08:43 -0500)]
Merge pull request #7804 from jjhuo/fixes

osd: kstore: fix a race condition in _txc_finish()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7816 from marcan/build-fixes
Sage Weil [Tue, 1 Mar 2016 13:43:25 +0000 (08:43 -0500)]
Merge pull request #7816 from marcan/build-fixes

configure.ac: boost_iostreams is required, not optional

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agolibrbd: use aio watch/unwatch during open/close state machines 7839/head
Jason Dillaman [Sun, 28 Feb 2016 20:22:09 +0000 (15:22 -0500)]
librbd: use aio watch/unwatch during open/close state machines

Removed the place holders in the open/close async state machines with
the newly added aio watch/unwatch methods.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados_test_stub: added aio_watch/aio_unwatch/aio_watch_flush
Jason Dillaman [Sun, 28 Feb 2016 20:21:36 +0000 (15:21 -0500)]
librados_test_stub: added aio_watch/aio_unwatch/aio_watch_flush

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: adjust rbd test case guards to handle new defaults 7846/head
Jason Dillaman [Tue, 1 Mar 2016 13:32:39 +0000 (08:32 -0500)]
test: adjust rbd test case guards to handle new defaults

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: use default RBD features in test cases
Jason Dillaman [Mon, 29 Feb 2016 18:17:02 +0000 (13:17 -0500)]
test: use default RBD features in test cases

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: permit deep-flatten to be dynamically disabled
Jason Dillaman [Mon, 29 Feb 2016 18:16:42 +0000 (13:16 -0500)]
librbd: permit deep-flatten to be dynamically disabled

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: update default image features
Jason Dillaman [Mon, 29 Feb 2016 16:31:55 +0000 (11:31 -0500)]
rbd: update default image features

Exclusive lock, object map, fast-diff, and deep-flatten have been
enabled by default for all new images.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: apply orphaned maintenance ops after journal replay 7785/head
Jason Dillaman [Wed, 24 Feb 2016 23:07:45 +0000 (18:07 -0500)]
librbd: apply orphaned maintenance ops after journal replay

If a client recorded a maintenance op to the journal but crashed
before writing the op finish event, the image will be in an
inconsistent state.  Therefore, once the end of the journal is
reached, attempt to apply all queued ops.

Fixes: #14822
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: only cancel replay of journal op events upon error
Jason Dillaman [Wed, 24 Feb 2016 22:00:13 +0000 (17:00 -0500)]
librbd: only cancel replay of journal op events upon error

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: delay commit of op start event
Jason Dillaman [Wed, 24 Feb 2016 21:35:58 +0000 (16:35 -0500)]
librbd: delay commit of op start event

If the start event is flagged as committed before the op is
actually executed, librbd won't be able to replay the event
should a crash occur.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: permit fire-and-forget aio commit position flush
Jason Dillaman [Wed, 24 Feb 2016 21:20:02 +0000 (16:20 -0500)]
journal: permit fire-and-forget aio commit position flush

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: support replay of maintenance ops
Jason Dillaman [Wed, 24 Feb 2016 20:51:08 +0000 (15:51 -0500)]
librbd: support replay of maintenance ops

Ignore errors that are to be expected when replaying
a maintenance op two or more times.

Fixes: #14822
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7858 from jdurgin/wip-rbd-formatted-output-progress
Loic Dachary [Tue, 1 Mar 2016 10:58:25 +0000 (17:58 +0700)]
Merge pull request #7858 from jdurgin/wip-rbd-formatted-output-progress

test/cli-integration/rbd: disable progress output

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7745 from sileht/sileht/rados-cython
John Spray [Tue, 1 Mar 2016 10:40:21 +0000 (10:40 +0000)]
Merge pull request #7745 from sileht/sileht/rados-cython

pybind: move cephfs to Cython

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #7831 from yuyuyu101/wip-14912
Haomai Wang [Tue, 1 Mar 2016 09:54:03 +0000 (17:54 +0800)]
Merge pull request #7831 from yuyuyu101/wip-14912

AsyncMessenger: fix several bugs

9 years agoMerge pull request #7852 from xiexingguo/xxg-wip-14928
Haomai Wang [Tue, 1 Mar 2016 09:53:20 +0000 (17:53 +0800)]
Merge pull request #7852 from xiexingguo/xxg-wip-14928

msg: async: start over after failing to bind a port in specified range

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
9 years agomsg: async: start over after failing to bind a port in specified range 7852/head
xie xingguo [Tue, 1 Mar 2016 11:03:00 +0000 (19:03 +0800)]
msg: async: start over after failing to bind a port in specified range

The original report associated with this fix can be found at
http://tracker.ceph.com/issues/13002. I reopen one in case it
needs to be backported or something alike.

Fixes: #14928
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agotest/cli-integration/rbd: disable progress output 7858/head
Josh Durgin [Tue, 1 Mar 2016 06:57:00 +0000 (22:57 -0800)]
test/cli-integration/rbd: disable progress output

This test is intended to check machine-readable output and usage, not
human-readable output.

Fixes: #14931
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7778 from marcan/pybind-fixes
Josh Durgin [Tue, 1 Mar 2016 06:48:53 +0000 (22:48 -0800)]
Merge pull request #7778 from marcan/pybind-fixes

pybind/rados: fix object lifetime issues and other bugs in aio

Reviewed-by: Mehdi Abaakouk <sileht@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7855 from tchaikov/wip-fix-ftbfs
Kefu Chai [Tue, 1 Mar 2016 06:39:29 +0000 (14:39 +0800)]
Merge pull request #7855 from tchaikov/wip-fix-ftbfs

test/TestPGLog: fix the FTBFS

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotest/TestPGLog: fix the FTBFS 7855/head
Kefu Chai [Tue, 1 Mar 2016 04:10:26 +0000 (12:10 +0800)]
test/TestPGLog: fix the FTBFS

the new pure virtual method was introduced by e7edf20.

Fixes: #14930
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7781 from ceph/wip-fix-rbd-cli-tests
Josh Durgin [Tue, 1 Mar 2016 01:30:09 +0000 (17:30 -0800)]
Merge pull request #7781 from ceph/wip-fix-rbd-cli-tests

rbd/run_cli_tests.sh: Reflect test failures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agofixed a bug for write bench with rados 7851/head
James Liu [Tue, 1 Mar 2016 00:25:42 +0000 (16:25 -0800)]
fixed a bug for write bench with rados

Signed-off-by: James Liu <james.liu@ssi.samsung.com>
9 years agoMerge pull request #7769 from somnathr/wip-make-shared
Samuel Just [Mon, 29 Feb 2016 23:04:28 +0000 (15:04 -0800)]
Merge pull request #7769 from somnathr/wip-make-shared

Use make_shared while creating shared_ptr

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agotest_filejournal: reserve throttle as needed 7767/head
Samuel Just [Mon, 29 Feb 2016 19:23:56 +0000 (11:23 -0800)]
test_filejournal: reserve throttle as needed

This is awkward, if there are later users other than this test
and JournalingObjectStore, it'll be worth making it a bit less
clunky and error prone.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoconfig_opts: make filestore_queue_max_(ops|bytes) U64
Samuel Just [Mon, 22 Feb 2016 22:29:20 +0000 (14:29 -0800)]
config_opts: make filestore_queue_max_(ops|bytes) U64

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7765 from athanatos/wip-lost-unfound-repop
Samuel Just [Mon, 29 Feb 2016 18:42:01 +0000 (10:42 -0800)]
Merge pull request #7765 from athanatos/wip-lost-unfound-repop

Repop and lost-unfound overhaul

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agorbd: deprecate image format 1 7841/head
Jason Dillaman [Mon, 29 Feb 2016 02:27:50 +0000 (21:27 -0500)]
rbd: deprecate image format 1

The rbd cli will warn about the deprecation when attempting to create
image format 1 images.  librbd will log an error message when opening
a format 1 RBD image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoAsyncConnection: log cleanup, remove redundant state display 7831/head
Haomai Wang [Wed, 24 Feb 2016 18:15:03 +0000 (02:15 +0800)]
AsyncConnection: log cleanup, remove redundant state display

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: complete all pending events
Haomai Wang [Mon, 29 Feb 2016 17:42:50 +0000 (01:42 +0800)]
Event: complete all pending events

Fix #14925
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncConnection: dispatch write handler when accept done
Haomai Wang [Mon, 29 Feb 2016 16:28:02 +0000 (00:28 +0800)]
AsyncConnection: dispatch write handler when accept done

Fix #12912
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7824 from dillaman/wip-aio-watch-notify
Samuel Just [Mon, 29 Feb 2016 15:42:08 +0000 (07:42 -0800)]
Merge pull request #7824 from dillaman/wip-aio-watch-notify

librados: fix test failure with new aio watch/unwatch API

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7832 from trociny/wip-journal-register-async
Jason Dillaman [Mon, 29 Feb 2016 13:53:17 +0000 (08:53 -0500)]
Merge pull request #7832 from trociny/wip-journal-register-async

journal: async methods to (un)register and update client

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7829 from xiexingguo/xxg-wip-doc
Kefu Chai [Mon, 29 Feb 2016 13:13:10 +0000 (21:13 +0800)]
Merge pull request #7829 from xiexingguo/xxg-wip-doc

doc: fix typo, indention etc.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: fix typo, indention etc. 7829/head
xiexingguo [Sat, 27 Feb 2016 12:03:30 +0000 (20:03 +0800)]
doc: fix typo, indention etc.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agopybind: update ceph_volume_client for cython 7745/head
John Spray [Fri, 26 Feb 2016 12:49:00 +0000 (12:49 +0000)]
pybind: update ceph_volume_client for cython

No need to explicitly touch the (no-longer-existing)
load_libcephfs method during module load, as with
the cython version we already get an ImportError
if the C library is unavailable.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agopybind: fix error handling on getxattr
John Spray [Mon, 29 Feb 2016 10:26:22 +0000 (10:26 +0000)]
pybind: fix error handling on getxattr

The ctypes bindings returned empty string
instead of raising exception.  This was a bug,
because it made it impossible to detect the
difference between missing xattr and empty
xattr.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agopybind: move cephfs to Cython
Mehdi Abaakouk [Thu, 25 Feb 2016 14:54:05 +0000 (15:54 +0100)]
pybind: move cephfs to Cython

This change moves cephfs binding to Cython.

Closes-bug: #14818
Signed-off-by: Mehdi Abaakouk <sileht@redhat.com>
9 years agodoc: osd-config Add Configuration Options for op queue. 7837/head
Robert LeBlanc [Sun, 28 Feb 2016 16:34:31 +0000 (09:34 -0700)]
doc: osd-config Add Configuration Options for op queue.

Signed-off-by: Robert LeBlanc <robert.leblanc@endurance.com>
9 years agoMerge pull request #7747 from vsjulu/master
Kefu Chai [Sat, 27 Feb 2016 16:01:55 +0000 (00:01 +0800)]
Merge pull request #7747 from vsjulu/master

xio: fix incorrect ip being assigned in case of multiple RDMA ports

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7630 from rzarzynski/wip-rgw-admin-token-cache
Yehuda Sadeh [Sat, 27 Feb 2016 14:22:09 +0000 (06:22 -0800)]
Merge pull request #7630 from rzarzynski/wip-rgw-admin-token-cache

rgw: add support for caching of Keystone admin token.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7825 from ceph/wip-rgw-openssl
Yehuda Sadeh [Sat, 27 Feb 2016 14:17:15 +0000 (06:17 -0800)]
Merge pull request #7825 from ceph/wip-rgw-openssl

rgw: link civetweb with openssl (Sage, Marcus Watts)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotest: add tests to (un)register and update journal client 7832/head
Mykola Golub [Sat, 27 Feb 2016 12:55:44 +0000 (14:55 +0200)]
test: add tests to (un)register and update journal client

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoRevert "AsyncConnection: Close connection when unregistered connection met WAIT"
Haomai Wang [Sat, 27 Feb 2016 12:50:48 +0000 (20:50 +0800)]
Revert "AsyncConnection: Close connection when unregistered connection met WAIT"

This reverts commit 9cc1055eb6e18d55084d5af2b2f93eb8da5ab7da.

Fix #14912
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agojournal: async methods to (un)register and update client
Mykola Golub [Thu, 25 Feb 2016 08:27:29 +0000 (10:27 +0200)]
journal: async methods to (un)register and update client

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agocls::journal: async client_unregister
Mykola Golub [Sat, 27 Feb 2016 10:20:49 +0000 (12:20 +0200)]
cls::journal: async client_unregister

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agocmake fix: build civetweb with the right include path. 7825/head
Marcus Watts [Sat, 27 Feb 2016 07:34:14 +0000 (02:34 -0500)]
cmake fix: build civetweb with the right include path.

In an earlier commit, civetweb.c got moved into a separate cmake 'object'
library civetweb_common_objs so that it could be built just once for use
with several different targets.  At the time, there was a separate global
"include_directory" to give the right include path for including "civetweb.h".
A later commit in master created an rgw_a library, and restricted civetweb.h's
include path for only building rgw_a objects.  So, as the product of
these these two commits, the target_include_directories command for the
civetweb include path now needs to be applied to civetweb_common_objs
and not rgw_a.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
9 years agoMerge pull request #7650 from avnerbh/fix1_rand
Sage Weil [Fri, 26 Feb 2016 23:58:28 +0000 (18:58 -0500)]
Merge pull request #7650 from avnerbh/fix1_rand

msg: add thread safety for "random" Messenger + fix wrong usage of random functions

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7651 from xiexingguo/xxg-wip-fixtypecheck
Sage Weil [Fri, 26 Feb 2016 23:57:19 +0000 (18:57 -0500)]
Merge pull request #7651 from xiexingguo/xxg-wip-fixtypecheck

osd: bluestore: improve fs-type verification and tidy up

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7654 from rldleblanc/wip-wpq-optimization
Sage Weil [Fri, 26 Feb 2016 23:36:52 +0000 (18:36 -0500)]
Merge pull request #7654 from rldleblanc/wip-wpq-optimization

osd: WeightedPriorityQueue: move to intrusive containers

9 years agoMerge pull request #7821 from rzarzynski/wip-rgw-14903
Yehuda Sadeh [Fri, 26 Feb 2016 21:37:44 +0000 (13:37 -0800)]
Merge pull request #7821 from rzarzynski/wip-rgw-14903

rgw: fix wrong handling of limit=0 during listing of Swift account.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: change naming of utility functions in rgw_keystone.cc. 7630/head
Radoslaw Zarzynski [Fri, 26 Feb 2016 21:17:09 +0000 (22:17 +0100)]
rgw: change naming of utility functions in rgw_keystone.cc.

Slightly improve code formatting and const-correctness as well.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoUse fixed version of civetweb to avoid warning. 6757/head
Marcus Watts [Tue, 23 Feb 2016 23:35:21 +0000 (18:35 -0500)]
Use fixed version of civetweb to avoid warning.

The warning about SSLv23_client_method is because when using dynamic
linking, this should always be non-zero.  That's inside of civetweb,
so this commit is to pull the submodule up to the fix.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
9 years agoFix ssl link error.
Marcus Watts [Sat, 20 Feb 2016 08:29:27 +0000 (03:29 -0500)]
Fix ssl link error.

When linking against -lssl, should also include -lcrypto.

// fixup merge with previous

Signed-off-by: Marcus Watts <mwatts@redhat.com>
9 years agoUse ld.so to link in ssl crypto (cmake changes).
Marcus Watts [Thu, 11 Feb 2016 00:14:06 +0000 (19:14 -0500)]
Use ld.so to link in ssl crypto (cmake changes).

Using dlopen() to load in ssl crypto makes me cringe.
Also it requires either installing the devel package,
or appending library versioning to the library name
civetweb tries to load, which is ugly.  This is only
a license problem for people whose system distribution
does not include openssl.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
9 years agorgw: fix wrong handling of limit=0 during listing of Swift account. 7821/head
Radoslaw Zarzynski [Fri, 26 Feb 2016 15:42:01 +0000 (16:42 +0100)]
rgw: fix wrong handling of limit=0 during listing of Swift account.

Fixes: #14903
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #7777 from theanalyst/rgw/insecure-keystone
Yehuda Sadeh [Fri, 26 Feb 2016 19:18:05 +0000 (11:18 -0800)]
Merge pull request #7777 from theanalyst/rgw/insecure-keystone

rgw: allow authentication keystone with self signed certs

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7809 from cbodley/wip-rgw-includes
Yehuda Sadeh [Fri, 26 Feb 2016 18:50:04 +0000 (10:50 -0800)]
Merge pull request #7809 from cbodley/wip-rgw-includes

rgw: use pimpl pattern for RGWPeriodHistory

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7822 from rzarzynski/wip-rgw-keystone-proper-parse-ordering
Yehuda Sadeh [Fri, 26 Feb 2016 18:44:01 +0000 (10:44 -0800)]
Merge pull request #7822 from rzarzynski/wip-rgw-keystone-proper-parse-ordering

rgw: try to parse Keystone token in order appropriate to configuration.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7803 from oritwas/wip-14826
Yehuda Sadeh [Fri, 26 Feb 2016 18:38:12 +0000 (10:38 -0800)]
Merge pull request #7803 from oritwas/wip-14826

rgw: reset return code in when iterating over the bucket the objects

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotest: remove doubled unwatch API call 7824/head
Jason Dillaman [Fri, 26 Feb 2016 18:13:23 +0000 (13:13 -0500)]
test: remove doubled unwatch API call

This error was unmasked by the fix included in commit 8caa2e4.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados: aio watch/unwatch/notify now uses completion objver
Jason Dillaman [Fri, 26 Feb 2016 18:09:59 +0000 (13:09 -0500)]
librados: aio watch/unwatch/notify now uses completion objver

A local variable was used for an async callback operation,
resulting in the potential for memory corruption.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoXIO: Changes to fix incorrect ip being assigned in case of multiple RDMA ports.remove... 7747/head
vsjulu [Mon, 22 Feb 2016 19:40:41 +0000 (11:40 -0800)]
XIO: Changes to fix incorrect ip being assigned in case of multiple RDMA ports.remove rdma local and return error instead to avoid issues with using rdma_local incase of multiple ports.

Signed-off-by: Subramanyam Varanasi <s.varanasi@ssi.samsung.com>
9 years agotests: update rbd-mirror tests for updated commit handling 7776/head
Jason Dillaman [Wed, 24 Feb 2016 13:40:18 +0000 (08:40 -0500)]
tests: update rbd-mirror tests for updated commit handling

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: fix delimiter in ObjectSetPosition formater
Jason Dillaman [Wed, 24 Feb 2016 13:27:08 +0000 (08:27 -0500)]
journal: fix delimiter in ObjectSetPosition formater

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: update JournalTrimmer to support new commit tracking
Jason Dillaman [Wed, 24 Feb 2016 03:10:20 +0000 (22:10 -0500)]
journal: update JournalTrimmer to support new commit tracking

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: active and minimum set should always grow
Jason Dillaman [Wed, 24 Feb 2016 03:07:03 +0000 (22:07 -0500)]
journal: active and minimum set should always grow

Prevent async reload from canceling out an in-flight update.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: update JournalPlayer to support new commit tracking
Jason Dillaman [Wed, 24 Feb 2016 01:44:29 +0000 (20:44 -0500)]
journal: update JournalPlayer to support new commit tracking

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: update JournalMetadata to support new commit handling
Jason Dillaman [Tue, 23 Feb 2016 20:32:26 +0000 (15:32 -0500)]
journal: update JournalMetadata to support new commit handling

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: track commit position for each object splay offset
Jason Dillaman [Tue, 23 Feb 2016 19:02:39 +0000 (14:02 -0500)]
journal: track commit position for each object splay offset

It's possible, when delaying appends to the journal, that the
current commit position might be in object set X while future
events for a different offset might be in an object set < X.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: differentiate corruption vs missing entry errors
Jason Dillaman [Tue, 23 Feb 2016 13:18:36 +0000 (08:18 -0500)]
journal: differentiate corruption vs missing entry errors

librbd should treat the corruption of the journal differently from
missing journal entries.  If entries are missing, it might be the
result of a crash and the journal should just be replayed through
the most recent, consistent entry.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorgw: try to parse Keystone token in order appropriate to configuration. 7822/head
Radoslaw Zarzynski [Fri, 26 Feb 2016 14:25:20 +0000 (15:25 +0100)]
rgw: try to parse Keystone token in order appropriate to configuration.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: add insecure option to the http client 7777/head
Abhishek Lekshmanan [Thu, 25 Feb 2016 10:07:51 +0000 (11:07 +0100)]
rgw: add insecure option to the http client

This allows the http client to turn off ssl certificate peer checking,
which is turned on by default. This is useful in cases like when
Keystone is SSL terminated with a self signed certificate.
The option `rgw_keystone_verify_ssl` (default true) can be toggled if
self signed certs are used, so that swift and s3 apis using keystone
authentication can work.

Fixes: #14583
Reported-by: Karol Mroz <mroz.karol@gmail.com>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agorgw: use pimpl pattern for RGWPeriodHistory 7809/head
Casey Bodley [Thu, 25 Feb 2016 18:07:54 +0000 (13:07 -0500)]
rgw: use pimpl pattern for RGWPeriodHistory

this removes the dependency on RGWPeriod from rgw_rados.h, which breaks
a circular dependency between rgw_rados.h -> rgw_metadata.h ->
rgw_period_history.h -> rgw_rados.h

Reported-by: Willem Jan Withagen <wjw@digiware.nl>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agodoc: final v9.2.1 release notes
Sage Weil [Fri, 26 Feb 2016 15:24:22 +0000 (10:24 -0500)]
doc: final v9.2.1 release notes

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7694 from Abhishekvrshny/wip-infernalis-release-notes
Sage Weil [Fri, 26 Feb 2016 15:24:20 +0000 (10:24 -0500)]
Merge pull request #7694 from Abhishekvrshny/wip-infernalis-release-notes

release-notes: draft v9.2.1 release notes

9 years agorbd/run_cli_tests.sh: Reflect test failures 7781/head
Zack Cerza [Wed, 24 Feb 2016 19:24:11 +0000 (12:24 -0700)]
rbd/run_cli_tests.sh: Reflect test failures

Signed-off-by: Zack Cerza <zack@redhat.com>
9 years agoMerge pull request #7813 from xiexingguo/xxg-wip-doc
Sage Weil [Fri, 26 Feb 2016 14:54:20 +0000 (09:54 -0500)]
Merge pull request #7813 from xiexingguo/xxg-wip-doc

doc: small fixes

9 years agodoc: batch small fixes, including typo, syntax etc. 7813/head
xiexingguo [Fri, 26 Feb 2016 15:25:02 +0000 (23:25 +0800)]
doc: batch small fixes, including typo, syntax etc.

Signed-off-by: xiexingguo <xie.xingguo@zte.com.cn>
9 years agodoc: fix typo
xiexingguo [Fri, 26 Feb 2016 14:39:57 +0000 (22:39 +0800)]
doc: fix typo

Signed-off-by: xiexingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore/NVMEDevice: remove unused variables ref 7799/head
xie xingguo [Thu, 25 Feb 2016 11:07:13 +0000 (11:07 +0000)]
os/bluestore/NVMEDevice: remove unused variables ref

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore/NVMEDevice: fix error handling for try_get()
xie xingguo [Thu, 25 Feb 2016 11:03:49 +0000 (11:03 +0000)]
os/bluestore/NVMEDevice: fix error handling for try_get()

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore/NVMEDevice: fix error handling for open()
xie xingguo [Thu, 25 Feb 2016 10:48:07 +0000 (10:48 +0000)]
os/bluestore/NVMEDevice: fix error handling for open()

According to Linux man page, the system call read() may return zero to indicate
that end of file reached on success. So below here we need to convert the result
code to a customized one in this case as errno is not set and we actually want
let caller know something is going wrong.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>