Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jewel: librbd: prevent self-blacklisting during break lock #17412

Merged
merged 1 commit into from Sep 11, 2017
Merged

jewel: librbd: prevent self-blacklisting during break lock #17412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/librbd/exclusive_lock/BreakRequest.cc
View file
Open in desktop
Expand Up @@ -112,7 +112,16 @@ void BreakRequest<I>::send_blacklist() {
}

CephContext *cct = m_image_ctx.cct;
ldout(cct, 10) << dendl;
entity_name_t entity_name = entity_name_t::CLIENT(
m_image_ctx.md_ctx.get_instance_id());
ldout(cct, 10) << "local entity=" << entity_name << ", "
<< "locker entity=" << m_locker.entity << dendl;

if (m_locker.entity == entity_name) {
lderr(cct) << "attempting to self-blacklist" << dendl;
finish(-EINVAL);
return;
}

// TODO: need async version of RadosClient::blacklist_add
using klass = BreakRequest<I>;
Expand Down
6 changes: 6 additions & 0 deletions src/test/librados_test_stub/MockTestMemIoCtxImpl.h
View file
Open in desktop
Expand Up @@ -60,6 +60,11 @@ class MockTestMemIoCtxImpl : public TestMemIoCtxImpl {
snapc);
}

MOCK_CONST_METHOD0(get_instance_id, uint64_t());
uint64_t do_get_instance_id() const {
return TestMemIoCtxImpl::get_instance_id();
}

MOCK_METHOD2(list_snaps, int(const std::string& o, snap_set_t *out_snaps));
int do_list_snaps(const std::string& o, snap_set_t *out_snaps) {
return TestMemIoCtxImpl::list_snaps(o, out_snaps);
Expand Down Expand Up @@ -143,6 +148,7 @@ class MockTestMemIoCtxImpl : public TestMemIoCtxImpl {
ON_CALL(*this, aio_watch(_, _, _, _)).WillByDefault(Invoke(this, &MockTestMemIoCtxImpl::do_aio_watch));
ON_CALL(*this, aio_unwatch(_, _)).WillByDefault(Invoke(this, &MockTestMemIoCtxImpl::do_aio_unwatch));
ON_CALL(*this, exec(_, _, _, _, _, _, _)).WillByDefault(Invoke(this, &MockTestMemIoCtxImpl::do_exec));
ON_CALL(*this, get_instance_id()).WillByDefault(Invoke(this, &MockTestMemIoCtxImpl::do_get_instance_id));
ON_CALL(*this, list_snaps(_, _)).WillByDefault(Invoke(this, &MockTestMemIoCtxImpl::do_list_snaps));
ON_CALL(*this, list_watchers(_, _)).WillByDefault(Invoke(this, &MockTestMemIoCtxImpl::do_list_watchers));
ON_CALL(*this, notify(_, _, _, _)).WillByDefault(Invoke(this, &MockTestMemIoCtxImpl::do_notify));
Expand Down
26 changes: 26 additions & 0 deletions src/test/librbd/exclusive_lock/test_mock_BreakRequest.cc
View file
Open in desktop
Expand Up @@ -72,6 +72,11 @@ class TestMockExclusiveLockBreakRequest : public TestMockFixture {
exec(mock_image_ctx.header_oid, _, StrEq("lock"), StrEq("break_lock"), _, _, _))
.WillOnce(Return(r));
}

void expect_get_instance_id(MockTestImageCtx &mock_image_ctx, uint64_t id) {
EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), get_instance_id())
.WillOnce(Return(id));
}
};

TEST_F(TestMockExclusiveLockBreakRequest, DeadLockOwner) {
Expand Down Expand Up @@ -179,6 +184,27 @@ TEST_F(TestMockExclusiveLockBreakRequest, BlacklistDisabled) {
ASSERT_EQ(0, ctx.wait());
}

TEST_F(TestMockExclusiveLockBreakRequest, BlacklistSelf) {
REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK);

librbd::ImageCtx *ictx;
ASSERT_EQ(0, open_image(m_image_name, &ictx));

MockTestImageCtx mock_image_ctx(*ictx);
expect_op_work_queue(mock_image_ctx);

InSequence seq;
expect_list_watchers(mock_image_ctx, 0, "dead client", 456);
expect_get_instance_id(mock_image_ctx, 456);

C_SaferCond ctx;
Locker locker{entity_name_t::CLIENT(456), "auto 123", "1.2.3.4:0/0", 123};
MockBreakRequest *req = MockBreakRequest::create(mock_image_ctx, locker,
true, false, &ctx);
req->send();
ASSERT_EQ(-EINVAL, ctx.wait());
}

TEST_F(TestMockExclusiveLockBreakRequest, BlacklistError) {
REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK);

Expand Down