]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 '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>
9 years agoRevert "test/time: no need to abs(uint64_t) for comparing"
Sage Weil [Fri, 11 Mar 2016 22:42:27 +0000 (17:42 -0500)]
Revert "test/time: no need to abs(uint64_t) for comparing"

This reverts commit da0f6608dd6cc3356e727e739575f496c2b6a590.

unittest_time fails:

[==========] Running 4 tests from 2 test cases.
[----------] Global test environment set-up.
[----------] 2 tests from RealClock
[ RUN      ] RealClock.Sanity
[       OK ] RealClock.Sanity (0 ms)
[ RUN      ] RealClock.Conversions
test/common/test_time.cc:125: Failure
Expected: ((Clock::from_double(bd) - brt).count()) < (30U), actual: 18446744073709551595 vs 30
[  FAILED  ] RealClock.Conversions (0 ms)
[----------] 2 tests from RealClock (0 ms total)

[----------] 2 tests from CoarseRealClock
[ RUN      ] CoarseRealClock.Sanity
[       OK ] CoarseRealClock.Sanity (0 ms)
[ RUN      ] CoarseRealClock.Conversions
test/common/test_time.cc:125: Failure
Expected: ((Clock::from_double(bd) - brt).count()) < (30U), actual: 18446744073709551595 vs 30
[  FAILED  ] CoarseRealClock.Conversions (0 ms)
[----------] 2 tests from CoarseRealClock (0 ms total)

[----------] Global test environment tear-down
[==========] 4 tests from 2 test cases ran. (0 ms total)
[  PASSED  ] 2 tests.
[  FAILED  ] 2 tests, listed below:
[  FAILED  ] RealClock.Conversions
[  FAILED  ] CoarseRealClock.Conversions

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8063 from gregsfortytwo/wip-fix-fsmap-decode
Gregory Farnum [Fri, 11 Mar 2016 22:29:30 +0000 (14:29 -0800)]
Merge pull request #8063 from gregsfortytwo/wip-fix-fsmap-decode

Wip fix fsmap decode

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7752 from somnathr/wip-odsync-write
Samuel Just [Fri, 11 Mar 2016 21:47:38 +0000 (13:47 -0800)]
Merge pull request #7752 from somnathr/wip-odsync-write

FileStore: Added O_DSYNC write scheme

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoFSMap: actually include the legacy MDSMap in Filesystems when upgrading 8063/head
Greg Farnum [Fri, 11 Mar 2016 21:41:48 +0000 (13:41 -0800)]
FSMap: actually include the legacy MDSMap in Filesystems when upgrading

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoFSMap: decode old MDSMaps properly
Greg Farnum [Fri, 11 Mar 2016 21:36:51 +0000 (13:36 -0800)]
FSMap: decode old MDSMaps properly

We accidentally left a few members out that the MDSMap had!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8058 from yehudasa/wip-rgw-clean-log
Yehuda Sadeh [Fri, 11 Mar 2016 20:47:04 +0000 (12:47 -0800)]
Merge pull request #8058 from yehudasa/wip-rgw-clean-log

cleanup

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agorgw_ldap: merge cleanups 7985/head
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: silence compilation warnings 8058/head
Yehuda Sadeh [Fri, 11 Mar 2016 19:28:06 +0000 (11:28 -0800)]
rgw: silence compilation warnings

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: cleanup of debug messages
Orit Wasserman [Fri, 4 Mar 2016 11:52:10 +0000 (12:52 +0100)]
rgw: cleanup of debug messages

use ldout instead of derr and lderr and increase logging level

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #7944 from trociny/wip-rbd-mirror-image-replayer-async
Josh Durgin [Fri, 11 Mar 2016 19:24:12 +0000 (11:24 -0800)]
Merge pull request #7944 from trociny/wip-rbd-mirror-image-replayer-async

rbd-mirror: ImageReplayer async start/stop

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8028 from dillaman/wip-librbd-journal-replay
Josh Durgin [Fri, 11 Mar 2016 19:22:10 +0000 (11:22 -0800)]
Merge pull request #8028 from dillaman/wip-librbd-journal-replay

librbd: replaying a journal op post-refresh requires locking

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7483 from liewegas/wip-osd-boot
Samuel Just [Fri, 11 Mar 2016 19:03:58 +0000 (11:03 -0800)]
Merge pull request #7483 from liewegas/wip-osd-boot

osd: resolve boot vs NOUP set + clear race

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8030 from yehudasa/wip-rgw-sync-status
Orit Wasserman [Fri, 11 Mar 2016 18:39:59 +0000 (19:39 +0100)]
Merge pull request #8030 from yehudasa/wip-rgw-sync-status

adds the radosgw-admin sync status command that gives a human readable status of the sync process at a specific zone

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #7615 from ceph/wip-14678
Yehuda Sadeh [Fri, 11 Mar 2016 18:21:03 +0000 (10:21 -0800)]
Merge pull request #7615 from ceph/wip-14678

rgw: store system object meta in cache when creating it

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #8037 from yehudasa/wip-bucket-link
Yehuda Sadeh [Fri, 11 Mar 2016 18:17:07 +0000 (10:17 -0800)]
Merge pull request #8037 from yehudasa/wip-bucket-link

rgw:bucket link now set the bucket.instance acl (bug fix)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8013 from yehudasa/wip-rgw-multisite-fixes
Orit Wasserman [Fri, 11 Mar 2016 18:11:38 +0000 (19:11 +0100)]
Merge pull request #8013 from yehudasa/wip-rgw-multisite-fixes

rgw multisite fixes

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #6953 from jcsp/wip-fsmap
Gregory Farnum [Fri, 11 Mar 2016 17:36:30 +0000 (09:36 -0800)]
Merge pull request #6953 from jcsp/wip-fsmap

Multi-filesystem support

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7465 from liewegas/wip-promote-throttle
Sage Weil [Fri, 11 Mar 2016 17:15:46 +0000 (12:15 -0500)]
Merge pull request #7465 from liewegas/wip-promote-throttle

osd: probabilistic cache tier promotion throttling

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge tag 'v10.0.5'
Sage Weil [Fri, 11 Mar 2016 17:07:55 +0000 (12:07 -0500)]
Merge tag 'v10.0.5'

v10.0.5

Conflicts:
debian/changelog

9 years agov10.0.5 v10.0.5
Sage Weil [Fri, 11 Mar 2016 17:05:13 +0000 (12:05 -0500)]
v10.0.5

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodebian/changelog: Remove stray 'v' in version
Dan Mick [Fri, 4 Mar 2016 19:42:08 +0000 (11:42 -0800)]
debian/changelog: Remove stray 'v' in version

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 0f7730c8f444657d4aaffa28c12bbcd602a2e3b8)

9 years agoMerge branch 'master' of github.com:ceph/ceph
Sage Weil [Fri, 11 Mar 2016 16:14:55 +0000 (11:14 -0500)]
Merge branch 'master' of github.com:ceph/ceph

9 years agoMerge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph
Sage Weil [Fri, 11 Mar 2016 16:14:18 +0000 (11:14 -0500)]
Merge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
# debian/control

9 years agoMerge pull request #8045 from tchaikov/wip-scrubstore-cleanup
Sage Weil [Fri, 11 Mar 2016 15:50:43 +0000 (10:50 -0500)]
Merge pull request #8045 from tchaikov/wip-scrubstore-cleanup

osd/ScrubStore: remove unused function

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7707 from xiexingguo/xxg-wip-14815
Sage Weil [Fri, 11 Mar 2016 15:33:13 +0000 (10:33 -0500)]
Merge pull request #7707 from xiexingguo/xxg-wip-14815

osd: filestore: fix wrong scope of result code for error cases during mount

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7726 from tchaikov/wip-fix-ftbfs-gcc6
Sage Weil [Fri, 11 Mar 2016 15:32:38 +0000 (10:32 -0500)]
Merge pull request #7726 from tchaikov/wip-fix-ftbfs-gcc6

test/time: no need to abs(uint64_t) for comparing

Reviewed-by: Adam Emerson <aemerson@redhat.com>
9 years agoMerge pull request #7955 from ErwanAliasr1/evelu-check-bufferlist
Sage Weil [Fri, 11 Mar 2016 15:32:05 +0000 (10:32 -0500)]
Merge pull request #7955 from ErwanAliasr1/evelu-check-bufferlist

test/bufferlist: Avoid false-positive tests

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7980 from liewegas/wip-14952
Sage Weil [Fri, 11 Mar 2016 15:31:34 +0000 (10:31 -0500)]
Merge pull request #7980 from liewegas/wip-14952

mon: initialize last_* timestamps on new pgs to creation time

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #7982 from liewegas/wip-14606
Sage Weil [Fri, 11 Mar 2016 15:30:53 +0000 (10:30 -0500)]
Merge pull request #7982 from liewegas/wip-14606

qa/workunits/rest/test.py: add confirmation to 'mds setmap'

9 years agoMerge pull request #7983 from liewegas/wip-14616
Sage Weil [Fri, 11 Mar 2016 15:29:55 +0000 (10:29 -0500)]
Merge pull request #7983 from liewegas/wip-14616

log: do not repeat errors to stderr

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8004 from liewegas/wip-rados-test-stderr
Sage Weil [Fri, 11 Mar 2016 15:29:39 +0000 (10:29 -0500)]
Merge pull request #8004 from liewegas/wip-rados-test-stderr

qa/workunits/rados/test.sh: capture stderr too

9 years agoMerge pull request #8006 from liewegas/wip-big-pages
Sage Weil [Fri, 11 Mar 2016 15:29:00 +0000 (10:29 -0500)]
Merge pull request #8006 from liewegas/wip-big-pages

os/bluestore/KernelDevice: force block size

9 years agoMerge pull request #8019 from kmroz/wip-upstream-civetweb-low-ports-6
Sage Weil [Fri, 11 Mar 2016 15:28:17 +0000 (10:28 -0500)]
Merge pull request #8019 from kmroz/wip-upstream-civetweb-low-ports-6

rgw: drop permissions of rgw/civetweb after startup

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8007 from wido/se-mirror-mail
Kefu Chai [Fri, 11 Mar 2016 14:39:59 +0000 (22:39 +0800)]
Merge pull request #8007 from wido/se-mirror-mail

mirrors: Change contact e-mail address for se.ceph.com

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7991 from xiexingguo/xxg-wip-remove-upthrupending
Kefu Chai [Fri, 11 Mar 2016 14:39:29 +0000 (22:39 +0800)]
Merge pull request #7991 from xiexingguo/xxg-wip-remove-upthrupending

osd: remove up_thru_pending field, which is never used

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8023 from roidayan/xio-remove_unused_variable
Kefu Chai [Fri, 11 Mar 2016 14:15:54 +0000 (22:15 +0800)]
Merge pull request #8023 from roidayan/xio-remove_unused_variable

xio: remove unused variable

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotest: add rbd-mirror test script 7944/head
Mykola Golub [Thu, 10 Mar 2016 14:18:13 +0000 (16:18 +0200)]
test: add rbd-mirror test script

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agotest: rbd_mirror_image_replay improve commit position parsing
Mykola Golub [Thu, 10 Mar 2016 14:17:23 +0000 (16:17 +0200)]
test: rbd_mirror_image_replay improve commit position parsing

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agotest: ImageReplayer on_stop/on_start error tests
Mykola Golub [Fri, 26 Feb 2016 14:11:07 +0000 (16:11 +0200)]
test: ImageReplayer on_stop/on_start error tests

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agorbd-mirror: ImageReplayer async start/stop
Mykola Golub [Tue, 23 Feb 2016 07:02:00 +0000 (09:02 +0200)]
rbd-mirror: ImageReplayer async start/stop

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agolibrbd: protect against duplicate journal events 8028/head
Jason Dillaman [Fri, 11 Mar 2016 14:08:15 +0000 (09:08 -0500)]
librbd: protect against duplicate journal events

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: protect against journal replay shutdown race condition
Jason Dillaman [Fri, 11 Mar 2016 13:19:05 +0000 (08:19 -0500)]
librbd: protect against journal replay shutdown race condition

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: replaying a journal op post-refresh requires locking
Jason Dillaman [Thu, 10 Mar 2016 16:51:19 +0000 (11:51 -0500)]
librbd: replaying a journal op post-refresh requires locking

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: periodic failure in TestJournalReplay.SnapRename
Jason Dillaman [Thu, 10 Mar 2016 16:50:16 +0000 (11:50 -0500)]
test: periodic failure in TestJournalReplay.SnapRename

Force the refresh of the image to pick up the new snapshot
name before testing that it successfully was renamed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7923 from RustShen/master
Josh Durgin [Fri, 11 Mar 2016 08:04:44 +0000 (00:04 -0800)]
Merge pull request #7923 from RustShen/master

doc: add cinder backend section to rbd-openstack.rst

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoosd/ScrubStore: remove unused function 8045/head
Kefu Chai [Fri, 11 Mar 2016 07:52:25 +0000 (15:52 +0800)]
osd/ScrubStore: remove unused function

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7999 from liewegas/wip-armhf
Dan Mick [Fri, 11 Mar 2016 03:15:59 +0000 (19:15 -0800)]
Merge pull request #7999 from liewegas/wip-armhf

a few armhf (32-bit build) fixes

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agorgw: store system object meta in cache when creating it 7615/head
Yehuda Sadeh [Fri, 5 Feb 2016 20:57:44 +0000 (12:57 -0800)]
rgw: store system object meta in cache when creating it

Fixes: #14678
When creating the system object we can easily also get the object's meta, so
keep it in the cache.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw:bucket link now set the bucket.instance acl 8037/head
Aran85 [Mon, 28 Sep 2015 00:23:22 +0000 (08:23 +0800)]
rgw:bucket link now set the bucket.instance acl

Fixes: #11076
Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
9 years agoMerge pull request #7891 from rzarzynski/wip-rgw-content-disp
Yehuda Sadeh [Thu, 10 Mar 2016 23:41:27 +0000 (15:41 -0800)]
Merge pull request #7891 from rzarzynski/wip-rgw-content-disp

rgw: multiple Swift API compliance improvements for TempURL (Radoslaw Zarzynsk)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7990 from x11562/rgw_unused_vector
Yehuda Sadeh [Thu, 10 Mar 2016 22:57:06 +0000 (14:57 -0800)]
Merge pull request #7990 from x11562/rgw_unused_vector

rgw: remove unused vector

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8031 from ceph/wip-rgw-usage
Yehuda Sadeh [Thu, 10 Mar 2016 22:53:15 +0000 (14:53 -0800)]
Merge pull request #8031 from ceph/wip-rgw-usage

rgw: admin api for retrieving usage info (Ji Chen)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #8036 from yehudasa/wip-rgw-support-json-format-v2
Yehuda Sadeh [Thu, 10 Mar 2016 22:50:21 +0000 (14:50 -0800)]
Merge pull request #8036 from yehudasa/wip-rgw-support-json-format-v2

rgw: support json format for admin policy API (Dunrong Huang)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #7874 from badone/wip-coverity-rgw_lib-uninit
Yehuda Sadeh [Thu, 10 Mar 2016 22:26:30 +0000 (14:26 -0800)]
Merge pull request #7874 from badone/wip-coverity-rgw_lib-uninit

[rgw] RGWLib::env is not used so remove it

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw_admin: policy dump --xml backward compatibility 8036/head
Yehuda Sadeh [Thu, 10 Mar 2016 22:15:09 +0000 (14:15 -0800)]
rgw_admin: policy dump --xml backward compatibility

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoosd: make promote_probability_millis atomic_t 7465/head
Sage Weil [Thu, 10 Mar 2016 22:00:53 +0000 (17:00 -0500)]
osd: make promote_probability_millis atomic_t

This is almost always read, so it should be cheap.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorgw: remove unused header file
Dunrong Huang [Wed, 3 Feb 2016 08:07:03 +0000 (16:07 +0800)]
rgw: remove unused header file

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
9 years agorgw: support json format output for rados-admin policy command
Dunrong Huang [Wed, 3 Feb 2016 07:59:24 +0000 (15:59 +0800)]
rgw: support json format output for rados-admin policy command

when use rados-admin to get policy with parameter --format=json:
$ radosgw-admin policy --bucket=m8x --format=json

policy information with json format should be output.

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
9 years agorgw: support json format for admin policy API
Dunrong Huang [Wed, 3 Feb 2016 07:43:40 +0000 (15:43 +0800)]
rgw: support json format for admin policy API

Fixes: #14090, #14091
- before this patch:
$ curl -s -X GET http://radosrgw:9090/admin/bucket?format=json&policy&bucket=m8x | xmllint --format -

got XML response with error format

- after this patch:
got correct response with json format

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
9 years agoMerge pull request #8027 from liewegas/wip-reweight-fix
Gregory Farnum [Thu, 10 Mar 2016 21:03:32 +0000 (13:03 -0800)]
Merge pull request #8027 from liewegas/wip-reweight-fix

test/pybind/test_ceph_argparse: fix reweight-by-utilization tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6656 from jmunhoz/wip-bucket-request-payment-usage-log
Yehuda Sadeh [Thu, 10 Mar 2016 19:13:24 +0000 (11:13 -0800)]
Merge pull request #6656 from jmunhoz/wip-bucket-request-payment-usage-log

rgw: add bucket request payment feature usage statistics integration

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>