From 60b31cd919f1f0aa2811b9bb4501ca8db2bef8c7 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 8 Oct 2018 10:46:18 -0400
Subject: [PATCH] librbd: optionally move image to trash when removed by user

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 src/common/options.cc   |  8 ++++++++
 src/librbd/api/Image.cc | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/common/options.cc b/src/common/options.cc
index 99211a2740109..ffed4884eff31 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -6555,6 +6555,14 @@ static std::vector<Option> get_rbd_options() {
     .set_default(true)
     .set_description("automatically acquire/release exclusive lock until it is explicitly requested"),
 
+    Option("rbd_move_to_trash_on_remove", Option::TYPE_BOOL, Option::LEVEL_BASIC)
+    .set_default(false)
+    .set_description("automatically move images to the trash when deleted"),
+
+    Option("rbd_move_to_trash_on_remove_expire_seconds", Option::TYPE_UINT, Option::LEVEL_BASIC)
+    .set_default(0)
+    .set_description("default number of seconds to protect deleted images in the trash"),
+
     Option("rbd_mirroring_resync_after_disconnect", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)
     .set_description("automatically start image resync after mirroring is disconnected due to being laggy"),
diff --git a/src/librbd/api/Image.cc b/src/librbd/api/Image.cc
index 2d6fb757e6b19..c2d887e48f9da 100644
--- a/src/librbd/api/Image.cc
+++ b/src/librbd/api/Image.cc
@@ -16,6 +16,7 @@
 #include "librbd/internal.h"
 #include "librbd/Utils.h"
 #include "librbd/api/Config.h"
+#include "librbd/api/Trash.h"
 
 #define dout_subsys ceph_subsys_rbd
 #undef dout_prefix
@@ -379,6 +380,18 @@ int Image<I>::remove(IoCtx& io_ctx, const std::string &image_name,
   CephContext *cct((CephContext *)io_ctx.cct());
   ldout(cct, 20) << (image_id.empty() ? image_name : image_id) << dendl;
 
+  if (image_id.empty()) {
+    // id will only be supplied when used internally
+    ConfigProxy config(cct->_conf);
+    Config<I>::apply_pool_overrides(io_ctx, &config);
+
+    if (config.get_val<bool>("rbd_move_to_trash_on_remove")) {
+      return Trash<I>::move(
+        io_ctx, RBD_TRASH_IMAGE_SOURCE_USER, image_name,
+        config.get_val<uint64_t>("rbd_move_to_trash_on_remove_expire_seconds"));
+    }
+  }
+
   ThreadPool *thread_pool;
   ContextWQ *op_work_queue;
   ImageCtx::get_thread_pool_instance(cct, &thread_pool, &op_work_queue);
-- 
2.39.5