]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cfed9b6 7fd230f)
Merge pull request #7906 from dillaman/wip-14869
authorJosh Durgin <jdurgin@redhat.com>
Wed, 9 Mar 2016 22:18:13 +0000 (14:18 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 9 Mar 2016 22:18:13 +0000 (14:18 -0800)
commit3d404f2e1c14a5ddb634ced2b7a2fcfefefc0d08
tree06bc4cabae0732398c8261058f95bcdc328eaca7tree | snapshot
parentcfed9b6afd4ea7f82d085ccca7697e23fbb79345commit | diff
parent7fd230f6e81fd79bdac5a82cf6fb6f3a76b614fbcommit | diff
Merge pull request #7906 from dillaman/wip-14869

journal: re-use common threads between journalers

Conflicts:
src/journal/JournalPlayer.cc
src/librbd/Journal.cc
src/test/rbd_mirror/image_replay.cc
src/tools/rbd_mirror/ImageReplayer.h
src/tools/rbd_mirror/Mirror.cc

(merged interface changes to ImageReplayer, and reduced scope for
change to JournalPlayer due to pr #7884 (wip-14663)).

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
14 files changed:
src/journal/JournalMetadata.cc diff1 | diff2 | blob | history
src/journal/JournalPlayer.cc diff1 | diff2 | blob | history
src/journal/Journaler.cc diff1 | diff2 | blob | history
src/journal/Journaler.h diff1 | diff2 | blob | history
src/librbd/Journal.cc diff1 | diff2 | blob | history
src/librbd/Journal.h diff1 | diff2 | blob | history
src/test/journal/test_JournalPlayer.cc diff1 | diff2 | blob | history
src/test/librbd/test_mock_Journal.cc diff1 | diff2 | blob | history
src/test/rbd_mirror/image_replay.cc diff1 | diff2 | blob | history
src/test/rbd_mirror/test_ImageReplayer.cc diff1 | diff2 | blob | history
src/tools/rbd_mirror/ImageReplayer.cc diff1 | diff2 | blob | history
src/tools/rbd_mirror/ImageReplayer.h diff1 | diff2 | blob | history
src/tools/rbd_mirror/Mirror.cc diff1 | diff2 | blob | history
src/tools/rbd_mirror/Replayer.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.