Adding upstream version 14.2.21.upstream/14.2.21upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 184 insertions, 0 deletions

diff --git a/src/test/osd/TestMClockClientQueue.cc b/src/test/osd/TestMClockClientQueue.cc
new file mode 100644
index 00000000..70e054c7
--- /dev/null
+++ b/src/test/osd/TestMClockClientQueue.cc
@@ -0,0 +1,184 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+
+#include <iostream>
+
+#include "gtest/gtest.h"
+#include "global/global_init.h"
+#include "common/common_init.h"
+
+#include "osd/mClockClientQueue.h"
+
+
+int main(int argc, char **argv) {
+  std::vector<const char*> args(argv, argv+argc);
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_OSD,
+			 CODE_ENVIRONMENT_UTILITY,
+			 CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
+  common_init_finish(g_ceph_context);
+
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+
+
+class MClockClientQueueTest : public testing::Test {
+public:
+  mClockClientQueue q;
+
+  uint64_t client1;
+  uint64_t client2;
+  uint64_t client3;
+
+  MClockClientQueueTest() :
+    q(g_ceph_context),
+    client1(1001),
+    client2(9999),
+    client3(100000001)
+  {}
+
+#if 0 // more work needed here
+  Request create_client_op(epoch_t e, uint64_t owner) {
+    return Request(spg_t(), OpQueueItem(OpRequestRef(), e));
+  }
+#endif
+
+  Request create_snaptrim(epoch_t e, uint64_t owner) {
+    return Request(OpQueueItem(unique_ptr<OpQueueItem::OpQueueable>(new PGSnapTrim(spg_t(), e)),
+			       12, 12,
+			       utime_t(), owner, e));
+  }
+
+  Request create_scrub(epoch_t e, uint64_t owner) {
+    return Request(OpQueueItem(unique_ptr<OpQueueItem::OpQueueable>(new PGScrub(spg_t(), e)),
+			       12, 12,
+			       utime_t(), owner, e));
+  }
+
+  Request create_recovery(epoch_t e, uint64_t owner) {
+    return Request(OpQueueItem(unique_ptr<OpQueueItem::OpQueueable>(new PGRecovery(spg_t(), e, 64)),
+			       12, 12,
+			       utime_t(), owner, e));
+  }
+};
+
+
+TEST_F(MClockClientQueueTest, TestSize) {
+  ASSERT_TRUE(q.empty());
+  ASSERT_EQ(0u, q.get_size_slow());
+
+  q.enqueue(client1, 12, 1u, create_snaptrim(100, client1));
+  q.enqueue_strict(client2, 12, create_snaptrim(101, client2));
+  q.enqueue(client2, 12, 1u, create_snaptrim(102, client2));
+  q.enqueue_strict(client3, 12, create_snaptrim(103, client3));
+  q.enqueue(client1, 12, 1u, create_snaptrim(104, client1));
+
+  ASSERT_FALSE(q.empty());
+  ASSERT_EQ(5u, q.get_size_slow());
+
+  std::list<Request> reqs;
+
+  reqs.push_back(q.dequeue());
+  reqs.push_back(q.dequeue());
+  reqs.push_back(q.dequeue());
+
+  ASSERT_FALSE(q.empty());
+  ASSERT_EQ(2u, q.get_size_slow());
+
+  q.enqueue_front(client2, 12, 1u, std::move(reqs.back()));
+  reqs.pop_back();
+
+  q.enqueue_strict_front(client3, 12, std::move(reqs.back()));
+  reqs.pop_back();
+
+  q.enqueue_strict_front(client2, 12, std::move(reqs.back()));
+  reqs.pop_back();
+
+  ASSERT_FALSE(q.empty());
+  ASSERT_EQ(5u, q.get_size_slow());
+
+  for (int i = 0; i < 5; ++i) {
+    (void) q.dequeue();
+  }
+
+  ASSERT_TRUE(q.empty());
+  ASSERT_EQ(0u, q.get_size_slow());
+}
+
+
+TEST_F(MClockClientQueueTest, TestEnqueue) {
+  q.enqueue(client1, 12, 1u, create_snaptrim(100, client1));
+  q.enqueue(client2, 12, 1u, create_snaptrim(101, client2));
+  q.enqueue(client2, 12, 1u, create_snaptrim(102, client2));
+  q.enqueue(client3, 12, 1u, create_snaptrim(103, client3));
+  q.enqueue(client1, 12, 1u, create_snaptrim(104, client1));
+
+  Request r = q.dequeue();
+  ASSERT_EQ(100u, r.get_map_epoch());
+
+  r = q.dequeue();
+  ASSERT_EQ(101u, r.get_map_epoch());
+
+  r = q.dequeue();
+  ASSERT_EQ(103u, r.get_map_epoch());
+
+  r = q.dequeue();
+  ASSERT_TRUE(r.get_map_epoch() == 102u ||
+              r.get_map_epoch() == 104u);
+
+  r = q.dequeue();
+  ASSERT_TRUE(r.get_map_epoch() == 102u ||
+              r.get_map_epoch() == 104u);
+}
+
+
+TEST_F(MClockClientQueueTest, TestEnqueueStrict) {
+  q.enqueue_strict(client1, 12, create_snaptrim(100, client1));
+  q.enqueue_strict(client2, 13, create_snaptrim(101, client2));
+  q.enqueue_strict(client2, 16, create_snaptrim(102, client2));
+  q.enqueue_strict(client3, 14, create_snaptrim(103, client3));
+  q.enqueue_strict(client1, 15, create_snaptrim(104, client1));
+
+  Request r = q.dequeue();
+  ASSERT_EQ(102u, r.get_map_epoch());
+
+  r = q.dequeue();
+  ASSERT_EQ(104u, r.get_map_epoch());
+
+  r = q.dequeue();
+  ASSERT_EQ(103u, r.get_map_epoch());
+
+  r = q.dequeue();
+  ASSERT_EQ(101u, r.get_map_epoch());
+
+  r = q.dequeue();
+  ASSERT_EQ(100u, r.get_map_epoch());
+}
+
+
+TEST_F(MClockClientQueueTest, TestRemoveByClass) {
+  q.enqueue(client1, 12, 1u, create_snaptrim(100, client1));
+  q.enqueue_strict(client2, 12, create_snaptrim(101, client2));
+  q.enqueue(client2, 12, 1u, create_snaptrim(102, client2));
+  q.enqueue_strict(client3, 12, create_snaptrim(103, client3));
+  q.enqueue(client1, 12, 1u, create_snaptrim(104, client1));
+
+  std::list<Request> filtered_out;
+  q.remove_by_class(client2, &filtered_out);
+
+  ASSERT_EQ(2u, filtered_out.size());
+  while (!filtered_out.empty()) {
+    auto e = filtered_out.front().get_map_epoch() ;
+    ASSERT_TRUE(e == 101 || e == 102);
+    filtered_out.pop_front();
+  }
+
+  ASSERT_EQ(3u, q.get_size_slow());
+  Request r = q.dequeue();
+  ASSERT_EQ(103u, r.get_map_epoch());
+
+  r = q.dequeue();
+  ASSERT_EQ(100u, r.get_map_epoch());
+
+  r = q.dequeue();
+  ASSERT_EQ(104u, r.get_map_epoch());
+}