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

luminous: librbd: remove consistency group rbd cli and API support #16875

Merged
merged 1 commit into from Aug 8, 2017
Merged

luminous: librbd: remove consistency group rbd cli and API support #16875

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
49 changes: 0 additions & 49 deletions src/include/rbd/librbd.h
View file
Open in desktop
Expand Up @@ -142,26 +142,6 @@ typedef struct {
bool up;
} rbd_mirror_image_status_t;

typedef enum {
GROUP_IMAGE_STATE_ATTACHED,
GROUP_IMAGE_STATE_INCOMPLETE
} rbd_group_image_state_t;

typedef struct {
char *name;
int64_t pool;
} rbd_group_image_spec_t;

typedef struct {
rbd_group_image_spec_t spec;
rbd_group_image_state_t state;
} rbd_group_image_status_t;

typedef struct {
char *name;
int64_t pool;
} rbd_group_spec_t;

typedef enum {
RBD_LOCK_MODE_EXCLUSIVE = 0,
RBD_LOCK_MODE_SHARED = 1,
Expand Down Expand Up @@ -820,11 +800,6 @@ CEPH_RBD_API int rbd_aio_mirror_image_get_status(rbd_image_t image,
size_t status_size,
rbd_completion_t c);

// RBD consistency groups support functions
CEPH_RBD_API int rbd_group_create(rados_ioctx_t p, const char *name);
CEPH_RBD_API int rbd_group_remove(rados_ioctx_t p, const char *name);
CEPH_RBD_API int rbd_group_list(rados_ioctx_t p, char *names, size_t *size);

/**
* Register an image metadata change watcher.
*
Expand All @@ -846,30 +821,6 @@ CEPH_RBD_API int rbd_update_watch(rbd_image_t image, uint64_t *handle,
*/
CEPH_RBD_API int rbd_update_unwatch(rbd_image_t image, uint64_t handle);


CEPH_RBD_API int rbd_group_image_add(
rados_ioctx_t group_p, const char *group_name,
rados_ioctx_t image_p, const char *image_name);
CEPH_RBD_API int rbd_group_image_remove(
rados_ioctx_t group_p, const char *group_name,
rados_ioctx_t image_p, const char *image_name);
CEPH_RBD_API int rbd_group_image_remove_by_id(
rados_ioctx_t group_p, const char *group_name,
rados_ioctx_t image_p, const char *image_id);
CEPH_RBD_API int rbd_group_image_list(
rados_ioctx_t group_p, const char *group_name,
rbd_group_image_status_t *images,
size_t *image_size);
CEPH_RBD_API int rbd_image_get_group(rados_ioctx_t image_p,
const char *image_name,
rbd_group_spec_t *group_spec);
CEPH_RBD_API void rbd_group_spec_cleanup(rbd_group_spec_t *group_spec);
CEPH_RBD_API void rbd_group_image_status_cleanup(
rbd_group_image_status_t *image
);
CEPH_RBD_API void rbd_group_image_status_list_cleanup(
rbd_group_image_status_t *images,
size_t len);
#ifdef __cplusplus
}
#endif
Expand Down
28 changes: 0 additions & 28 deletions src/include/rbd/librbd.hpp
View file
Open in desktop
Expand Up @@ -71,19 +71,6 @@ namespace librbd {
bool up;
} mirror_image_status_t;

typedef rbd_group_image_state_t group_image_state_t;

typedef struct {
std::string name;
int64_t pool;
group_image_state_t state;
} group_image_status_t;

typedef struct {
std::string name;
int64_t pool;
} group_spec_t;

typedef rbd_image_info_t image_info_t;

class CEPH_RBD_API ProgressContext
Expand Down Expand Up @@ -185,20 +172,6 @@ class CEPH_RBD_API RBD
int mirror_image_status_summary(IoCtx& io_ctx,
std::map<mirror_image_status_state_t, int> *states);

// RBD consistency groups support functions
int group_create(IoCtx& io_ctx, const char *group_name);
int group_remove(IoCtx& io_ctx, const char *group_name);
int group_list(IoCtx& io_ctx, std::vector<std::string> *names);

int group_image_add(IoCtx& io_ctx, const char *group_name,
IoCtx& image_io_ctx, const char *image_name);
int group_image_remove(IoCtx& io_ctx, const char *group_name,
IoCtx& image_io_ctx, const char *image_name);
int group_image_remove_by_id(IoCtx& io_ctx, const char *group_name,
IoCtx& image_io_ctx, const char *image_id);
int group_image_list(IoCtx& io_ctx, const char *group_name,
std::vector<group_image_status_t> *images);

private:
/* We don't allow assignment or copying */
RBD(const RBD& rhs);
Expand Down Expand Up @@ -259,7 +232,6 @@ class CEPH_RBD_API Image
std::string *parent_id, std::string *parent_snapname);
int old_format(uint8_t *old);
int size(uint64_t *size);
int get_group(group_spec_t *group_spec);
int features(uint64_t *features);
int update_features(uint64_t features, bool enabled);
int overlap(uint64_t *overlap);
Expand Down
1 change: 0 additions & 1 deletion src/librbd/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -22,7 +22,6 @@ set(librbd_internal_srcs
Utils.cc
Watcher.cc
api/DiffIterate.cc
api/Group.cc
api/Image.cc
api/Mirror.cc
cache/ImageWriteback.cc
Expand Down