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

librbd: asynchronous clone state machine #12041

Merged
merged 6 commits into from
Mar 21, 2017
Merged

librbd: asynchronous clone state machine #12041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
354e84d
cls_rbd_client: support asynchronous add_child.
yangdongsheng Nov 17, 2016
71d3e68
rbd: introduce a new constructor for ImageOptions
yangdongsheng Mar 14, 2017
4cc5b92
librbd: Asynchronous image clone
yangdongsheng Nov 17, 2016
c5af5f4
librbd: use CloneRequest in librbd::clone
yangdongsheng Nov 17, 2016
372e848
rbd-mirror: use asynchrorous CloneRequest
yangdongsheng Dec 6, 2016
8283cb5
rbd-mirror: fix the unittest for new CloneRequest
yangdongsheng Dec 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/cls/rbd/cls_rbd_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,13 +411,21 @@ namespace librbd {
int add_child(librados::IoCtx *ioctx, const std::string &oid,
const ParentSpec &pspec, const std::string &c_imageid)
{
bufferlist in, out;
librados::ObjectWriteOperation op;
add_child(&op, pspec, c_imageid);
return ioctx->operate(oid, &op);
}

void add_child(librados::ObjectWriteOperation *op,
const ParentSpec pspec, const std::string &c_imageid)
{
bufferlist in;
::encode(pspec.pool_id, in);
::encode(pspec.image_id, in);
::encode(pspec.snap_id, in);
::encode(c_imageid, in);

return ioctx->exec(oid, "rbd", "add_child", in, out);
op->exec("rbd", "add_child", in);
}

void remove_child(librados::ObjectWriteOperation *op,
Expand Down
2 changes: 2 additions & 0 deletions src/cls/rbd/cls_rbd_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ namespace librbd {
void remove_parent(librados::ObjectWriteOperation *op);
int add_child(librados::IoCtx *ioctx, const std::string &oid,
const ParentSpec &pspec, const std::string &c_imageid);
void add_child(librados::ObjectWriteOperation *op,
const ParentSpec pspec, const std::string &c_imageid);
void remove_child(librados::ObjectWriteOperation *op,
const ParentSpec &pspec, const std::string &c_imageid);
int remove_child(librados::IoCtx *ioctx, const std::string &oid,
Expand Down
1 change: 1 addition & 0 deletions src/include/rbd/librbd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ class CEPH_RBD_API ImageOptions {
public:
ImageOptions();
ImageOptions(rbd_image_options_t opts);
ImageOptions(const ImageOptions &imgopts);
~ImageOptions();

int set(int optname, const std::string& optval);
Expand Down
1 change: 1 addition & 0 deletions src/librbd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ set(librbd_internal_srcs
exclusive_lock/PostAcquireRequest.cc
exclusive_lock/PreReleaseRequest.cc
exclusive_lock/StandardPolicy.cc
image/CloneRequest.cc
image/CloseRequest.cc
image/CreateRequest.cc
image/OpenRequest.cc
Expand Down
Loading