]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
runsisi [Fri, 1 Apr 2016 12:56:26 +0000 (20:56 +0800)]
cls_journal: fix -EEXIST checking
Signed-off-by: runsisi <runsisi@zte.com.cn>
Jason Dillaman [Thu, 31 Mar 2016 18:34:26 +0000 (13:34 -0500)]
Merge pull request #8371 from runsisi/wip-fix-eexist
cls_rbd: fix -EEXIST checking in cls::rbd::image_set
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Thu, 31 Mar 2016 15:21:50 +0000 (11:21 -0400)]
Merge pull request #8400 from qhjindev/fix_mon
mon: remove unnecessary comment for update_from_paxos
Casey Bodley [Thu, 31 Mar 2016 15:05:14 +0000 (11:05 -0400)]
Merge pull request #8399 from oritwas/wip-cmake-mirrorwatcher
cmake: add missing librbd/MirrorWatcher.cc and librd/ObjectWatcher.cc
Qinghua Jin [Thu, 31 Mar 2016 14:37:12 +0000 (22:37 +0800)]
mon: remove unnecessary comment for update_from_paxos
The return value comment for update_from_paxos is unnecessary.
Signed-off-by: Qinghua Jin <qhjin_dev@163.com>
Orit Wasserman [Thu, 31 Mar 2016 13:59:32 +0000 (15:59 +0200)]
cmake: add missing librbd/MirrorWatcher.cc and librd/ObjectWatcher.cc
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Orit Wasserman [Thu, 31 Mar 2016 13:57:55 +0000 (15:57 +0200)]
Merge pull request #8394 from xiexingguo/xxg-wip-compile
rgw: fix compiling error
Loic Dachary [Thu, 31 Mar 2016 13:16:29 +0000 (15:16 +0200)]
Merge pull request #8358 from dachary/wip-releases
releases: what is merged where and when ?
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 29 Mar 2016 17:17:14 +0000 (19:17 +0200)]
releases: what is merged where and when ?
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 29 Mar 2016 17:16:31 +0000 (19:16 +0200)]
releases: update understanding the release cycle
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 29 Mar 2016 16:16:53 +0000 (18:16 +0200)]
release-notes: v10.0.5 release notes
Signed-off-by: Loic Dachary <loic@dachary.org>
Orit Wasserman [Thu, 31 Mar 2016 12:52:02 +0000 (14:52 +0200)]
Merge pull request #7875 from badone/wip-coverity-rgw_file-unused
[rgw] Check return code in RGWFileHandle::write
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
xie xingguo [Thu, 31 Mar 2016 11:48:38 +0000 (19:48 +0800)]
rgw: fix compiling error
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Orit Wasserman [Thu, 31 Mar 2016 11:43:49 +0000 (13:43 +0200)]
Merge pull request #8200 from H3C/wip-rgw-bugfixb
rgw/rgw_admin:fix bug about list and stats command
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Loic Dachary [Thu, 31 Mar 2016 10:21:56 +0000 (12:21 +0200)]
Merge pull request #8373 from wjwithagen/patch-4
ceph-detect-init/run-tox.sh: FreeBSD: No init detect
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Orit Wasserman [Thu, 31 Mar 2016 09:55:13 +0000 (11:55 +0200)]
Merge pull request #8387 from dreamhost/wip-mp-listpartresult-etag
rgw: Multipart ListPartsResult ETag quotes
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Robin H. Johnson [Thu, 31 Mar 2016 06:24:40 +0000 (06:24 +0000)]
rgw: Multipart ListPartsResult ETag quotes
ListPartsResult output has always missed quotes on the ETag since it was
first committed.
Fixes: #15334
Backports: hammer, infernalis
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Sage Weil [Thu, 31 Mar 2016 05:15:38 +0000 (01:15 -0400)]
Merge pull request #8372 from jcsp/wip-15309
qa: update rest test cephfs calls
Sage Weil [Thu, 31 Mar 2016 05:14:22 +0000 (01:14 -0400)]
Merge pull request #8258 from asheplyakov/bug-12065
monclient: avoid key renew storm on clock skew
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 31 Mar 2016 05:13:58 +0000 (01:13 -0400)]
Merge pull request #8348 from xiexingguo/xxg-wip-failurepending
osd: fix failure report handling during ms_handle_connect()
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 31 Mar 2016 05:08:01 +0000 (01:08 -0400)]
Merge pull request #8369 from xiexingguo/xxg-wip-tick
osd: fix tick relevant issues
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 31 Mar 2016 05:07:17 +0000 (01:07 -0400)]
Merge pull request #8354 from tchaikov/wip-missing-cls
osd/ClassHandler: only dlclose() the classes not missing
Reviewed-by: Sage Weil <sage@redhat.com>
Josh Durgin [Thu, 31 Mar 2016 01:46:11 +0000 (18:46 -0700)]
Merge pull request #8355 from dillaman/wip-15029
librbd: send notifications for mirroring status updates
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
runsisi [Wed, 30 Mar 2016 10:25:50 +0000 (18:25 +0800)]
cls_rbd: fix -EEXIST checking in cls::rbd::image_set
Signed-off-by: runsisi <runsisi@hust.edu.cn>
Sage Weil [Wed, 30 Mar 2016 22:36:42 +0000 (18:36 -0400)]
Merge pull request #8382 from athanatos/wip-15241
osd: fix epoch check in handle_pg_create
Reviewed-by: Sage Weil <sage@redhat.com>
Samuel Just [Tue, 22 Mar 2016 21:20:12 +0000 (14:20 -0700)]
OSD::handle_pg_create: check same_primary_since
Rather than add a flag to handle_pg_peering_evt, check
same_primary_since here and pass the create event to
handle_pg_peering_evt as if it originated at the current epoch (the
project_pg_history checks in handle_pg_peering_evt will be noops).
Fixes: tracker.ceph.com/issues/15241
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Wed, 30 Mar 2016 22:25:36 +0000 (15:25 -0700)]
Merge pull request #8147 from xiaoxichen/fix-get-map
osd/OSD.cc: finish full_map_request every MOSDMap message.
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jason Dillaman [Tue, 29 Mar 2016 16:39:56 +0000 (12:39 -0400)]
librbd: integrate listener for new mirroring notification payloads
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 29 Mar 2016 15:42:02 +0000 (11:42 -0400)]
librbd: send notifications on mirroring updates
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Casey Bodley [Wed, 30 Mar 2016 21:01:31 +0000 (17:01 -0400)]
Merge pull request #8084 from sunfch/wip-rgw-init-max-response
rgw: accept data only at the first time in response to a request
Jason Dillaman [Tue, 29 Mar 2016 04:02:10 +0000 (00:02 -0400)]
librbd: helper methods for mirroring notifications
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 29 Mar 2016 03:45:38 +0000 (23:45 -0400)]
librbd: mirroring object notification types
Initial payloads for updated mirror pool mode and image state.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 29 Mar 2016 03:13:17 +0000 (23:13 -0400)]
librbd: generic object watcher and mirroring watcher
The ObjectWatcher can handle generic watch and recovery of
RADOS objects. The MirroringWatcher will handle updates
to the RBD mirroring object.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 30 Mar 2016 16:58:18 +0000 (12:58 -0400)]
Merge pull request #8375 from rjfd/wip-15265
librbd: disable image mirroring when image is removed
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Josh Durgin [Wed, 30 Mar 2016 16:20:19 +0000 (09:20 -0700)]
Merge pull request #8331 from sileht/sileht/rados-cython
pybind/rados: python3 fix
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Ricardo Dias [Wed, 30 Mar 2016 14:06:25 +0000 (15:06 +0100)]
rbd: rbd-mirroring: Automatically disable image mirroring when image is removed
Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15265
Willem Jan Withagen [Wed, 30 Mar 2016 11:09:16 +0000 (13:09 +0200)]
ceph-detect-init/run-tox.sh: FreeBSD: No init detect
- Freebsd has /etc/rc.d with scripts to start daemons at boottime.
Test for that are currently not integrated with Ceph tests
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Jason Dillaman [Wed, 30 Mar 2016 14:49:46 +0000 (10:49 -0400)]
Merge pull request #8368 from tchaikov/wip-cmake-fix-rbd
cmake: add StandardPolicy.cc to librbd
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Wed, 30 Mar 2016 13:56:37 +0000 (09:56 -0400)]
Merge pull request #8337 from jmunhoz/fix-15292
mon: remove unused variable
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Jason Dillaman [Wed, 30 Mar 2016 12:49:55 +0000 (08:49 -0400)]
Merge pull request #8352 from runsisi/wip-fix-missing-iter
rbd-mirror: fix missing increment for iterators
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 30 Mar 2016 12:27:22 +0000 (08:27 -0400)]
Merge pull request #8374 from trociny/fix-cls-rbd-read_peers
cls_rbd: read_peers: update last_read on next cls_cxx_map_get_vals
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Wed, 30 Mar 2016 12:24:43 +0000 (08:24 -0400)]
Merge pull request #7062 from wonzhq/scrub-prio-pool
osd: add the support of per pool scrub priority
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 30 Mar 2016 12:23:05 +0000 (08:23 -0400)]
Merge pull request #8210 from liewegas/wip-12814
osd: add 'proxy' cache mode
Reviewed-by: Samuel Just <sjust@redhat.com>
Sage Weil [Wed, 30 Mar 2016 12:22:46 +0000 (08:22 -0400)]
Merge pull request #8315 from mslovy/wip-clean-pg
osd: duplicated clear for peer_missing
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 30 Mar 2016 12:22:30 +0000 (08:22 -0400)]
Merge pull request #8330 from xiexingguo/xxg-wip-race
common: fix race during optracker switches between enabled/disabled mode
Reviewed-by: David Zafman <dzafman@redhat.com>
Sage Weil [Wed, 30 Mar 2016 12:21:47 +0000 (08:21 -0400)]
Merge pull request #8335 from liewegas/wip-13992
mon/MonClient: fix shutdown race
Reviewed-by: Kefu Chai <kchai@redhat.com>
Mykola Golub [Wed, 30 Mar 2016 11:39:37 +0000 (14:39 +0300)]
cls::rbd: read_peers: update last_read on next cls_cxx_map_get_vals
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
John Spray [Wed, 30 Mar 2016 10:43:22 +0000 (11:43 +0100)]
qa: update rest test cephfs calls
Since the ceph task was already creating filesystems
during setup, I presume that these calls only ever
worked when they were using the same names as
the existing filesystem.
Fixes: http://tracker.ceph.com/issues/15309
Signed-off-by: John Spray <john.spray@redhat.com>
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>
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>
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>
Kefu Chai [Wed, 30 Mar 2016 06:47:34 +0000 (14:47 +0800)]
Merge pull request #7857 from tchaikov/wip-14844
ceph.spec.in: enable lttng and babeltrace explicitly
thanks to ktdreyer, we have lttng and babel in EPEL-7 now.
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Kefu Chai [Wed, 30 Mar 2016 06:16:04 +0000 (14:16 +0800)]
cmake: add StandardPolicy.cc to librbd
fixes the librbd build.
Signed-off-by: Kefu Chai <kchai@redhat.com>
runsisi [Tue, 29 Mar 2016 12:26:21 +0000 (20:26 +0800)]
rbd-mirror: fix missing increment of iterators
Signed-off-by: runsisi <runsisi@hust.edu.cn>
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>
Sage Weil [Wed, 30 Mar 2016 01:08:31 +0000 (21:08 -0400)]
test/pybind/test_rados: force setting readonly cache mode
Signed-off-by: Sage Weil <sage@redhat.com>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Sage Weil [Tue, 29 Mar 2016 19:04:16 +0000 (15:04 -0400)]
Merge remote-tracking branch 'gh/jewel'