RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6344 from dillaman/wip-13559-infernalis

Browse Source 
librbd: potential assertion failure during cache read

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Jason Dillaman 2015-10-30 23:41:34 -04:00
commit 04a486dfde
3 changed files with 66 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librbd/LibrbdWriteback.cc
View File

@ -45,15 +45,18 @@ namespace librbd {
* @param c context to finish
* @param l mutex to lock
*/
class C_Request : public Context {
class C_ReadRequest : public Context {
public:
C_Request(CephContext *cct, Context *c, Mutex *l)
: m_cct(cct), m_ctx(c), m_lock(l) {}
virtual ~C_Request() {}
C_ReadRequest(CephContext *cct, Context *c, RWLock *owner_lock,
Mutex *cache_lock)
: m_cct(cct), m_ctx(c), m_owner_lock(owner_lock),
m_cache_lock(cache_lock) {
}
virtual void finish(int r) {
ldout(m_cct, 20) << "aio_cb completing " << dendl;
{
Mutex::Locker l(*m_lock);
RWLock::RLocker owner_locker(*m_owner_lock);
Mutex::Locker cache_locker(*m_cache_lock);
m_ctx->complete(r);
}
ldout(m_cct, 20) << "aio_cb finished" << dendl;
@ -61,7 +64,8 @@ namespace librbd {
private:
CephContext *m_cct;
Context *m_ctx;
Mutex *m_lock;
RWLock *m_owner_lock;
Mutex *m_cache_lock;
};
class C_OrderedWrite : public Context {
@ -105,7 +109,8 @@ namespace librbd {
__u32 trunc_seq, int op_flags, Context *onfinish)
{
// on completion, take the mutex and then call onfinish.
Context *req = new C_Request(m_ictx->cct, onfinish, &m_lock);
Context *req = new C_ReadRequest(m_ictx->cct, onfinish, &m_ictx->owner_lock,
&m_lock);
{
if (!m_ictx->object_map.object_may_exist(object_no)) {

2
src/librbd/internal.cc
View File

@ -3778,6 +3778,8 @@ reprotect_and_return_err:
return;
}
RWLock::RLocker owner_locker(ictx->owner_lock);
// readahead
if (ictx->object_cacher && ictx->readahead_max_bytes > 0 &&
!(op_flags & LIBRADOS_OP_FLAG_FADVISE_RANDOM)) {

52
src/test/librbd/test_librbd.cc
View File

@ -3213,3 +3213,55 @@ TEST_F(TestLibRBD, ExclusiveLockTransition)
ASSERT_PASSED(validate_object_map, image2);
ASSERT_PASSED(validate_object_map, image3);
}
TEST_F(TestLibRBD, CacheMayCopyOnWrite) {
REQUIRE_FEATURE(RBD_FEATURE_LAYERING);
librados::IoCtx ioctx;
ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx));
librbd::RBD rbd;
std::string name = get_temp_image_name();
uint64_t size = 1 << 18;
int order = 12;
ASSERT_EQ(0, create_image_pp(rbd, ioctx, name.c_str(), size, &order));
librbd::Image image;
ASSERT_EQ(0, rbd.open(ioctx, image, name.c_str(), NULL));
ASSERT_EQ(0, image.snap_create("one"));
ASSERT_EQ(0, image.snap_protect("one"));
std::string clone_name = this->get_temp_image_name();
ASSERT_EQ(0, rbd.clone(ioctx, name.c_str(), "one", ioctx, clone_name.c_str(),
RBD_FEATURE_LAYERING, &order));
librbd::Image clone;
ASSERT_EQ(0, rbd.open(ioctx, clone, clone_name.c_str(), NULL));
ASSERT_EQ(0, clone.flush());
bufferlist expect_bl;
expect_bl.append(std::string(1024, '\0'));
// test double read path
bufferlist read_bl;
uint64_t offset = 0;
ASSERT_EQ(1024, clone.read(offset + 2048, 1024, read_bl));
ASSERT_TRUE(expect_bl.contents_equal(read_bl));
bufferlist write_bl;
write_bl.append(std::string(1024, '1'));
ASSERT_EQ(1024, clone.write(offset, write_bl.length(), write_bl));
read_bl.clear();
ASSERT_EQ(1024, clone.read(offset + 2048, 1024, read_bl));
ASSERT_TRUE(expect_bl.contents_equal(read_bl));
// test read retry path
offset = 1 << order;
ASSERT_EQ(1024, clone.write(offset, write_bl.length(), write_bl));
read_bl.clear();
ASSERT_EQ(1024, clone.read(offset + 2048, 1024, read_bl));
ASSERT_TRUE(expect_bl.contents_equal(read_bl));
}