]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorgw: propagate low time precision for user operations 8108/head
Yehuda Sadeh [Tue, 15 Mar 2016 21:22:06 +0000 (14:22 -0700)]
rgw: propagate low time precision for user operations

When user set a conditional timestamp to compare (e.g. if-modified-since),
it uses a low precision time resolution. Need to adjust checks for that.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: use higher precision time when encoding / decoding external apis
Yehuda Sadeh [Tue, 15 Mar 2016 20:31:31 +0000 (13:31 -0700)]
rgw: use higher precision time when encoding / decoding external apis

When dealing with external entities (e.g., remote rgw), use higher precision time
format for object mtime.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoutime: add gmtime_nsec()
Yehuda Sadeh [Tue, 15 Mar 2016 20:30:29 +0000 (13:30 -0700)]
utime: add gmtime_nsec()

higher precision than gmtime()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: extend date/time parsing
Yehuda Sadeh [Tue, 15 Mar 2016 20:29:48 +0000 (13:29 -0700)]
rgw: extend date/time parsing

So that we can parse correctly time encoded using utime_t::gmtime()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: metadata notifications go to all zones
Yehuda Sadeh [Tue, 15 Mar 2016 03:00:35 +0000 (20:00 -0700)]
rgw: metadata notifications go to all zones

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fetch remote obj uses high def clock for if-[un]modified-since
Yehuda Sadeh [Tue, 15 Mar 2016 01:42:39 +0000 (18:42 -0700)]
rgw: fetch remote obj uses high def clock for if-[un]modified-since

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: timespan fix
Yehuda Sadeh [Sun, 13 Mar 2016 03:21:20 +0000 (19:21 -0800)]
rgw: timespan fix

use make_timespan() to generate a correct timespan struct

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotime: For tests, subtract in the right order
Adam C. Emerson [Fri, 11 Mar 2016 23:33:59 +0000 (18:33 -0500)]
time: For tests, subtract in the right order

This was a bug in the test rather than a bug in the code the test was testing.

Use the ternary operator to replace labs.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agorgw: adapt to narrow stat2() and mtime2()
Matt Benjamin [Fri, 11 Mar 2016 20:35:16 +0000 (15:35 -0500)]
rgw: adapt to narrow stat2() and mtime2()

The librados stat2() and mtime2() ops no longer provide an override
for the internal ceph_realtime type.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw: high resolution time
Yehuda Sadeh [Thu, 3 Mar 2016 06:23:41 +0000 (22:23 -0800)]
rgw: high resolution time

replace time_t, and some utime_t with ceph::real_clock. Use new
librados interfaces to stat() and set mtime.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoutime: add conversion methods to/from real_time
Yehuda Sadeh [Thu, 3 Mar 2016 06:26:21 +0000 (22:26 -0800)]
utime: add conversion methods to/from real_time

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agocommon/ceph_time: add real_clock::is_zero()
Yehuda Sadeh [Thu, 3 Mar 2016 06:25:15 +0000 (22:25 -0800)]
common/ceph_time: add real_clock::is_zero()

to check whether time is not zero

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #8079 from dillaman/wip-14413
Josh Durgin [Tue, 15 Mar 2016 00:27:30 +0000 (17:27 -0700)]
Merge pull request #8079 from dillaman/wip-14413

rbd-mirror: integrate with image sync state machine

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotest: remove broken negative test cases
Jason Dillaman [Mon, 14 Mar 2016 02:14:28 +0000 (22:14 -0400)]
test: remove broken negative test cases

These should be reimplemented using google mock instead of
virtual functions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: integrate new bootstrap state machine
Jason Dillaman [Mon, 14 Mar 2016 02:12:15 +0000 (22:12 -0400)]
rbd-mirror: integrate new bootstrap state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: simple image bootstrap state machine
Jason Dillaman [Mon, 14 Mar 2016 02:10:13 +0000 (22:10 -0400)]
rbd-mirror: simple image bootstrap state machine

This state machine will handle the simple cases of creating
a local image from a remote image, registering to the remote
journal, and sync'ing the image contents.

There are several TODOs for future remaining work.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: helper state machine for opening local image
Jason Dillaman [Mon, 14 Mar 2016 02:09:19 +0000 (22:09 -0400)]
rbd-mirror: helper state machine for opening local image

This state machine will open a local image and request the
exclusive lock.  If the open or lock fails, it will automatically
close the image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: helper state machine for closing librbd images
Jason Dillaman [Mon, 14 Mar 2016 02:08:16 +0000 (22:08 -0400)]
rbd-mirror: helper state machine for closing librbd images

librbd ImageCtx's cannot be deleted from within the librbd thread.  This
state machine will perform the deletion from the rbd-mirror work queue
thread.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7979 from dillaman/wip-14413
Josh Durgin [Tue, 15 Mar 2016 00:14:01 +0000 (17:14 -0700)]
Merge pull request #7979 from dillaman/wip-14413

rbd-mirror: remote to local cluster image sync

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8102 from dillaman/wip-librados-aio-notify-redux
Josh Durgin [Mon, 14 Mar 2016 23:23:25 +0000 (16:23 -0700)]
Merge pull request #8102 from dillaman/wip-librados-aio-notify-redux

librados: cancel aio notification linger op upon completion

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8099 from dillaman/wip-15121
Josh Durgin [Mon, 14 Mar 2016 22:44:35 +0000 (15:44 -0700)]
Merge pull request #8099 from dillaman/wip-15121

cls_rbd: protect against excessively large object maps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8100 from linuxbox2/ldap-cmake
Orit Wasserman [Mon, 14 Mar 2016 21:16:09 +0000 (22:16 +0100)]
Merge pull request #8100 from linuxbox2/ldap-cmake

cmake: avoid false-positive LDAP header detect

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8104 from dillaman/wip-rbd-read-flags
Josh Durgin [Mon, 14 Mar 2016 21:11:49 +0000 (14:11 -0700)]
Merge pull request #8104 from dillaman/wip-rbd-read-flags

qa/workunits/rbd: do not use object map during read flag testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa/workunits/rbd: do not use object map during read flag testing 8104/head
Jason Dillaman [Mon, 14 Mar 2016 21:06:15 +0000 (17:06 -0400)]
qa/workunits/rbd: do not use object map during read flag testing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados: cancel aio notification linger op upon completion 8102/head
Jason Dillaman [Mon, 14 Mar 2016 19:21:01 +0000 (15:21 -0400)]
librados: cancel aio notification linger op upon completion

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocmake: avoid false-positive LDAP header detect 8100/head
Matt Benjamin [Mon, 14 Mar 2016 18:08:53 +0000 (14:08 -0400)]
cmake: avoid false-positive LDAP header detect

Pre-setting a value in OPENLDAP_INCLUDE_DIR broke the subsequent
test.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agocls_rbd: protect against excessively large object maps 8099/head
Jason Dillaman [Mon, 14 Mar 2016 17:57:28 +0000 (13:57 -0400)]
cls_rbd: protect against excessively large object maps

Fixes: #15121
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8094 from dillaman/wip-librbd-image-watch-unregister
Josh Durgin [Mon, 14 Mar 2016 17:28:17 +0000 (10:28 -0700)]
Merge pull request #8094 from dillaman/wip-librbd-image-watch-unregister

librbd: handle unregistering the image watcher when disconnected

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: handle unregistering the image watcher when disconnected 8094/head
Jason Dillaman [Mon, 14 Mar 2016 15:34:04 +0000 (11:34 -0400)]
librbd: handle unregistering the image watcher when disconnected

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7913 from liewegas/wip-list-encode
Sage Weil [Mon, 14 Mar 2016 14:53:08 +0000 (10:53 -0400)]
Merge pull request #7913 from liewegas/wip-list-encode

include/encoding: do not try to be clever with list encoding

9 years agoMerge pull request #7915 from ceph/wip-librados-stat2
Sage Weil [Mon, 14 Mar 2016 14:52:15 +0000 (10:52 -0400)]
Merge pull request #7915 from ceph/wip-librados-stat2

librados: stat2 with higher time precision

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7964 from liewegas/wip-crush-jewel
Sage Weil [Mon, 14 Mar 2016 14:51:40 +0000 (10:51 -0400)]
Merge pull request #7964 from liewegas/wip-crush-jewel

crush: update tunable docs.  change default profile to jewel

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8035 from liewegas/wip-bluestore
Sage Weil [Mon, 14 Mar 2016 14:50:58 +0000 (10:50 -0400)]
Merge pull request #8035 from liewegas/wip-bluestore

osd: bluestore updates, scrub fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8050 from liewegas/wip-15077
Sage Weil [Mon, 14 Mar 2016 14:50:06 +0000 (10:50 -0400)]
Merge pull request #8050 from liewegas/wip-15077

os/filestore: fix punch hole usage in _zero

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8064 from liewegas/wip-zlib-test
Sage Weil [Mon, 14 Mar 2016 14:49:45 +0000 (10:49 -0400)]
Merge pull request #8064 from liewegas/wip-zlib-test

unittest_compression_zlib: do not assume buffer will be null terminated

9 years agoMerge pull request #7870 from stiopaa1/blueStoreRemoveIncludes
Sage Weil [Mon, 14 Mar 2016 13:59:52 +0000 (09:59 -0400)]
Merge pull request #7870 from stiopaa1/blueStoreRemoveIncludes

osd: bluestore: remove unneeded includes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7871 from xiexingguo/xxg-wip-cleanasync
Sage Weil [Mon, 14 Mar 2016 12:27:47 +0000 (08:27 -0400)]
Merge pull request #7871 from xiexingguo/xxg-wip-cleanasync

msg: async: small cleanups

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7170 from trociny/wip-freebsd-misc
Kefu Chai [Mon, 14 Mar 2016 09:38:05 +0000 (17:38 +0800)]
Merge pull request #7170 from trociny/wip-freebsd-misc

FreeBSD related fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7947 from saru95/patch---2
Kefu Chai [Mon, 14 Mar 2016 09:36:25 +0000 (17:36 +0800)]
Merge pull request #7947 from saru95/patch---2

ceph.in: Minor python3 specific changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7974 from tchaikov/wip-buffer-eq-neq
Kefu Chai [Mon, 14 Mar 2016 09:35:05 +0000 (17:35 +0800)]
Merge pull request #7974 from tchaikov/wip-buffer-eq-neq

buffer: add symmetry operator==() and operator!=()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8074 from tchaikov/wip-ceph-detect-init-test
Loic Dachary [Sun, 13 Mar 2016 09:40:49 +0000 (16:40 +0700)]
Merge pull request #8074 from tchaikov/wip-ceph-detect-init-test

ceph-detect-init: add debian/jessie test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-detect-init: return None at seeing unknown debian distro 8074/head
Kefu Chai [Sun, 13 Mar 2016 02:21:27 +0000 (10:21 +0800)]
ceph-detect-init: return None at seeing unknown debian distro

* return None at seeing unknown debian distros
* add test for this accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8046 from xiexingguo/xxg-wip-fixpc
Haomai Wang [Sun, 13 Mar 2016 04:19:57 +0000 (12:19 +0800)]
Merge pull request #8046 from xiexingguo/xxg-wip-fixpc

msg: async: fix perf counter description and simplify _send_keepalive_or_ack

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7949 from wjin/fix
Haomai Wang [Sun, 13 Mar 2016 04:15:53 +0000 (12:15 +0800)]
Merge pull request #7949 from wjin/fix

Event: fix clock skew problem

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #8076 from ceph/wip-rgw-ldap
Yehuda Sadeh [Sun, 13 Mar 2016 04:10:02 +0000 (20:10 -0800)]
Merge pull request #8076 from ceph/wip-rgw-ldap

Wip rgw ldap

This follows a revert of the previous PR. This branch has some build related fixes.

9 years agoMerge pull request #8075 from ceph/revert-7985-rgw-token-7
Yehuda Sadeh [Sun, 13 Mar 2016 04:07:52 +0000 (20:07 -0800)]
Merge pull request #8075 from ceph/revert-7985-rgw-token-7

Revert "rgw ldap"

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoRevert "rgw ldap" 8075/head
Yehuda Sadeh [Sun, 13 Mar 2016 04:07:04 +0000 (20:07 -0800)]
Revert "rgw ldap"

9 years agotest: verify proper update of object map during rbd-mirror image sync 7979/head
Jason Dillaman [Sun, 13 Mar 2016 03:13:11 +0000 (22:13 -0500)]
test: verify proper update of object map during rbd-mirror image sync

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: update object map while performing image sync
Jason Dillaman [Sun, 13 Mar 2016 03:11:42 +0000 (22:11 -0500)]
rbd-mirror: update object map while performing image sync

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: temporarily disable support for cloned images
Jason Dillaman [Sat, 12 Mar 2016 20:43:46 +0000 (15:43 -0500)]
rbd-mirror: temporarily disable support for cloned images

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: unit test cases for rbd mirror image sync
Jason Dillaman [Sat, 12 Mar 2016 05:16:40 +0000 (00:16 -0500)]
test: unit test cases for rbd mirror image sync

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: image sync state machine
Jason Dillaman [Sat, 12 Mar 2016 02:24:17 +0000 (21:24 -0500)]
rbd-mirror: image sync state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: unit tests for rbd::mirror::image_sync::ImageCopyRequest
Jason Dillaman [Fri, 11 Mar 2016 20:45:47 +0000 (15:45 -0500)]
test: unit tests for rbd::mirror::image_sync::ImageCopyRequest

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: state machine to iterate and copy all image objects
Jason Dillaman [Fri, 11 Mar 2016 20:45:09 +0000 (15:45 -0500)]
rbd-mirror: state machine to iterate and copy all image objects

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: track maximum object count during mirror sync
Jason Dillaman [Fri, 11 Mar 2016 16:52:48 +0000 (11:52 -0500)]
librbd: track maximum object count during mirror sync

If the sync is interrupted, it is possible the image the source
image is shrunk.  Therefore, the sync process needs to track
the maximum known object extent of the image so objects can
be properly freed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: test cases for rbd-mirror image sync point state machines
Jason Dillaman [Fri, 11 Mar 2016 15:36:52 +0000 (10:36 -0500)]
test: test cases for rbd-mirror image sync point state machines

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: new image sync point create/prune state machines
Jason Dillaman [Fri, 11 Mar 2016 15:35:03 +0000 (10:35 -0500)]
rbd-mirror: new image sync point create/prune state machines

These are responsible for creating/removing snapshots in the
remote image and updating the client registration to account
for the snapshots.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: added equality operator to MirrorPeer journal types
Jason Dillaman [Fri, 11 Mar 2016 02:41:40 +0000 (21:41 -0500)]
librbd: added equality operator to MirrorPeer journal types

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: async version of snap create and snap remove
Jason Dillaman [Fri, 11 Mar 2016 01:48:40 +0000 (20:48 -0500)]
librbd: async version of snap create and snap remove

This will be utilized by the RBD mirror daemon when creating
sync points.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: prefix local maintenance ops methods
Jason Dillaman [Fri, 11 Mar 2016 01:26:53 +0000 (20:26 -0500)]
librbd: prefix local maintenance ops methods

This will help to differentiate between the methods that send an RPC
request if the lock isn't owned vs execute locally if it is owned.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: maintenance ops now send asynchronous requests
Jason Dillaman [Fri, 11 Mar 2016 00:13:07 +0000 (19:13 -0500)]
librbd: maintenance ops now send asynchronous requests

The RBD mirror daemon will need to request the creation/removal
of snapshots from a remote image.  These operations need to be
performed asynchronously as opposed to the current synchronous
style of the librbd API.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: track starting point snapshot for mirror sync point
Jason Dillaman [Thu, 10 Mar 2016 20:48:18 +0000 (15:48 -0500)]
librbd: track starting point snapshot for mirror sync point

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: move get_mock_io_ctx helper method to common location
Jason Dillaman [Thu, 10 Mar 2016 02:10:50 +0000 (21:10 -0500)]
test: move get_mock_io_ctx helper method to common location

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: unit test cases for rbd::mirror::image_sync::SnapshotCopyRequest
Jason Dillaman [Tue, 8 Mar 2016 03:17:23 +0000 (22:17 -0500)]
test: unit test cases for rbd::mirror::image_sync::SnapshotCopyRequest

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: sync snapshots between remote-local images during bootstrap
Jason Dillaman [Mon, 7 Mar 2016 22:33:49 +0000 (17:33 -0500)]
rbd-mirror: sync snapshots between remote-local images during bootstrap

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: track local to peer snapshot id mapping within journal
Jason Dillaman [Tue, 8 Mar 2016 01:44:28 +0000 (20:44 -0500)]
librbd: track local to peer snapshot id mapping within journal

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: unit test cases for rbd::mirror::image_sync::ObjectCopyRequest
Jason Dillaman [Sun, 6 Mar 2016 18:09:38 +0000 (13:09 -0500)]
test: unit test cases for rbd::mirror::image_sync::ObjectCopyRequest

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: updated mock expectation for librados remove op
Jason Dillaman [Sun, 6 Mar 2016 18:08:17 +0000 (13:08 -0500)]
test: updated mock expectation for librados remove op

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: added missing forward declarations for librbd mocks
Jason Dillaman [Sun, 6 Mar 2016 18:07:42 +0000 (13:07 -0500)]
test: added missing forward declarations for librbd mocks

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd_mirror: deep-copy of object and its associated snapshots
Jason Dillaman [Sun, 6 Mar 2016 18:06:42 +0000 (13:06 -0500)]
rbd_mirror: deep-copy of object and its associated snapshots

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: helper method for wrappign rados safe callbacks
Jason Dillaman [Sun, 6 Mar 2016 18:04:26 +0000 (13:04 -0500)]
librbd: helper method for wrappign rados safe callbacks

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: updated API for calc_snap_set_diff
Jason Dillaman [Sun, 6 Mar 2016 18:03:52 +0000 (13:03 -0500)]
librbd: updated API for calc_snap_set_diff

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados: calc_snap_set_diff now provides last known object size
Jason Dillaman [Sun, 6 Mar 2016 18:02:34 +0000 (13:02 -0500)]
librados: calc_snap_set_diff now provides last known object size

This allows truncate requests to be detected between snapshots.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados_test_stub: support for truncating/removing with old snap contexts
Jason Dillaman [Sun, 6 Mar 2016 18:01:09 +0000 (13:01 -0500)]
librados_test_stub: support for truncating/removing with old snap contexts

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8066 from yehudasa/wip-rgw-swift-versioning-disabled
Yehuda Sadeh [Sun, 13 Mar 2016 02:02:50 +0000 (18:02 -0800)]
Merge pull request #8066 from yehudasa/wip-rgw-swift-versioning-disabled

Wip rgw swift versioning disabled

Reviewed-by: Josh Durgin <joshd@redhat.com>
9 years agoMerge pull request #7985 from linuxbox2/rgw-token-7
Yehuda Sadeh [Sun, 13 Mar 2016 02:02:06 +0000 (18:02 -0800)]
Merge pull request #7985 from linuxbox2/rgw-token-7

rgw ldap (Matt Benjamin)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge remote-tracking branch 'origin/master' into wip-rgw-ldap 8076/head
Yehuda Sadeh [Sat, 12 Mar 2016 23:17:03 +0000 (15:17 -0800)]
Merge remote-tracking branch 'origin/master' into wip-rgw-ldap

9 years agotest: disable test_rgw_ldap
Yehuda Sadeh [Sat, 12 Mar 2016 21:44:24 +0000 (13:44 -0800)]
test: disable test_rgw_ldap

for now

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw/Makefile.am: add a missing .h file
Yehuda Sadeh [Sat, 12 Mar 2016 00:27:32 +0000 (16:27 -0800)]
rgw/Makefile.am: add a missing .h file

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw_ldap: merge cleanups
Matt Benjamin [Fri, 11 Mar 2016 19:22:24 +0000 (14:22 -0500)]
rgw_ldap:  merge cleanups

* match LDAPHelper op return codes to RGW (-POSIX)
* make temporary LDAP handle local (MT-safe)
* add required --encode and --ttype to usage
* use versioned encoding macros

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw: require openldap library client headers
Matt Benjamin [Thu, 10 Mar 2016 12:31:30 +0000 (07:31 -0500)]
rgw: require openldap library client headers

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw: free components on shutdown
Matt Benjamin [Wed, 9 Mar 2016 16:21:55 +0000 (11:21 -0500)]
rgw: free components on shutdown

Also, use ldout in rgw_file.h in 3 places.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw: LDAP pass-through authentication
Matt Benjamin [Sat, 14 Nov 2015 19:51:13 +0000 (14:51 -0500)]
rgw: LDAP pass-through authentication

Implement a new external authenticator based on LDAP and the
new external token format.

External LDAP auth now works, at least with openldap/X.500 style
naming and ldaps:// (SSL).

The latter is AD-friendly, but since AD uses dnattr=cn (IIRC)
everywhere, AD will need testing.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Sat, 12 Mar 2016 14:03:06 +0000 (09:03 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge branch 'wip-15086' of git://github.com/SUSE/ceph
Sage Weil [Sat, 12 Mar 2016 14:02:49 +0000 (09:02 -0500)]
Merge branch 'wip-15086' of git://github.com/SUSE/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8068 from SUSE/wip-15104
Josh Durgin [Sat, 12 Mar 2016 01:48:43 +0000 (17:48 -0800)]
Merge pull request #8068 from SUSE/wip-15104

qa/workunits/rbd: use POSIX function definition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7663 from javacruft/wip-pybind-flags
Josh Durgin [Sat, 12 Mar 2016 01:40:40 +0000 (17:40 -0800)]
Merge pull request #7663 from javacruft/wip-pybind-flags

pybind: Ensure correct python flags are passed

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7856 from jdurgin/wip-cython-cleanup
Josh Durgin [Sat, 12 Mar 2016 01:35:11 +0000 (17:35 -0800)]
Merge pull request #7856 from jdurgin/wip-cython-cleanup

configure.ac: update help strings for cython

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
9 years agoMerge remote-tracking branch 'origin/wip-josh-testing'
Josh Durgin [Sat, 12 Mar 2016 01:20:47 +0000 (17:20 -0800)]
Merge remote-tracking branch 'origin/wip-josh-testing'

9 years agoMerge pull request #8067 from athanatos/wip-fix-filestore-warning
Gregory Farnum [Sat, 12 Mar 2016 01:06:07 +0000 (17:06 -0800)]
Merge pull request #8067 from athanatos/wip-fix-filestore-warning

FileStore: fix initialization order for m_disable_wbthrottle

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoqa/workunits/rbd: use POSIX function definition 8068/head
Nathan Cutler [Sat, 12 Mar 2016 01:03:27 +0000 (02:03 +0100)]
qa/workunits/rbd: use POSIX function definition

In scripts with /bin/sh shebang, we must use POSIX function definitions to
avoid syntax errors on platforms that link /bin/sh to something other than
/bin/bash.

See https://wiki.ubuntu.com/DashAsBinSh#function for more information.

http://tracker.ceph.com/issues/15104 Fixes: #15104

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorgw: disable swift versioning by default 8066/head
Yehuda Sadeh [Sat, 12 Mar 2016 00:07:15 +0000 (16:07 -0800)]
rgw: disable swift versioning by default

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: improve naming of Swift versioned object's copies.
Radoslaw Zarzynski [Thu, 3 Mar 2016 16:45:40 +0000 (17:45 +0100)]
rgw: improve naming of Swift versioned object's copies.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: dump X-Versions-Location HTTP header of Swift API.
Radoslaw Zarzynski [Thu, 3 Mar 2016 15:33:16 +0000 (16:33 +0100)]
rgw: dump X-Versions-Location HTTP header of Swift API.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: copy swift versioned object to destination if overwritten
Yehuda Sadeh [Wed, 2 Mar 2016 00:46:47 +0000 (16:46 -0800)]
rgw: copy swift versioned object to destination if overwritten

Only allow if target bucket owner is the source bucket owner.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: swift object versioning data structure changes
Yehuda Sadeh [Thu, 18 Feb 2016 04:46:42 +0000 (20:46 -0800)]
rgw: swift object versioning data structure changes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8034 from SUSE/wip-15047
Ken Dreyer [Fri, 11 Mar 2016 23:58:30 +0000 (16:58 -0700)]
Merge pull request #8034 from SUSE/wip-15047

packaging: make infernalis -> jewel upgrade work

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agodebian: make infernalis -> jewel upgrade work 8034/head
Nathan Cutler [Thu, 10 Mar 2016 21:11:46 +0000 (22:11 +0100)]
debian: make infernalis -> jewel upgrade work

Attempts to install jewel ceph-common, ceph-mon, ceph-osd, and ceph-base
package over infernalis ceph package fail due to files existing in both.

See comment #4 in the tracker issue for a deeper analysis.

http://tracker.ceph.com/issues/15047 Fixes: #15047

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoFileStore: fix initialization order for m_disable_wbthrottle 8067/head
Samuel Just [Fri, 11 Mar 2016 23:16:37 +0000 (15:16 -0800)]
FileStore: fix initialization order for m_disable_wbthrottle

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoceph-detect-init: return systemd on Debian Jessie 8062/head
Nathan Cutler [Fri, 11 Mar 2016 21:54:54 +0000 (22:54 +0100)]
ceph-detect-init: return systemd on Debian Jessie

http://tracker.ceph.com/issues/15086 Fixes: #15086

Signed-off-by: Nathan Cutler <ncutler@suse.com>