RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-30 06:53:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20507 from trociny/wip-remote-rename

Browse Source 
librbd: make rename request complete with filtered code

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2018-02-26 23:20:24 -05:00 committed by GitHub
commit 698b6f8486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librbd/operation/RenameRequest.cc
View File

@ -64,7 +64,7 @@ bool RenameRequest<I>::should_complete(int r) {
CephContext *cct = image_ctx.cct;
ldout(cct, 5) << this << " " << __func__ << ": state=" << m_state << ", "
<< "r=" << r << dendl;
r = filter_state_return_code(r);
r = filter_return_code(r);
if (r < 0) {
if (r == -EEXIST) {
ldout(cct, 1) << "image already exists" << dendl;
@ -100,7 +100,7 @@ bool RenameRequest<I>::should_complete(int r) {
}
template <typename I>
int RenameRequest<I>::filter_state_return_code(int r) {
int RenameRequest<I>::filter_return_code(int r) const {
I &image_ctx = this->m_image_ctx;
CephContext *cct = image_ctx.cct;

3
src/librbd/operation/RenameRequest.h
View File

@ -57,6 +57,7 @@ public:
protected:
void send_op() override;
bool should_complete(int r) override;
int filter_return_code(int r) const override;
journal::Event create_event(uint64_t op_tid) const override {
return journal::RenameEvent(op_tid, m_dest_name);
@ -72,8 +73,6 @@ private:
bufferlist m_header_bl;
int filter_state_return_code(int r);
void send_read_source_header();
void send_write_destination_header();
void send_update_directory();

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

@ -4555,7 +4555,7 @@ TEST_F(TestLibRBD, RebuildObjectMapViaLockOwner)
TEST_F(TestLibRBD, RenameViaLockOwner)
{
REQUIRE_FEATURE(RBD_FEATURE_LAYERING | RBD_FEATURE_EXCLUSIVE_LOCK);
REQUIRE_FEATURE(RBD_FEATURE_JOURNALING);
librados::IoCtx ioctx;
ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx));
@ -4587,7 +4587,7 @@ TEST_F(TestLibRBD, RenameViaLockOwner)
TEST_F(TestLibRBD, SnapCreateViaLockOwner)
{
REQUIRE_FEATURE(RBD_FEATURE_LAYERING | RBD_FEATURE_EXCLUSIVE_LOCK);
REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK);
librados::IoCtx ioctx;
ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx));
@ -4631,7 +4631,7 @@ TEST_F(TestLibRBD, SnapCreateViaLockOwner)
TEST_F(TestLibRBD, SnapRemoveViaLockOwner)
{
REQUIRE_FEATURE(RBD_FEATURE_LAYERING | RBD_FEATURE_EXCLUSIVE_LOCK);
REQUIRE_FEATURE(RBD_FEATURE_FAST_DIFF);
librados::IoCtx ioctx;
ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx));