From: Jason Dillaman Date: Wed, 29 Apr 2020 22:10:47 +0000 (-0400) Subject: librbd: refresh image IO dispatch layer X-Git-Tag: v17.0.0~2350^2~16 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f5cef52512b28b82e6af5f268bebb2b7151db073;p=ceph.git librbd: refresh image IO dispatch layer This layer will handle refreshing the image if required upon incoming IO requests. Signed-off-by: Jason Dillaman --- diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt index ef9e1baf7310b..c7fe73f02ab3e 100644 --- a/src/librbd/CMakeLists.txt +++ b/src/librbd/CMakeLists.txt @@ -84,6 +84,7 @@ set(librbd_internal_srcs io/ObjectRequest.cc io/QosImageDispatch.cc io/ReadResult.cc + io/RefreshImageDispatch.cc io/SimpleSchedulerObjectDispatch.cc io/Utils.cc journal/CreateRequest.cc diff --git a/src/librbd/io/ImageDispatcher.cc b/src/librbd/io/ImageDispatcher.cc index f4fdca25a8a96..d48016d8c876a 100644 --- a/src/librbd/io/ImageDispatcher.cc +++ b/src/librbd/io/ImageDispatcher.cc @@ -12,6 +12,7 @@ #include "librbd/io/ImageDispatchInterface.h" #include "librbd/io/ImageDispatchSpec.h" #include "librbd/io/QosImageDispatch.h" +#include "librbd/io/RefreshImageDispatch.h" #include #define dout_subsys ceph_subsys_rbd @@ -107,6 +108,9 @@ ImageDispatcher::ImageDispatcher(I* image_ctx) m_qos_image_dispatch = new QosImageDispatch(image_ctx); this->register_dispatch(m_qos_image_dispatch); + + auto refresh_image_dispatch = new RefreshImageDispatch(image_ctx); + this->register_dispatch(refresh_image_dispatch); } template diff --git a/src/librbd/io/RefreshImageDispatch.cc b/src/librbd/io/RefreshImageDispatch.cc new file mode 100644 index 0000000000000..4632660ad8382 --- /dev/null +++ b/src/librbd/io/RefreshImageDispatch.cc @@ -0,0 +1,155 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab + +#include "librbd/io/RefreshImageDispatch.h" +#include "common/dout.h" +#include "librbd/ImageCtx.h" +#include "librbd/ImageState.h" +#include + +#define dout_subsys ceph_subsys_rbd +#undef dout_prefix +#define dout_prefix *_dout << "librbd::io::RefreshImageDispatch: " << this \ + << " " << __func__ << ": " + +namespace librbd { +namespace io { + +template +RefreshImageDispatch::RefreshImageDispatch(I* image_ctx) + : m_image_ctx(image_ctx) { + auto cct = m_image_ctx->cct; + ldout(cct, 5) << "ictx=" << image_ctx << dendl; +} + +template +void RefreshImageDispatch::shut_down(Context* on_finish) { + on_finish->complete(0); +} + +template +bool RefreshImageDispatch::read( + AioCompletion* aio_comp, Extents &&image_extents, ReadResult &&read_result, + int op_flags, const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) { + auto cct = m_image_ctx->cct; + ldout(cct, 20) << "tid=" << tid << ", image_extents=" << image_extents + << dendl; + + if (needs_refresh(dispatch_result, on_dispatched)) { + return true; + } + + return false; +} + +template +bool RefreshImageDispatch::write( + AioCompletion* aio_comp, Extents &&image_extents, bufferlist &&bl, + int op_flags, const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) { + auto cct = m_image_ctx->cct; + ldout(cct, 20) << "tid=" << tid << ", image_extents=" << image_extents + << dendl; + + if (needs_refresh(dispatch_result, on_dispatched)) { + return true; + } + + return false; +} + +template +bool RefreshImageDispatch::discard( + AioCompletion* aio_comp, Extents &&image_extents, + uint32_t discard_granularity_bytes, const ZTracer::Trace &parent_trace, + uint64_t tid, std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) { + auto cct = m_image_ctx->cct; + ldout(cct, 20) << "tid=" << tid << ", image_extents=" << image_extents + << dendl; + + if (needs_refresh(dispatch_result, on_dispatched)) { + return true; + } + + return false; +} + +template +bool RefreshImageDispatch::write_same( + AioCompletion* aio_comp, Extents &&image_extents, bufferlist &&bl, + int op_flags, const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) { + auto cct = m_image_ctx->cct; + ldout(cct, 20) << "tid=" << tid << ", image_extents=" << image_extents + << dendl; + + if (needs_refresh(dispatch_result, on_dispatched)) { + return true; + } + + return false; +} + +template +bool RefreshImageDispatch::compare_and_write( + AioCompletion* aio_comp, Extents &&image_extents, bufferlist &&cmp_bl, + bufferlist &&bl, uint64_t *mismatch_offset, int op_flags, + const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) { + auto cct = m_image_ctx->cct; + ldout(cct, 20) << "tid=" << tid << ", image_extents=" << image_extents + << dendl; + + if (needs_refresh(dispatch_result, on_dispatched)) { + return true; + } + + return false; +} + +template +bool RefreshImageDispatch::flush( + AioCompletion* aio_comp, FlushSource flush_source, + const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) { + auto cct = m_image_ctx->cct; + ldout(cct, 20) << "tid=" << tid << dendl; + + if (flush_source != FLUSH_SOURCE_USER) { + return false; + } + + if (needs_refresh(dispatch_result, on_dispatched)) { + return true; + } + + return false; +} + +template +bool RefreshImageDispatch::needs_refresh( + DispatchResult* dispatch_result, Context* on_dispatched) { + auto cct = m_image_ctx->cct; + + if (m_image_ctx->state->is_refresh_required()) { + ldout(cct, 15) << "on_dispatched=" << on_dispatched << dendl; + + *dispatch_result = DISPATCH_RESULT_CONTINUE; + m_image_ctx->state->refresh(on_dispatched); + return true; + } + + return false; +} + +} // namespace io +} // namespace librbd + +template class librbd::io::RefreshImageDispatch; diff --git a/src/librbd/io/RefreshImageDispatch.h b/src/librbd/io/RefreshImageDispatch.h new file mode 100644 index 0000000000000..154ff64b07521 --- /dev/null +++ b/src/librbd/io/RefreshImageDispatch.h @@ -0,0 +1,84 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab + +#ifndef CEPH_LIBRBD_IO_REFRESH_IMAGE_DISPATCH_H +#define CEPH_LIBRBD_IO_REFRESH_IMAGE_DISPATCH_H + +#include "librbd/io/ImageDispatchInterface.h" +#include "include/int_types.h" +#include "include/buffer.h" +#include "common/zipkin_trace.h" +#include "common/Throttle.h" +#include "librbd/io/ReadResult.h" +#include "librbd/io/Types.h" + +struct Context; + +namespace librbd { + +struct ImageCtx; + +namespace io { + +struct AioCompletion; + +template +class RefreshImageDispatch : public ImageDispatchInterface { +public: + RefreshImageDispatch(ImageCtxT* image_ctx); + + ImageDispatchLayer get_dispatch_layer() const override { + return IMAGE_DISPATCH_LAYER_REFRESH; + } + + void shut_down(Context* on_finish) override; + + bool read( + AioCompletion* aio_comp, Extents &&image_extents, + ReadResult &&read_result, int op_flags, + const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) override; + bool write( + AioCompletion* aio_comp, Extents &&image_extents, bufferlist &&bl, + int op_flags, const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) override; + bool discard( + AioCompletion* aio_comp, Extents &&image_extents, + uint32_t discard_granularity_bytes, + const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) override; + bool write_same( + AioCompletion* aio_comp, Extents &&image_extents, bufferlist &&bl, + int op_flags, const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) override; + bool compare_and_write( + AioCompletion* aio_comp, Extents &&image_extents, bufferlist &&cmp_bl, + bufferlist &&bl, uint64_t *mismatch_offset, int op_flags, + const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) override; + bool flush( + AioCompletion* aio_comp, FlushSource flush_source, + const ZTracer::Trace &parent_trace, uint64_t tid, + std::atomic* image_dispatch_flags, + DispatchResult* dispatch_result, Context* on_dispatched) override; + + void handle_finished(int r, uint64_t tid) override {} + +private: + ImageCtxT* m_image_ctx; + + bool needs_refresh(DispatchResult* dispatch_result, Context* on_dispatched); + +}; + +} // namespace io +} // namespace librbd + +extern template class librbd::io::RefreshImageDispatch; + +#endif // CEPH_LIBRBD_IO_REFRESH_IMAGE_DISPATCH_H