RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: add "migration" trash image source

Browse Source 
Signed-off-by: Mykola Golub <mgolub@suse.com>
This commit is contained in:
Mykola Golub 2017-11-29 21:10:57 +02:00 committed by Jason Dillaman
parent 431b443718
commit ad4809bab2
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/rbd/librbd.h
View File

@ -212,7 +212,8 @@ enum {
typedef enum {
RBD_TRASH_IMAGE_SOURCE_USER = 0,
RBD_TRASH_IMAGE_SOURCE_MIRRORING = 1
RBD_TRASH_IMAGE_SOURCE_MIRRORING = 1,
RBD_TRASH_IMAGE_SOURCE_MIGRATION = 2
} rbd_trash_image_source_t;
typedef struct {

3
src/pybind/rbd/rbd.pyx
View File

@ -166,7 +166,8 @@ cdef extern from "rbd/librbd.h" nogil:
ctypedef enum rbd_trash_image_source_t:
_RBD_TRASH_IMAGE_SOURCE_USER "RBD_TRASH_IMAGE_SOURCE_USER",
_RBD_TRASH_IMAGE_SOURCE_MIRRORING "RBD_TRASH_IMAGE_SOURCE_MIRRORING"
_RBD_TRASH_IMAGE_SOURCE_MIRRORING "RBD_TRASH_IMAGE_SOURCE_MIRRORING",
_RBD_TRASH_IMAGE_SOURCE_MIGRATION "RBD_TRASH_IMAGE_SOURCE_MIGRATION"
ctypedef struct rbd_trash_image_info_t:
char *id

3
src/tools/rbd/action/Trash.cc
View File

@ -268,6 +268,9 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool long_flag,
case RBD_TRASH_IMAGE_SOURCE_MIRRORING:
del_source = "MIRRORING";
break;
case RBD_TRASH_IMAGE_SOURCE_MIGRATION:
del_source = "MIGRATION";
break;
}
std::string time_str = ctime(&entry.deletion_time);