-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request ceph#19536 from dillaman/wip-rbd-mirror-trash
rbd-mirror: support deferred deletions of mirrored images Reviewed-by: Mykola Golub <[email protected]>
- Loading branch information
Showing
52 changed files
with
4,284 additions
and
1,207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- | ||
| // vim: ts=8 sw=2 smarttab | ||
|
|
||
| #include "librbd/TrashWatcher.h" | ||
| #include "include/rbd_types.h" | ||
| #include "include/rados/librados.hpp" | ||
| #include "common/errno.h" | ||
| #include "librbd/Utils.h" | ||
| #include "librbd/watcher/Utils.h" | ||
|
|
||
| #define dout_subsys ceph_subsys_rbd | ||
| #undef dout_prefix | ||
| #define dout_prefix *_dout << "librbd::TrashWatcher: " << __func__ << ": " | ||
|
|
||
| namespace librbd { | ||
|
|
||
| using namespace trash_watcher; | ||
| using namespace watcher; | ||
|
|
||
| using librbd::util::create_rados_callback; | ||
|
|
||
| namespace { | ||
|
|
||
| static const uint64_t NOTIFY_TIMEOUT_MS = 5000; | ||
|
|
||
| } // anonymous namespace | ||
|
|
||
| template <typename I> | ||
| TrashWatcher<I>::TrashWatcher(librados::IoCtx &io_ctx, ContextWQ *work_queue) | ||
| : Watcher(io_ctx, work_queue, RBD_TRASH) { | ||
| } | ||
|
|
||
| template <typename I> | ||
| void TrashWatcher<I>::notify_image_added( | ||
| librados::IoCtx &io_ctx, const std::string& image_id, | ||
| const cls::rbd::TrashImageSpec& trash_image_spec, Context *on_finish) { | ||
| CephContext *cct = reinterpret_cast<CephContext*>(io_ctx.cct()); | ||
| ldout(cct, 20) << dendl; | ||
|
|
||
| bufferlist bl; | ||
| ::encode(NotifyMessage{ImageAddedPayload{image_id, trash_image_spec}}, bl); | ||
|
|
||
| librados::AioCompletion *comp = create_rados_callback(on_finish); | ||
| int r = io_ctx.aio_notify(RBD_TRASH, comp, bl, NOTIFY_TIMEOUT_MS, nullptr); | ||
| assert(r == 0); | ||
| comp->release(); | ||
| } | ||
|
|
||
| template <typename I> | ||
| void TrashWatcher<I>::notify_image_removed(librados::IoCtx &io_ctx, | ||
| const std::string& image_id, | ||
| Context *on_finish) { | ||
| CephContext *cct = reinterpret_cast<CephContext*>(io_ctx.cct()); | ||
| ldout(cct, 20) << dendl; | ||
|
|
||
| bufferlist bl; | ||
| ::encode(NotifyMessage{ImageRemovedPayload{image_id}}, bl); | ||
|
|
||
| librados::AioCompletion *comp = create_rados_callback(on_finish); | ||
| int r = io_ctx.aio_notify(RBD_TRASH, comp, bl, NOTIFY_TIMEOUT_MS, nullptr); | ||
| assert(r == 0); | ||
| comp->release(); | ||
| } | ||
|
|
||
| template <typename I> | ||
| void TrashWatcher<I>::handle_notify(uint64_t notify_id, uint64_t handle, | ||
| uint64_t notifier_id, bufferlist &bl) { | ||
| CephContext *cct = this->m_cct; | ||
| ldout(cct, 15) << "notify_id=" << notify_id << ", " | ||
| << "handle=" << handle << dendl; | ||
|
|
||
|
|
||
| NotifyMessage notify_message; | ||
| try { | ||
| bufferlist::iterator iter = bl.begin(); | ||
| ::decode(notify_message, iter); | ||
| } catch (const buffer::error &err) { | ||
| lderr(cct) << "error decoding image notification: " << err.what() | ||
| << dendl; | ||
| Context *ctx = new C_NotifyAck(this, notify_id, handle); | ||
| ctx->complete(0); | ||
| return; | ||
| } | ||
|
|
||
| apply_visitor(watcher::util::HandlePayloadVisitor<TrashWatcher<I>>( | ||
| this, notify_id, handle), notify_message.payload); | ||
| } | ||
|
|
||
| template <typename I> | ||
| bool TrashWatcher<I>::handle_payload(const ImageAddedPayload &payload, | ||
| Context *on_notify_ack) { | ||
| CephContext *cct = this->m_cct; | ||
| ldout(cct, 20) << dendl; | ||
| handle_image_added(payload.image_id, payload.trash_image_spec); | ||
| return true; | ||
| } | ||
|
|
||
| template <typename I> | ||
| bool TrashWatcher<I>::handle_payload(const ImageRemovedPayload &payload, | ||
| Context *on_notify_ack) { | ||
| CephContext *cct = this->m_cct; | ||
| ldout(cct, 20) << dendl; | ||
| handle_image_removed(payload.image_id); | ||
| return true; | ||
| } | ||
|
|
||
| template <typename I> | ||
| bool TrashWatcher<I>::handle_payload(const UnknownPayload &payload, | ||
| Context *on_notify_ack) { | ||
| return true; | ||
| } | ||
|
|
||
| } // namespace librbd | ||
|
|
||
| template class librbd::TrashWatcher<librbd::ImageCtx>; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- | ||
| // vim: ts=8 sw=2 smarttab | ||
|
|
||
| #ifndef CEPH_LIBRBD_TRASH_WATCHER_H | ||
| #define CEPH_LIBRBD_TRASH_WATCHER_H | ||
|
|
||
| #include "include/int_types.h" | ||
| #include "cls/rbd/cls_rbd_types.h" | ||
| #include "librbd/ImageCtx.h" | ||
| #include "librbd/Watcher.h" | ||
| #include "librbd/trash_watcher/Types.h" | ||
|
|
||
| namespace librados { class IoCtx; } | ||
|
|
||
| namespace librbd { | ||
|
|
||
| namespace watcher { | ||
| namespace util { | ||
| template <typename> struct HandlePayloadVisitor; | ||
| } // namespace util | ||
| } // namespace watcher | ||
|
|
||
| template <typename ImageCtxT = librbd::ImageCtx> | ||
| class TrashWatcher : public Watcher { | ||
| friend struct watcher::util::HandlePayloadVisitor<TrashWatcher<ImageCtxT>>; | ||
| public: | ||
| TrashWatcher(librados::IoCtx &io_ctx, ContextWQ *work_queue); | ||
|
|
||
| static void notify_image_added(librados::IoCtx &io_ctx, | ||
| const std::string& image_id, | ||
| const cls::rbd::TrashImageSpec& spec, | ||
| Context *on_finish); | ||
| static void notify_image_removed(librados::IoCtx &io_ctx, | ||
| const std::string& image_id, | ||
| Context *on_finish); | ||
|
|
||
| protected: | ||
| virtual void handle_image_added(const std::string &image_id, | ||
| const cls::rbd::TrashImageSpec& spec) = 0; | ||
| virtual void handle_image_removed(const std::string &image_id) = 0; | ||
|
|
||
| private: | ||
| void handle_notify(uint64_t notify_id, uint64_t handle, | ||
| uint64_t notifier_id, bufferlist &bl) override; | ||
|
|
||
| bool handle_payload(const trash_watcher::ImageAddedPayload &payload, | ||
| Context *on_notify_ack); | ||
| bool handle_payload(const trash_watcher::ImageRemovedPayload &payload, | ||
| Context *on_notify_ack); | ||
| bool handle_payload(const trash_watcher::UnknownPayload &payload, | ||
| Context *on_notify_ack); | ||
| }; | ||
|
|
||
| } // namespace librbd | ||
|
|
||
| extern template class librbd::TrashWatcher<librbd::ImageCtx>; | ||
|
|
||
| #endif // CEPH_LIBRBD_TRASH_WATCHER_H |
Oops, something went wrong.