]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoosd: skip heartbeat_check for osd which we haven't sent ping to 8369/head
xie xingguo [Wed, 30 Mar 2016 09:24:08 +0000 (17:24 +0800)]
osd: skip heartbeat_check for osd which we haven't sent ping to

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosd: initialize last_pg_stats_ack correctly on first pg_stats message sending
xie xingguo [Wed, 30 Mar 2016 07:30:20 +0000 (15:30 +0800)]
osd: initialize last_pg_stats_ack correctly on first pg_stats message sending

So we don't potentially make an incorrect judgement in the tick_without_osd_lock()
procedure if OSD's first pg_stats message was sent, which as a result shall cause
an unnecessary hunting of new monitor.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosd: update osd_stat_updated field if we force to report to monitor
xie xingguo [Wed, 30 Mar 2016 04:17:15 +0000 (12:17 +0800)]
osd: update osd_stat_updated field if we force to report to monitor

On tick_without_osd_lock() waking up, we will force an immediate
report to monitor if a long enough period has elapsed since our
last report was sent.

However, the send_pg_stats() procedure is a noop unless either
osd_stat_updated field is set or pg_stat_queue is empty.
Since the latter condition is non-deterministic, we shall
manually set osd_stat_updated here to kick a pg relevant report
off.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8287 from dillaman/wip-15232
Josh Durgin [Wed, 30 Mar 2016 01:25:05 +0000 (18:25 -0700)]
Merge pull request #8287 from dillaman/wip-15232

rbd-mirror: initial failover / failback support

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7712 from vitek/listbucket_encoding_type_fix
Sage Weil [Wed, 30 Mar 2016 01:07:41 +0000 (21:07 -0400)]
Merge pull request #7712 from vitek/listbucket_encoding_type_fix

rgw: S3: set EncodingType in ListBucketResult

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8363 from cbodley/wip-cmake-vstart
Orit Wasserman [Tue, 29 Mar 2016 21:24:28 +0000 (23:24 +0200)]
Merge pull request #8363 from cbodley/wip-cmake-vstart

vstart: fix up cmake paths when VSTART_DEST is given
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8362 from jdurgin/wip-ceph-python-path
Sage Weil [Tue, 29 Mar 2016 19:46:52 +0000 (15:46 -0400)]
Merge pull request #8362 from jdurgin/wip-ceph-python-path

ceph.in: fix python libpath for automake as well

9 years agoMerge pull request #8364 from liewegas/wip-fix-update-op
Samuel Just [Tue, 29 Mar 2016 19:46:14 +0000 (12:46 -0700)]
Merge pull request #8364 from liewegas/wip-fix-update-op

os/ObjectStore: fix _update_op for split dest_cid

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agovstart: fix up cmake paths when VSTART_DEST is given 8363/head
Casey Bodley [Tue, 29 Mar 2016 19:11:26 +0000 (15:11 -0400)]
vstart: fix up cmake paths when VSTART_DEST is given

mstart.sh uses VSTART_DEST to tell vstart.sh where to create the
cluster. in the cmake case, it needs to get a relative path from there
to the built binaries and libraries - update these paths to use the new
'lib' and 'bin' directories

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoos/ObjectStore: fix _update_op for split dest_cid 8364/head
Sage Weil [Tue, 29 Mar 2016 19:24:34 +0000 (15:24 -0400)]
os/ObjectStore: fix _update_op for split dest_cid

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoqa/workunits/rbd: add basic failover/fallback test case 8287/head
Jason Dillaman [Mon, 28 Mar 2016 19:57:58 +0000 (15:57 -0400)]
qa/workunits/rbd: add basic failover/fallback test case

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: use 32bit image creation bid to avoid overflow
Jason Dillaman [Mon, 28 Mar 2016 19:39:00 +0000 (15:39 -0400)]
rbd-mirror: use 32bit image creation bid to avoid overflow

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: initial support for primary/non-primary handling
Jason Dillaman [Mon, 28 Mar 2016 17:05:48 +0000 (13:05 -0400)]
rbd-mirror: initial support for primary/non-primary handling

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: accessor for journal tag data
Jason Dillaman [Mon, 28 Mar 2016 15:53:26 +0000 (11:53 -0400)]
librbd: accessor for journal tag data

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: link primary mirror uuid to non-primary journal tag
Jason Dillaman [Mon, 28 Mar 2016 15:23:17 +0000 (11:23 -0400)]
librbd: link primary mirror uuid to non-primary journal tag

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: update mirror peer sync state after completion
Jason Dillaman [Mon, 28 Mar 2016 14:48:02 +0000 (10:48 -0400)]
rbd-mirror: update mirror peer sync state after completion

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: track mirror peer replay state
Jason Dillaman [Mon, 28 Mar 2016 14:40:46 +0000 (10:40 -0400)]
librbd: track mirror peer replay state

This new state will protect against the case of an rbd-mirror crash
between registering with the remote and starting the image sync.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: allocate local journal tags from mirror remote peer tags
Jason Dillaman [Mon, 28 Mar 2016 03:00:33 +0000 (23:00 -0400)]
rbd-mirror: allocate local journal tags from mirror remote peer tags

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: helper method for retrieving tag struct
Jason Dillaman [Mon, 28 Mar 2016 00:30:44 +0000 (20:30 -0400)]
journal: helper method for retrieving tag struct

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: use consistent "non-primary" verbiage for image mirroring
Jason Dillaman [Fri, 25 Mar 2016 15:15:18 +0000 (11:15 -0400)]
rbd: use consistent "non-primary" verbiage for image mirroring

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: image demotion should record new demote journal event
Jason Dillaman [Fri, 25 Mar 2016 15:03:35 +0000 (11:03 -0400)]
librbd: image demotion should record new demote journal event

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: blacklist journal error while attempting to acquire lock
Jason Dillaman [Fri, 25 Mar 2016 15:01:01 +0000 (11:01 -0400)]
librbd: blacklist journal error while attempting to acquire lock

The journal policy will return -EPERM if attempting to acquire the
exclusive lock when the image is non-primary.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: new demote journal event
Jason Dillaman [Fri, 25 Mar 2016 13:46:50 +0000 (09:46 -0400)]
librbd: new demote journal event

This event will be used as a placeholder to ensure that the demotion journal
tag is properly processed by rbd-mirror.  Without an event associated with
the demotion journal tag, the demotion event will be missed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: framework for replay allocating tags in local journal
Jason Dillaman [Thu, 24 Mar 2016 19:56:46 +0000 (15:56 -0400)]
rbd-mirror: framework for replay allocating tags in local journal

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: journal reset should re-register the local client
Jason Dillaman [Thu, 24 Mar 2016 16:33:50 +0000 (12:33 -0400)]
librbd: journal reset should re-register the local client

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: cleanup debug log messages
Jason Dillaman [Thu, 24 Mar 2016 16:07:49 +0000 (12:07 -0400)]
rbd-mirror: cleanup debug log messages

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: cross-reference local image via global image id
Jason Dillaman [Thu, 24 Mar 2016 14:56:35 +0000 (10:56 -0400)]
rbd-mirror: cross-reference local image via global image id

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocls_rbd: mirroring directory reverse lookup from global id to image id
Jason Dillaman [Thu, 24 Mar 2016 14:43:44 +0000 (10:43 -0400)]
cls_rbd: mirroring directory reverse lookup from global id to image id

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: bootstrap requires the global image id
Jason Dillaman [Thu, 24 Mar 2016 13:40:58 +0000 (09:40 -0400)]
rbd-mirror: bootstrap requires the global image id

The global image id can be used to cross-reference images that
have been replicated amongst peers.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: fix state output stream formatter
Jason Dillaman [Thu, 24 Mar 2016 03:07:12 +0000 (23:07 -0400)]
rbd-mirror: fix state output stream formatter

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: support creating images with non-primary journals
Jason Dillaman [Thu, 24 Mar 2016 02:28:55 +0000 (22:28 -0400)]
librbd: support creating images with non-primary journals

When rbd-mirror initially creates a replicated image in the
local pool, the journal should be flagged as non-primary to
(1) prevent local ops againsts the image and (2) provide a
clean chain of replicated tags.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: don't acquire lock for primary local images
Jason Dillaman [Wed, 23 Mar 2016 22:00:52 +0000 (18:00 -0400)]
rbd-mirror: don't acquire lock for primary local images

Abort the image replay for any local images that are marked as primary.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: tweaks to support creating mock test cases
Jason Dillaman [Wed, 23 Mar 2016 21:28:22 +0000 (17:28 -0400)]
rbd-mirror: tweaks to support creating mock test cases

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: bootstrap now has initial support for existing images
Jason Dillaman [Tue, 22 Mar 2016 22:52:45 +0000 (18:52 -0400)]
rbd-mirror: bootstrap now has initial support for existing images

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: properly initialize image copy start/end objects
Jason Dillaman [Tue, 22 Mar 2016 22:51:34 +0000 (18:51 -0400)]
rbd-mirror: properly initialize image copy start/end objects

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: only delete ImageCtx after open failure
Jason Dillaman [Tue, 22 Mar 2016 22:50:43 +0000 (18:50 -0400)]
rbd-mirror: only delete ImageCtx after open failure

The image is already closed -- it just needs to be destroyed
in a thread context outside of librbd.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocls_journal: disallow client registration against missing journal
Jason Dillaman [Tue, 22 Mar 2016 20:50:18 +0000 (16:50 -0400)]
cls_journal: disallow client registration against missing journal

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: added helper to query single client record from disk
Jason Dillaman [Tue, 22 Mar 2016 20:28:59 +0000 (16:28 -0400)]
journal: added helper to query single client record from disk

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: convert ImageReplayer into templated class
Jason Dillaman [Tue, 22 Mar 2016 15:28:53 +0000 (11:28 -0400)]
rbd-mirror: convert ImageReplayer into templated class

This will facilitate create mock test cases.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: helper methods to allocate tags associated to remote journals
Jason Dillaman [Tue, 22 Mar 2016 02:01:05 +0000 (22:01 -0400)]
librbd: helper methods to allocate tags associated to remote journals

Allocating tags for the local journal will always be based off the local
commit position.  For remote journals, the local commit position doesn't
reflect actual events replayed by rbd-mirror, so it needs to provide the
remote journal commit position.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: initial integration with librbd lock/journal policies
Jason Dillaman [Wed, 23 Mar 2016 21:46:43 +0000 (17:46 -0400)]
rbd-mirror: initial integration with librbd lock/journal policies

For the first stage, acquiring the exclusive-lock will no longer
automatically result in the allocation of a journal tag.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: basic policy for journal handling
Jason Dillaman [Tue, 22 Mar 2016 01:13:38 +0000 (21:13 -0400)]
librbd: basic policy for journal handling

This will allow rbd-mirror to override the allocation of a new
tag and to restart rbd-mirror's image replayer when a watch error
forces the loss of the exclusive lock.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: optional 'force' parameter for request lock payload
Jason Dillaman [Tue, 22 Mar 2016 00:12:55 +0000 (20:12 -0400)]
librbd: optional 'force' parameter for request lock payload

This will be used when force promoting an image to primary -- when
rbd-mirror receives the forced request, it will immediately abort
playback.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: basic policy for controlling the release of the exclusive lock
Jason Dillaman [Mon, 21 Mar 2016 21:50:10 +0000 (17:50 -0400)]
librbd: basic policy for controlling the release of the exclusive lock

The rbd-mirror daemon will need to interlock with the request for the lock
from another client with the successful sync of remote journal events.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: journal type traits should be standalone
Jason Dillaman [Mon, 21 Mar 2016 20:52:07 +0000 (16:52 -0400)]
librbd: journal type traits should be standalone

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8332 from rjfd/wip-15267
Jason Dillaman [Tue, 29 Mar 2016 19:12:09 +0000 (15:12 -0400)]
Merge pull request #8332 from rjfd/wip-15267

rbd-mirror: prevent enabling/disabling an image's mirroring when not in image mode

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoceph.in: fix python libpath for automake as well 8362/head
Josh Durgin [Tue, 29 Mar 2016 18:18:26 +0000 (11:18 -0700)]
ceph.in: fix python libpath for automake as well

Follow-on to a041e5c9413fd816bc2858509319fa469fa233e5
due to confusion from .pyc files hanging around.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Tue, 29 Mar 2016 19:04:16 +0000 (15:04 -0400)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #8320 from dachary/wip-virtualenv-jewel
Sage Weil [Tue, 29 Mar 2016 19:08:54 +0000 (15:08 -0400)]
Merge pull request #8320 from dachary/wip-virtualenv-jewel

Makefile-env.am: set a default for CEPH_BUILD_VIRTUALENV (part 2)

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoMerge pull request #8360 from jdurgin/wip-ceph-python-path
Sage Weil [Tue, 29 Mar 2016 19:06:56 +0000 (15:06 -0400)]
Merge pull request #8360 from jdurgin/wip-ceph-python-path

ceph.in: correct dev python path for automake builds

Tested-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8361 from liewegas/wip-test-port
Josh Durgin [Tue, 29 Mar 2016 18:34:54 +0000 (11:34 -0700)]
Merge pull request #8361 from liewegas/wip-test-port

test/test_pool_create.sh: fix port

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge remote-tracking branch 'origin/jewel'
Josh Durgin [Tue, 29 Mar 2016 18:32:39 +0000 (11:32 -0700)]
Merge remote-tracking branch 'origin/jewel'

9 years agoMerge pull request #8356 from ceph/wip-cython-build-dir
Josh Durgin [Tue, 29 Mar 2016 18:27:10 +0000 (11:27 -0700)]
Merge pull request #8356 from ceph/wip-cython-build-dir

pybind/Makefile.am: Prevent race creating CYTHON_BUILD_DIR

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotest/test_pool_create.sh: fix port 8361/head
Sage Weil [Tue, 29 Mar 2016 18:23:28 +0000 (14:23 -0400)]
test/test_pool_create.sh: fix port

17108 is used by test/mon/test_pool_quota.sh

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8359 from athanatos/wip-15205
Sage Weil [Tue, 29 Mar 2016 18:22:51 +0000 (14:22 -0400)]
Merge pull request #8359 from athanatos/wip-15205

os/ObjectStore: try_move_rename in transaction append and add coverage to store_test

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoceph.in: correct dev python path for automake builds 8360/head
Josh Durgin [Tue, 29 Mar 2016 18:18:26 +0000 (11:18 -0700)]
ceph.in: correct dev python path for automake builds

Accidentally broken by ad2e6f442df0fe302c09fc751fc9e12237789511

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agostore_test: apply an appended transaction half the time 8359/head
Samuel Just [Fri, 18 Mar 2016 19:21:32 +0000 (12:21 -0700)]
store_test: apply an appended transaction half the time

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoTransaction: handle OP_TRY_RENAME in dump
Samuel Just [Fri, 18 Mar 2016 19:04:51 +0000 (12:04 -0700)]
Transaction: handle OP_TRY_RENAME in dump

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agostore_test: add a TryMoveRename test
Samuel Just [Fri, 18 Mar 2016 18:22:00 +0000 (11:22 -0700)]
store_test: add a TryMoveRename test

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoObjectStore::Transaction::_update_op: handle OP_TRY_RENAME
Samuel Just [Fri, 18 Mar 2016 18:11:58 +0000 (11:11 -0700)]
ObjectStore::Transaction::_update_op: handle OP_TRY_RENAME

Fixes: http://tracker.ceph.com/issues/15205
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agorbd: rbd-mirroring: Updated rbd mirroring unit tests to reflect the new conditions... 8332/head
Ricardo Dias [Mon, 28 Mar 2016 14:12:05 +0000 (15:12 +0100)]
rbd: rbd-mirroring: Updated rbd mirroring unit tests to reflect the new conditions to enable/disable image mirroring

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agoMerge pull request #6317 from cxwshawn/wip-lost-fix
Samuel Just [Tue, 29 Mar 2016 17:56:55 +0000 (10:56 -0700)]
Merge pull request #6317 from cxwshawn/wip-lost-fix

PG: pg down state blocked by osd.x, lost osd.x cannot solve peering stuck

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8292 from vshankar/bluefs-tool-fix
Sage Weil [Tue, 29 Mar 2016 17:47:26 +0000 (13:47 -0400)]
Merge pull request #8292 from vshankar/bluefs-tool-fix

os/bluestore: ceph-bluefs-tool fixes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8334 from dachary/wip-subman-facts
branto1 [Tue, 29 Mar 2016 17:37:02 +0000 (19:37 +0200)]
Merge pull request #8334 from dachary/wip-subman-facts

script: subscription-manager support (part 3)

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #8351 from jcsp/wip-cmake-cython
Orit Wasserman [Tue, 29 Mar 2016 16:35:22 +0000 (18:35 +0200)]
Merge pull request #8351 from jcsp/wip-cmake-cython

cmake: Build cython modules and change paths to bin/, lib/
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorbd: rbd-mirroring: Disable image mirroring depends on pool mirroring mode
Ricardo Dias [Mon, 28 Mar 2016 14:11:10 +0000 (15:11 +0100)]
rbd: rbd-mirroring: Disable image mirroring depends on pool mirroring mode

Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15267
9 years agorbd: rbd-mirroring: Enabling image mirroring depends on pool mirroring mode
Ricardo Dias [Mon, 28 Mar 2016 14:09:29 +0000 (15:09 +0100)]
rbd: rbd-mirroring: Enabling image mirroring depends on pool mirroring mode

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agoscript: subscription-manager support (part 3) 8334/head
Loic Dachary [Mon, 28 Mar 2016 14:33:56 +0000 (16:33 +0200)]
script: subscription-manager support (part 3)

Renaming subman.py in subman is cute but does not prevent the generation
of the py[co].

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #8215 from dzafman/wip-14438
Samuel Just [Tue, 29 Mar 2016 15:02:41 +0000 (08:02 -0700)]
Merge pull request #8215 from dzafman/wip-14438

Wip 14438

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8261 from rjfd/wip-15217
Jason Dillaman [Tue, 29 Mar 2016 14:22:09 +0000 (10:22 -0400)]
Merge pull request #8261 from rjfd/wip-15217

rbd-mirror: enabling/disabling pool mirroring should update the mirroring directory

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoceph.in: update for cmake path changes 8351/head
John Spray [Tue, 29 Mar 2016 11:22:00 +0000 (12:22 +0100)]
ceph.in: update for cmake path changes

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agovstart: update for cmake build path changes
John Spray [Thu, 24 Mar 2016 12:30:09 +0000 (12:30 +0000)]
vstart: update for cmake build path changes

Cribbed this from Ali's wip-cmake-make-check branch.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agocmake: Cython modules building with cmake
Ali Maredia [Thu, 3 Mar 2016 17:05:18 +0000 (12:05 -0500)]
cmake: Cython modules building with cmake

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #8228 from SUSE/wip-15218
Loic Dachary [Tue, 29 Mar 2016 11:01:23 +0000 (13:01 +0200)]
Merge pull request #8228 from SUSE/wip-15218

doc/dev: add "Deploy a cluster for manual testing" section

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8256 from dachary/wip-mailmap
Loic Dachary [Tue, 29 Mar 2016 10:58:56 +0000 (12:58 +0200)]
Merge pull request #8256 from dachary/wip-mailmap

mailmap updates

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Adam C. Emerson name normalization 8256/head
Loic Dachary [Tue, 29 Mar 2016 10:55:52 +0000 (12:55 +0200)]
mailmap: Adam C. Emerson name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Jenkins name normalization
Loic Dachary [Tue, 29 Mar 2016 10:55:29 +0000 (12:55 +0200)]
mailmap: Jenkins name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Yan Jun affiliation
Loic Dachary [Tue, 22 Mar 2016 10:37:25 +0000 (11:37 +0100)]
mailmap: Yan Jun affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Zhao Junwang affiliation
Loic Dachary [Tue, 22 Mar 2016 10:37:01 +0000 (11:37 +0100)]
mailmap: Zhao Junwang affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Sarthak Munshi affiliation
Loic Dachary [Tue, 22 Mar 2016 10:36:46 +0000 (11:36 +0100)]
mailmap: Sarthak Munshi affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Rust Shen affiliation
Loic Dachary [Tue, 22 Mar 2016 10:36:28 +0000 (11:36 +0100)]
mailmap: Rust Shen affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Eric Cook affiliation
Loic Dachary [Tue, 22 Mar 2016 10:36:05 +0000 (11:36 +0100)]
mailmap: Eric Cook affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Ricardo Dias affiliation
Loic Dachary [Tue, 22 Mar 2016 10:35:45 +0000 (11:35 +0100)]
mailmap: Ricardo Dias affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Karol Mroz affiliation
Loic Dachary [Tue, 22 Mar 2016 10:35:27 +0000 (11:35 +0100)]
mailmap: Karol Mroz affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: James Liu affiliation
Loic Dachary [Tue, 22 Mar 2016 10:35:07 +0000 (11:35 +0100)]
mailmap: James Liu affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Robert LeBlanc name normalization
Loic Dachary [Tue, 22 Mar 2016 10:34:45 +0000 (11:34 +0100)]
mailmap: Robert LeBlanc name normalization

Reviewed-by: Robert LeBlanc <robert.leblanc@endurance.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Yankun Li name normalization
Loic Dachary [Tue, 22 Mar 2016 10:34:22 +0000 (11:34 +0100)]
mailmap: Yankun Li name normalization

Reviewed-by: Yankun Li <liyankun@unitedstack.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: Josh Durgin name normalization
Loic Dachary [Tue, 22 Mar 2016 10:33:25 +0000 (11:33 +0100)]
mailmap: Josh Durgin name normalization

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agorbd: rbd-mirroring: Added unit tests to test enable/disable image mirroring when... 8261/head
Ricardo Dias [Tue, 22 Mar 2016 13:26:15 +0000 (13:26 +0000)]
rbd: rbd-mirroring: Added unit tests to test enable/disable image mirroring when pool-level mirroring changes

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd: rbd-mirroring: Disable image mirroring when pool-level mirroring is disabled
Ricardo Dias [Tue, 22 Mar 2016 12:24:03 +0000 (12:24 +0000)]
rbd: rbd-mirroring: Disable image mirroring when pool-level mirroring is disabled

Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15217
9 years agorbd: rbd-mirroring: Enable image mirroring when pool-level mirroring is enabled
Ricardo Dias [Tue, 22 Mar 2016 11:43:51 +0000 (11:43 +0000)]
rbd: rbd-mirroring: Enable image mirroring when pool-level mirroring is enabled

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agoMerge pull request #8345 from tchaikov/wip-release-notes-indents
Loic Dachary [Tue, 29 Mar 2016 08:37:30 +0000 (10:37 +0200)]
Merge pull request #8345 from tchaikov/wip-release-notes-indents

doc/release-notes: fix indents

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8342 from xiexingguo/xxg-wip-doc
Kefu Chai [Tue, 29 Mar 2016 03:21:23 +0000 (11:21 +0800)]
Merge pull request #8342 from xiexingguo/xxg-wip-doc

doc: fix typo, duplicated content etc. for Jewel release notes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc/release-notes: fix indents 8345/head
Kefu Chai [Tue, 29 Mar 2016 03:19:46 +0000 (11:19 +0800)]
doc/release-notes: fix indents

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: fix typo, duplicated content etc. for Jewel release notes 8342/head
xie xingguo [Tue, 29 Mar 2016 01:38:23 +0000 (09:38 +0800)]
doc: fix typo, duplicated content etc. for Jewel release notes

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agopybind/Makefile.am: Prevent race creating CYTHON_BUILD_DIR 8356/head
Dan Mick [Mon, 28 Mar 2016 20:07:10 +0000 (13:07 -0700)]
pybind/Makefile.am: Prevent race creating CYTHON_BUILD_DIR

Fixes http://tracker.ceph.com/issues/15276

Signed-off-by: Dan Mick <dan.mick@redhat.com>
9 years agoMerge pull request #8321 from linuxbox2/jewel-nfs-fixes-2
Casey Bodley [Mon, 28 Mar 2016 19:29:41 +0000 (15:29 -0400)]
Merge pull request #8321 from linuxbox2/jewel-nfs-fixes-2

rgw_file: set owner uid, gid, and Unix mode on new objects

9 years agoMerge pull request #8106 from linuxbox2/wip-cmake-ssl
Casey Bodley [Mon, 28 Mar 2016 17:24:35 +0000 (13:24 -0400)]
Merge pull request #8106 from linuxbox2/wip-cmake-ssl

cmake: add FindOpenSSL.cmake

9 years agoMerge pull request #8312 from SUSE/wip-submittingpatches
Loic Dachary [Mon, 28 Mar 2016 17:13:02 +0000 (19:13 +0200)]
Merge pull request #8312 from SUSE/wip-submittingpatches

doc: amend Fixes instructions in SubmittingPatches

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw_file tests: allow override of owner_uid and owner_gid 8321/head
Matt Benjamin [Mon, 28 Mar 2016 16:05:38 +0000 (12:05 -0400)]
rgw_file tests: allow override of owner_uid and owner_gid

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>