librbd: add "migration" trash image source

Signed-off-by: Mykola Golub <[email protected]>
zmc · Aug 14, 2018 · ad4809b · ad4809b
1 parent 431b443
commit ad4809b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/include/rbd/librbd.h b/src/include/rbd/librbd.h
@@ -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 {

diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
@@ -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

diff --git a/src/tools/rbd/action/Trash.cc b/src/tools/rbd/action/Trash.cc
@@ -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);