RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 02:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9459 from dillaman/wip-16123

Browse Source 
test/rbd: fsx needs to shut down the journal

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
This commit is contained in:
Mykola Golub 2016-06-06 10:20:54 +03:00
commit 430e025984
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/librbd/fsx.cc
View File

@ -54,6 +54,8 @@
#include "journal/ReplayEntry.h"
#include "journal/ReplayHandler.h"
#include <boost/scope_exit.hpp>
#define NUMPRINTCOLUMNS 32 /* # columns of data to print on each line */
/*
@ -395,6 +397,10 @@ int replay_journal(rados_ioctx_t ioctx, const char *image_name,
journal::Journaler journaler(io_ctx, image_id, JOURNAL_CLIENT_ID, 0);
C_SaferCond init_ctx;
journaler.init(&init_ctx);
BOOST_SCOPE_EXIT_ALL( (&journaler) ) {
journaler.shut_down();
};
r = init_ctx.wait();
if (r < 0) {
simple_err("failed to initialize journal", r);
@ -402,8 +408,13 @@ int replay_journal(rados_ioctx_t ioctx, const char *image_name,
}
journal::Journaler replay_journaler(io_ctx, replay_image_id, "", 0);
C_SaferCond replay_init_ctx;
replay_journaler.init(&replay_init_ctx);
BOOST_SCOPE_EXIT_ALL( (&replay_journaler) ) {
replay_journaler.shut_down();
};
r = replay_init_ctx.wait();
if (r < 0) {
simple_err("failed to initialize replay journal", r);