RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 06:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,765 Commits 1 Branch 394 Tags 1.4 GiB
6f8596fc01
Commit Graph

51765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Dillaman
6f8596fc01 Merge pull request #8375 from rjfd/wip-15265 
librbd: disable image mirroring when image is removed

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-30 12:58:18 -04:00
Josh Durgin
823683c2f7 Merge pull request #8331 from sileht/sileht/rados-cython 
pybind/rados: python3 fix

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-30 09:20:19 -07:00
Ricardo Dias
bb07a1b23e rbd: rbd-mirroring: Automatically disable image mirroring when image is removed 
Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15265
 2016-03-30 17:11:10 +01:00
Jason Dillaman
f05237b93a Merge pull request #8368 from tchaikov/wip-cmake-fix-rbd 
cmake: add StandardPolicy.cc to librbd

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-30 10:49:46 -04:00
Sage Weil
d0c5490cdd Merge pull request #8337 from jmunhoz/fix-15292 
mon: remove unused variable

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
 2016-03-30 09:56:37 -04:00
Jason Dillaman
d53f9415ee Merge pull request #8352 from runsisi/wip-fix-missing-iter 
rbd-mirror: fix missing increment for iterators

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-30 08:49:55 -04:00
Jason Dillaman
fadb4cd52b 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>
 2016-03-30 08:27:22 -04:00
Sage Weil
052fa90eb7 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>
 2016-03-30 08:24:43 -04:00
Sage Weil
325520824e Merge pull request #8210 from liewegas/wip-12814 
osd: add 'proxy' cache mode

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-03-30 08:23:05 -04:00
Sage Weil
f75e4d7c10 Merge pull request #8315 from mslovy/wip-clean-pg 
osd: duplicated clear for peer_missing

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-30 08:22:46 -04:00
Sage Weil
723b46c801 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>
 2016-03-30 08:22:30 -04:00
Sage Weil
9025d9f114 Merge pull request #8335 from liewegas/wip-13992 
mon/MonClient: fix shutdown race

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-30 08:21:47 -04:00
Mykola Golub
3995cafae4 cls::rbd: read_peers: update last_read on next cls_cxx_map_get_vals 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-30 15:01:05 +03:00
Kefu Chai
dbd9bb1174 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>
 2016-03-30 14:47:34 +08:00
Kefu Chai
aacadad2a0 cmake: add StandardPolicy.cc to librbd 
fixes the librbd build.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-03-30 14:32:33 +08:00
runsisi
383d48be2f rbd-mirror: fix missing increment of iterators 
Signed-off-by: runsisi <runsisi@hust.edu.cn>
 2016-03-30 10:34:26 +08:00
Josh Durgin
5b49e9fb41 Merge pull request #8287 from dillaman/wip-15232 
rbd-mirror: initial failover / failback support

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-29 18:25:05 -07:00
Sage Weil
c7a0223f1e test/pybind/test_rados: force setting readonly cache mode 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-29 21:08:38 -04:00
Sage Weil
1ac3444626 Merge pull request #7712 from vitek/listbucket_encoding_type_fix 
rgw: S3: set EncodingType in ListBucketResult

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-29 21:07:41 -04:00
Orit Wasserman
99c6f3095c 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>
 2016-03-29 23:24:28 +02:00
Sage Weil
5318be502c Merge pull request #8362 from jdurgin/wip-ceph-python-path 
ceph.in: fix python libpath for automake as well
 2016-03-29 15:46:52 -04:00
Samuel Just
4810928bdf 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>
 2016-03-29 12:46:14 -07:00
Casey Bodley
23336a3c7c 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>
 2016-03-29 15:26:31 -04:00
Sage Weil
e3dc7c772f os/ObjectStore: fix _update_op for split dest_cid 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-29 15:24:59 -04:00
Jason Dillaman
ded7a77931 qa/workunits/rbd: add basic failover/fallback test case 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:26 -04:00
Jason Dillaman
9665b5b276 rbd-mirror: use 32bit image creation bid to avoid overflow 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:26 -04:00
Jason Dillaman
4c2747fba1 rbd-mirror: initial support for primary/non-primary handling 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:26 -04:00
Jason Dillaman
a6eaa837c8 librbd: accessor for journal tag data 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:26 -04:00
Jason Dillaman
3f15853f29 librbd: link primary mirror uuid to non-primary journal tag 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
882bc06f54 rbd-mirror: update mirror peer sync state after completion 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
668b41d1e8 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>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
276e2eb21b rbd-mirror: allocate local journal tags from mirror remote peer tags 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
bdee02cb57 journal: helper method for retrieving tag struct 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
4adc57ecfb rbd: use consistent "non-primary" verbiage for image mirroring 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
04892961d2 librbd: image demotion should record new demote journal event 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
970a17368a 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>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
e1c61f59ae 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>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
f42e7610fb rbd-mirror: framework for replay allocating tags in local journal 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
5de360dd64 librbd: journal reset should re-register the local client 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
d624e65a30 rbd-mirror: cleanup debug log messages 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
476da1011c rbd-mirror: cross-reference local image via global image id 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
909eb43d73 cls_rbd: mirroring directory reverse lookup from global id to image id 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
347349c3f5 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>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
6541e3566a rbd-mirror: fix state output stream formatter 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
7a3ffc9d70 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>
 2016-03-29 15:19:25 -04:00
Jason Dillaman
f01efc8ce6 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>
 2016-03-29 15:12:29 -04:00
Jason Dillaman
511039eca9 rbd-mirror: tweaks to support creating mock test cases 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:12:29 -04:00
Jason Dillaman
8e8deb35a2 rbd-mirror: bootstrap now has initial support for existing images 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:12:29 -04:00
Jason Dillaman
d9ee1e7270 rbd-mirror: properly initialize image copy start/end objects 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-29 15:12:29 -04:00
Jason Dillaman
18e849f01c 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>
 2016-03-29 15:12:29 -04:00