From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 11 Jan 2019 19:43:08 +0000 (-0500)
Subject: Merge pull request #24427 from thmour/thmour_api_purge
X-Git-Tag: v14.1.0~424
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fad75f10f4c5f30fae7d809132dc91856df7310b;p=ceph.git

Merge pull request #24427 from thmour/thmour_api_purge

librbd: add trash purge api calls

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

fad75f10f4c5f30fae7d809132dc91856df7310b
diff --cc src/librbd/api/Trash.h
index 34f69f498cb5c,f2e52f6cbeb1d..23382453f1492
--- a/src/librbd/api/Trash.h
+++ b/src/librbd/api/Trash.h
@@@ -27,10 -27,11 +27,12 @@@ struct Trash 
                   trash_image_info_t *info);
    static int list(librados::IoCtx &io_ctx,
                    std::vector<trash_image_info_t> &entries);
+   static int purge(IoCtx& io_ctx, time_t expire_ts,
+                    float threshold, ProgressContext& pctx);
    static int remove(librados::IoCtx &io_ctx, const std::string &image_id,
                      bool force, ProgressContext& prog_ctx);
 -  static int restore(librados::IoCtx &io_ctx, const std::string &image_id,
 +  static int restore(librados::IoCtx &io_ctx, rbd_trash_image_source_t source,
 +                     const std::string &image_id,
                       const std::string &image_new_name);
  
  };