]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: unit tests for librbd IO work queue failure path
authorJason Dillaman <dillaman@redhat.com>
Thu, 31 Aug 2017 13:48:47 +0000 (09:48 -0400)
committerJason Dillaman <dillaman@redhat.com>
Thu, 31 Aug 2017 14:00:32 +0000 (10:00 -0400)
(derived from commit 6e23ef358f29ca65a2a6b08b133416415e117b06)

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/librbd/AioImageRequestWQ.cc
src/librbd/AioImageRequestWQ.h
src/test/Makefile-client.am
src/test/librbd/CMakeLists.txt
src/test/librbd/mock/MockExclusiveLock.h
src/test/librbd/mock/MockImageCtx.h
src/test/librbd/mock/exclusive_lock/MockPolicy.h [new file with mode: 0644]
src/test/librbd/test_mock_AioImageRequestWQ.cc [new file with mode: 0644]

index d58d38772bcca11fa1c9454116122f2f4b187fbd..79eefb27e76985c044ae9232f957c659710c9792 100644 (file)
@@ -140,7 +140,7 @@ template <typename I>
 void AioImageRequestWQ<I>::aio_read(AioCompletion *c, uint64_t off, uint64_t len,
                                    char *buf, bufferlist *pbl, int op_flags,
                                    bool native_async) {
-  c->init_time(&m_image_ctx, librbd::AIO_TYPE_READ);
+  c->init_time(util::get_image_ctx(&m_image_ctx), librbd::AIO_TYPE_READ);
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 20) << "aio_read: ictx=" << &m_image_ctx << ", "
                  << "completion=" << c << ", off=" << off << ", "
@@ -172,7 +172,7 @@ template <typename I>
 void AioImageRequestWQ<I>::aio_write(AioCompletion *c, uint64_t off, uint64_t len,
                                     const char *buf, int op_flags,
                                     bool native_async) {
-  c->init_time(&m_image_ctx, librbd::AIO_TYPE_WRITE);
+  c->init_time(util::get_image_ctx(&m_image_ctx), librbd::AIO_TYPE_WRITE);
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 20) << "aio_write: ictx=" << &m_image_ctx << ", "
                  << "completion=" << c << ", off=" << off << ", "
@@ -200,7 +200,7 @@ void AioImageRequestWQ<I>::aio_write(AioCompletion *c, uint64_t off, uint64_t le
 template <typename I>
 void AioImageRequestWQ<I>::aio_discard(AioCompletion *c, uint64_t off,
                                       uint64_t len, bool native_async) {
-  c->init_time(&m_image_ctx, librbd::AIO_TYPE_DISCARD);
+  c->init_time(util::get_image_ctx(&m_image_ctx), librbd::AIO_TYPE_DISCARD);
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 20) << "aio_discard: ictx=" << &m_image_ctx << ", "
                  << "completion=" << c << ", off=" << off << ", len=" << len
@@ -227,7 +227,7 @@ void AioImageRequestWQ<I>::aio_discard(AioCompletion *c, uint64_t off,
 
 template <typename I>
 void AioImageRequestWQ<I>::aio_flush(AioCompletion *c, bool native_async) {
-  c->init_time(&m_image_ctx, librbd::AIO_TYPE_FLUSH);
+  c->init_time(util::get_image_ctx(&m_image_ctx), librbd::AIO_TYPE_FLUSH);
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 20) << "aio_flush: ictx=" << &m_image_ctx << ", "
                  << "completion=" << c << dendl;
@@ -481,6 +481,7 @@ int AioImageRequestWQ<I>::start_in_flight_io(AioCompletion *c) {
     CephContext *cct = m_image_ctx.cct;
     lderr(cct) << "IO received on closed image" << dendl;
 
+    c->get();
     c->fail(-ESHUTDOWN);
     return false;
   }
index ba535d699cf5092e705d54908eb439ecac33a794..e4783aab09cb223260ccd8178f4edf10a8db7164 100644 (file)
@@ -24,7 +24,7 @@ enum AioDirection {
 
 template <typename ImageCtxT = librbd::ImageCtx>
 class AioImageRequestWQ
-  : protected ThreadPool::PointerWQ<AioImageRequest<ImageCtxT> > {
+  : public ThreadPool::PointerWQ<AioImageRequest<ImageCtxT> > {
 public:
   AioImageRequestWQ(ImageCtxT *image_ctx, const string &name, time_t ti,
                     ThreadPool *tp);
index 63f6db000851fb973c7d08aa51f873aef66f784a..c4345d3a5a801bfc33da3d1d5f0e6cb4a67fda4d 100644 (file)
@@ -389,6 +389,8 @@ unittest_librbd_SOURCES = \
         test/librbd/test_BlockGuard.cc \
         test/librbd/test_main.cc \
        test/librbd/test_mock_fixture.cc \
+       test/librbd/test_mock_AioImageRequest.cc \
+       test/librbd/test_mock_AioImageRequestWQ.cc \
        test/librbd/test_mock_ExclusiveLock.cc \
        test/librbd/test_mock_Journal.cc \
        test/librbd/test_mock_ObjectWatcher.cc \
index 60cf23f29a3b0b3638332b95a6399b67e946acc0..2b086bd967f70e8b328b5598feb36e34b03fa2e8 100644 (file)
@@ -19,6 +19,7 @@ set(unittest_librbd_srcs
   test_main.cc
   test_mock_fixture.cc
   test_mock_AioImageRequest.cc
+  test_mock_AioImageRequestWQ.cc
   test_mock_ExclusiveLock.cc
   test_mock_Journal.cc
   test_mock_ObjectMap.cc
index 7d8629c349f50b92f5daad84ccf1200df51e1c37..cc167a981e290e32e85f86c2a8a3dcd7ea1b6083 100644 (file)
@@ -18,6 +18,8 @@ struct MockExclusiveLock {
   MOCK_METHOD2(init, void(uint64_t features, Context*));
   MOCK_METHOD1(shut_down, void(Context*));
 
+  MOCK_METHOD1(request_lock, void(Context *));
+
   MOCK_METHOD0(reacquire_lock, void());
 };
 
index a4c7e5980ca9b055a24d8d79e6648c4f10fd6900..480917d750c5881d2d67fc3bf992f48bdbf00535 100644 (file)
@@ -78,6 +78,7 @@ struct MockImageCtx {
       aio_work_queue(new MockAioImageRequestWQ()),
       op_work_queue(new MockContextWQ()),
       readahead_max_bytes(image_ctx.readahead_max_bytes),
+      event_socket(image_ctx.event_socket),
       parent(NULL), operations(new MockOperations()),
       state(new MockImageState()),
       image_watcher(NULL), object_map(NULL),
@@ -96,7 +97,8 @@ struct MockImageCtx {
       journal_max_concurrent_object_sets(
           image_ctx.journal_max_concurrent_object_sets),
       mirroring_resync_after_disconnect(
-          image_ctx.mirroring_resync_after_disconnect)
+          image_ctx.mirroring_resync_after_disconnect),
+      non_blocking_aio(image_ctx.non_blocking_aio)
   {
     md_ctx.dup(image_ctx.md_ctx);
     data_ctx.dup(image_ctx.data_ctx);
@@ -176,6 +178,8 @@ struct MockImageCtx {
   MOCK_METHOD0(notify_update, void());
   MOCK_METHOD1(notify_update, void(Context *));
 
+  MOCK_CONST_METHOD0(get_exclusive_lock_policy, exclusive_lock::Policy*());
+
   MOCK_CONST_METHOD0(get_journal_policy, journal::Policy*());
 
   MOCK_METHOD7(aio_read_from_cache, void(object_t, uint64_t, bufferlist *,
@@ -246,6 +250,8 @@ struct MockImageCtx {
   MockReadahead readahead;
   uint64_t readahead_max_bytes;
 
+  EventSocket &event_socket;
+
   MockImageCtx *parent;
   MockOperations *operations;
   MockImageState *state;
@@ -268,6 +274,7 @@ struct MockImageCtx {
   uint32_t journal_max_payload_bytes;
   int journal_max_concurrent_object_sets;
   bool mirroring_resync_after_disconnect;
+  bool non_blocking_aio;
 };
 
 } // namespace librbd
diff --git a/src/test/librbd/mock/exclusive_lock/MockPolicy.h b/src/test/librbd/mock/exclusive_lock/MockPolicy.h
new file mode 100644 (file)
index 0000000..d403568
--- /dev/null
@@ -0,0 +1,23 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#ifndef CEPH_TEST_LIBRBD_MOCK_EXCLUSIVE_LOCK_POLICY_H
+#define CEPH_TEST_LIBRBD_MOCK_EXCLUSIVE_LOCK_POLICY_H
+
+#include "librbd/exclusive_lock/Policy.h"
+#include <gmock/gmock.h>
+
+namespace librbd {
+namespace exclusive_lock {
+
+struct MockPolicy : public Policy {
+
+  MOCK_METHOD0(may_auto_request_lock, bool());
+  MOCK_METHOD1(lock_requested, int(bool));
+
+};
+
+} // namespace exclusive_lock
+} // librbd
+
+#endif
diff --git a/src/test/librbd/test_mock_AioImageRequestWQ.cc b/src/test/librbd/test_mock_AioImageRequestWQ.cc
new file mode 100644 (file)
index 0000000..10c1a8b
--- /dev/null
@@ -0,0 +1,270 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#include "test/librbd/test_mock_fixture.h"
+#include "test/librbd/test_support.h"
+#include "test/librbd/mock/MockImageCtx.h"
+#include "test/librbd/mock/exclusive_lock/MockPolicy.h"
+#include "librbd/AioImageRequestWQ.h"
+#include "librbd/AioImageRequest.h"
+
+namespace librbd {
+namespace {
+
+struct MockTestImageCtx : public MockImageCtx {
+  MockTestImageCtx(ImageCtx &image_ctx) : MockImageCtx(image_ctx) {
+  }
+};
+
+} // anonymous namespace
+
+template <>
+struct AioImageRequest<librbd::MockTestImageCtx> {
+  static AioImageRequest* s_instance;
+  AioCompletion *aio_comp;
+
+  static AioImageRequest* create_write_request(librbd::MockTestImageCtx &image_ctx,
+                                               AioCompletion *aio_comp,
+                                               uint64_t off, size_t len,
+                                               const char *buf, int op_flags) {
+    assert(s_instance != nullptr);
+    s_instance->aio_comp = aio_comp;
+    return s_instance;
+  }
+  static void aio_write(librbd::MockTestImageCtx *ictx, AioCompletion *c,
+                        uint64_t off, size_t len, const char *buf, int op_flags) {
+  }
+
+  MOCK_CONST_METHOD0(is_write_op, bool());
+  MOCK_CONST_METHOD0(start_op, void());
+  MOCK_CONST_METHOD0(send, void());
+  MOCK_CONST_METHOD1(fail, void(int));
+
+  AioImageRequest() {
+    s_instance = this;
+  }
+};
+
+namespace util {
+
+inline ImageCtx *get_image_ctx(MockTestImageCtx *image_ctx) {
+  return image_ctx->image_ctx;
+}
+
+} // namespace util
+
+} // namespace librbd
+
+template <>
+struct ThreadPool::PointerWQ<librbd::AioImageRequest<librbd::MockTestImageCtx>> {
+  typedef librbd::AioImageRequest<librbd::MockTestImageCtx> AioImageRequest;
+  static PointerWQ* s_instance;
+
+  Mutex m_lock;
+
+  PointerWQ(const std::string &name, time_t, int, ThreadPool *)
+    : m_lock(name) {
+    s_instance = this;
+  }
+  virtual ~PointerWQ() {
+  }
+
+  MOCK_METHOD0(drain, void());
+  MOCK_METHOD0(empty, bool());
+  MOCK_METHOD0(signal, void());
+  MOCK_METHOD0(process_finish, void());
+
+  MOCK_METHOD0(front, AioImageRequest*());
+  MOCK_METHOD1(requeue, void(AioImageRequest*));
+
+  MOCK_METHOD0(dequeue, void*());
+  MOCK_METHOD1(queue, void(AioImageRequest*));
+
+  void register_work_queue() {
+    // no-op
+  }
+  Mutex &get_pool_lock() {
+    return m_lock;
+  }
+
+  void* invoke_dequeue() {
+    Mutex::Locker locker(m_lock);
+    return _void_dequeue();
+  }
+  void invoke_process(AioImageRequest *image_request) {
+    process(image_request);
+  }
+
+  virtual void *_void_dequeue() {
+    return dequeue();
+  }
+  virtual void process(AioImageRequest *req) = 0;
+
+};
+
+ThreadPool::PointerWQ<librbd::AioImageRequest<librbd::MockTestImageCtx>>*
+  ThreadPool::PointerWQ<librbd::AioImageRequest<librbd::MockTestImageCtx>>::s_instance = nullptr;
+librbd::AioImageRequest<librbd::MockTestImageCtx>*
+  librbd::AioImageRequest<librbd::MockTestImageCtx>::s_instance = nullptr;
+
+#include "librbd/AioImageRequestWQ.cc"
+
+namespace librbd {
+
+using ::testing::_;
+using ::testing::InSequence;
+using ::testing::Invoke;
+using ::testing::Return;
+using ::testing::WithArg;
+
+struct TestMockAioImageRequestWQ : public TestMockFixture {
+  typedef AioImageRequestWQ<librbd::MockTestImageCtx> MockAioImageRequestWQ;
+  typedef AioImageRequest<librbd::MockTestImageCtx> MockAioImageRequest;
+
+  void expect_is_write_op(MockAioImageRequest &image_request, bool write_op) {
+    EXPECT_CALL(image_request, is_write_op()).WillOnce(Return(write_op));
+  }
+
+  void expect_signal(MockAioImageRequestWQ &image_request_wq) {
+    EXPECT_CALL(image_request_wq, signal());
+  }
+
+  void expect_queue(MockAioImageRequestWQ &image_request_wq) {
+    EXPECT_CALL(image_request_wq, queue(_));
+  }
+
+  void expect_front(MockAioImageRequestWQ &image_request_wq,
+                    MockAioImageRequest *image_request) {
+    EXPECT_CALL(image_request_wq, front()).WillOnce(Return(image_request));
+  }
+
+  void expect_is_refresh_request(MockTestImageCtx &mock_image_ctx,
+                                 bool required) {
+    EXPECT_CALL(*mock_image_ctx.state, is_refresh_required()).WillOnce(
+      Return(required));
+  }
+
+  void expect_dequeue(MockAioImageRequestWQ &image_request_wq,
+                      MockAioImageRequest *image_request) {
+    EXPECT_CALL(image_request_wq, dequeue()).WillOnce(Return(image_request));
+  }
+
+  void expect_get_exclusive_lock_policy(MockTestImageCtx &mock_image_ctx,
+                                        librbd::exclusive_lock::MockPolicy &policy) {
+    EXPECT_CALL(mock_image_ctx,
+                get_exclusive_lock_policy()).WillOnce(Return(&policy));
+  }
+
+  void expect_may_auto_request_lock(librbd::exclusive_lock::MockPolicy &policy,
+                                    bool value) {
+    EXPECT_CALL(policy, may_auto_request_lock()).WillOnce(Return(value));
+  }
+
+  void expect_request_lock(MockExclusiveLock &mock_exclusive_lock,
+                           Context **on_finish) {
+    EXPECT_CALL(mock_exclusive_lock, request_lock(_))
+      .WillOnce(Invoke([on_finish](Context *ctx) {
+                    *on_finish = ctx;
+                  }));
+  }
+
+  void expect_process_finish(MockAioImageRequestWQ &mock_image_request_wq) {
+    EXPECT_CALL(mock_image_request_wq, process_finish()).Times(1);
+  }
+
+  void expect_fail(MockAioImageRequest &mock_image_request, int r) {
+    EXPECT_CALL(mock_image_request, fail(r))
+      .WillOnce(Invoke([&mock_image_request](int r) {
+                    mock_image_request.aio_comp->get();
+                    mock_image_request.aio_comp->fail(r);
+                  }));
+  }
+
+  void expect_refresh(MockTestImageCtx &mock_image_ctx, Context **on_finish) {
+    EXPECT_CALL(*mock_image_ctx.state, refresh(_))
+      .WillOnce(Invoke([on_finish](Context *ctx) {
+                    *on_finish = ctx;
+                  }));
+  }
+};
+
+TEST_F(TestMockAioImageRequestWQ, AcquireLockError) {
+  REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK);
+
+  librbd::ImageCtx *ictx;
+  ASSERT_EQ(0, open_image(m_image_name, &ictx));
+
+  MockTestImageCtx mock_image_ctx(*ictx);
+  MockExclusiveLock mock_exclusive_lock;
+  mock_image_ctx.exclusive_lock = &mock_exclusive_lock;
+
+  InSequence seq;
+  MockAioImageRequestWQ mock_image_request_wq(&mock_image_ctx, "io", 60, nullptr);
+  expect_signal(mock_image_request_wq);
+  mock_image_request_wq.set_require_lock(AIO_DIRECTION_WRITE, true);
+
+  auto mock_image_request = new MockAioImageRequest();
+  expect_is_write_op(*mock_image_request, true);
+  expect_queue(mock_image_request_wq);
+  auto *aio_comp = new librbd::AioCompletion();
+  mock_image_request_wq.aio_write(aio_comp, 0, 0, {}, 0);
+
+  librbd::exclusive_lock::MockPolicy mock_exclusive_lock_policy;
+  expect_front(mock_image_request_wq, mock_image_request);
+  expect_is_refresh_request(mock_image_ctx, false);
+  expect_is_write_op(*mock_image_request, true);
+  expect_dequeue(mock_image_request_wq, mock_image_request);
+  expect_get_exclusive_lock_policy(mock_image_ctx, mock_exclusive_lock_policy);
+  expect_may_auto_request_lock(mock_exclusive_lock_policy, true);
+  Context *on_acquire = nullptr;
+  expect_request_lock(mock_exclusive_lock, &on_acquire);
+  ASSERT_TRUE(mock_image_request_wq.invoke_dequeue() == nullptr);
+  ASSERT_TRUE(on_acquire != nullptr);
+
+  expect_process_finish(mock_image_request_wq);
+  expect_fail(*mock_image_request, -EPERM);
+  expect_is_write_op(*mock_image_request, true);
+  expect_signal(mock_image_request_wq);
+  on_acquire->complete(-EPERM);
+
+  ASSERT_EQ(0, aio_comp->wait_for_complete());
+  ASSERT_EQ(-EPERM, aio_comp->get_return_value());
+  aio_comp->release();
+}
+
+TEST_F(TestMockAioImageRequestWQ, RefreshError) {
+  librbd::ImageCtx *ictx;
+  ASSERT_EQ(0, open_image(m_image_name, &ictx));
+
+  MockTestImageCtx mock_image_ctx(*ictx);
+
+  InSequence seq;
+  MockAioImageRequestWQ mock_image_request_wq(&mock_image_ctx, "io", 60, nullptr);
+
+  auto mock_image_request = new MockAioImageRequest();
+  expect_is_write_op(*mock_image_request, true);
+  expect_queue(mock_image_request_wq);
+  auto *aio_comp = new librbd::AioCompletion();
+  mock_image_request_wq.aio_write(aio_comp, 0, 0, {}, 0);
+
+  expect_front(mock_image_request_wq, mock_image_request);
+  expect_is_refresh_request(mock_image_ctx, true);
+  expect_is_write_op(*mock_image_request, true);
+  expect_dequeue(mock_image_request_wq, mock_image_request);
+  Context *on_refresh = nullptr;
+  expect_refresh(mock_image_ctx, &on_refresh);
+  ASSERT_TRUE(mock_image_request_wq.invoke_dequeue() == nullptr);
+  ASSERT_TRUE(on_refresh != nullptr);
+
+  expect_process_finish(mock_image_request_wq);
+  expect_fail(*mock_image_request, -EPERM);
+  expect_is_write_op(*mock_image_request, true);
+  expect_signal(mock_image_request_wq);
+  on_refresh->complete(-EPERM);
+
+  ASSERT_EQ(0, aio_comp->wait_for_complete());
+  ASSERT_EQ(-EPERM, aio_comp->get_return_value());
+  aio_comp->release();
+}
+
+} // namespace librbd