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 #9140 from zhouyuan/fix_disable_journaling

Browse Source 
librbd: close journal before removing

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-05-20 08:22:56 -04:00
commit 6a40444d77
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librbd/internal.cc
View File

@ -1800,6 +1800,15 @@ remove_mirroring_image:
}
}
C_SaferCond cond;
ictx->journal->close(&cond);
r = cond.wait();
if (r < 0) {
lderr(cct) << "error closing image journal: " << cpp_strerror(r)
<< dendl;
return r;
}
r = Journal<>::remove(ictx->md_ctx, ictx->id);
if (r < 0) {
lderr(cct) << "error removing image journal: " << cpp_strerror(r)