X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fceph%2Fsrc%2Ftest%2Fjournal%2Ftest_JournalTrimmer.cc;fp=src%2Fceph%2Fsrc%2Ftest%2Fjournal%2Ftest_JournalTrimmer.cc;h=0000000000000000000000000000000000000000;hb=7da45d65be36d36b880cc55c5036e96c24b53f00;hp=6d6917e4300de23e206bc69031150477ba75c56d;hpb=691462d09d0987b47e112d6ee8740375df3c51b2;p=stor4nfv.git

diff --git a/src/ceph/src/test/journal/test_JournalTrimmer.cc b/src/ceph/src/test/journal/test_JournalTrimmer.cc
deleted file mode 100644
index 6d6917e..0000000
--- a/src/ceph/src/test/journal/test_JournalTrimmer.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#include "journal/JournalTrimmer.h"
-#include "journal/JournalMetadata.h"
-#include "include/stringify.h"
-#include "test/journal/RadosTestFixture.h"
-#include <limits>
-#include <list>
-
-class TestJournalTrimmer : public RadosTestFixture {
-public:
-
-  void TearDown() override {
-    for (MetadataList::iterator it = m_metadata_list.begin();
-         it != m_metadata_list.end(); ++it) {
-      (*it)->remove_listener(&m_listener);
-    }
-    m_metadata_list.clear();
-
-    for (std::list<journal::JournalTrimmer*>::iterator it = m_trimmers.begin();
-         it != m_trimmers.end(); ++it) {
-      C_SaferCond ctx;
-      (*it)->shut_down(&ctx);
-      ASSERT_EQ(0, ctx.wait());
-      delete *it;
-    }
-    RadosTestFixture::TearDown();
-  }
-
-  int append_payload(journal::JournalMetadataPtr metadata,
-                     const std::string &oid, uint64_t object_num,
-                     const std::string &payload, uint64_t *commit_tid) {
-    int r = append(oid + "." + stringify(object_num), create_payload(payload));
-    uint64_t tid = metadata->allocate_commit_tid(object_num, 234, 123);
-    if (commit_tid != NULL) {
-      *commit_tid = tid;
-    }
-    return r;
-  }
-
-  journal::JournalMetadataPtr create_metadata(const std::string &oid) {
-    journal::JournalMetadataPtr metadata = RadosTestFixture::create_metadata(
-      oid);
-    m_metadata_list.push_back(metadata);
-    metadata->add_listener(&m_listener);
-    return metadata;
-  }
-
-  journal::JournalTrimmer *create_trimmer(const std::string &oid,
-                                            const journal::JournalMetadataPtr &metadata) {
-    journal::JournalTrimmer *trimmer(new journal::JournalTrimmer(
-      m_ioctx, oid + ".", metadata));
-    m_trimmers.push_back(trimmer);
-    return trimmer;
-  }
-
-  int assert_exists(const std::string &oid) {
-    librados::ObjectWriteOperation op;
-    op.assert_exists();
-    return m_ioctx.operate(oid, &op);
-  }
-
-  typedef std::list<journal::JournalMetadataPtr> MetadataList;
-  MetadataList m_metadata_list;
-  std::list<journal::JournalTrimmer*> m_trimmers;
-};
-
-TEST_F(TestJournalTrimmer, Committed) {
-  std::string oid = get_temp_oid();
-  ASSERT_EQ(0, create(oid, 12, 2));
-  ASSERT_EQ(0, client_register(oid));
-
-  journal::JournalMetadataPtr metadata = create_metadata(oid);
-  ASSERT_EQ(0, init_metadata(metadata));
-  ASSERT_TRUE(wait_for_update(metadata));
-
-  ASSERT_EQ(0, metadata->set_active_set(10));
-  ASSERT_TRUE(wait_for_update(metadata));
-
-  uint64_t commit_tid1;
-  uint64_t commit_tid2;
-  uint64_t commit_tid3;
-  uint64_t commit_tid4;
-  uint64_t commit_tid5;
-  uint64_t commit_tid6;
-  ASSERT_EQ(0, append_payload(metadata, oid, 0, "payload", &commit_tid1));
-  ASSERT_EQ(0, append_payload(metadata, oid, 4, "payload", &commit_tid2));
-  ASSERT_EQ(0, append_payload(metadata, oid, 5, "payload", &commit_tid3));
-  ASSERT_EQ(0, append_payload(metadata, oid, 0, "payload", &commit_tid4));
-  ASSERT_EQ(0, append_payload(metadata, oid, 4, "payload", &commit_tid5));
-  ASSERT_EQ(0, append_payload(metadata, oid, 5, "payload", &commit_tid6));
-
-  journal::JournalTrimmer *trimmer = create_trimmer(oid, metadata);
-
-  trimmer->committed(commit_tid4);
-  trimmer->committed(commit_tid6);
-  trimmer->committed(commit_tid2);
-  trimmer->committed(commit_tid5);
-  trimmer->committed(commit_tid3);
-  trimmer->committed(commit_tid1);
-  while (metadata->get_minimum_set() != 2U) {
-    ASSERT_TRUE(wait_for_update(metadata));
-  }
-
-  ASSERT_EQ(-ENOENT, assert_exists(oid + ".0"));
-  ASSERT_EQ(-ENOENT, assert_exists(oid + ".2"));
-  ASSERT_EQ(0, assert_exists(oid + ".5"));
-}
-
-TEST_F(TestJournalTrimmer, CommittedWithOtherClient) {
-  std::string oid = get_temp_oid();
-  ASSERT_EQ(0, create(oid, 12, 2));
-  ASSERT_EQ(0, client_register(oid));
-  ASSERT_EQ(0, client_register(oid, "client2", "slow client"));
-
-  journal::JournalMetadataPtr metadata = create_metadata(oid);
-  ASSERT_EQ(0, init_metadata(metadata));
-  ASSERT_TRUE(wait_for_update(metadata));
-
-  ASSERT_EQ(0, metadata->set_active_set(10));
-  ASSERT_TRUE(wait_for_update(metadata));
-
-  uint64_t commit_tid1;
-  uint64_t commit_tid2;
-  uint64_t commit_tid3;
-  uint64_t commit_tid4;
-  ASSERT_EQ(0, append_payload(metadata, oid, 0, "payload", &commit_tid1));
-  ASSERT_EQ(0, append_payload(metadata, oid, 2, "payload", &commit_tid2));
-  ASSERT_EQ(0, append_payload(metadata, oid, 3, "payload", &commit_tid3));
-  ASSERT_EQ(0, append_payload(metadata, oid, 5, "payload", &commit_tid4));
-
-  journal::JournalTrimmer *trimmer = create_trimmer(oid, metadata);
-
-  trimmer->committed(commit_tid1);
-  trimmer->committed(commit_tid2);
-  trimmer->committed(commit_tid3);
-  trimmer->committed(commit_tid4);
-  ASSERT_TRUE(wait_for_update(metadata));
-
-  ASSERT_EQ(0, assert_exists(oid + ".0"));
-  ASSERT_EQ(0, assert_exists(oid + ".2"));
-  ASSERT_EQ(0, assert_exists(oid + ".3"));
-  ASSERT_EQ(0, assert_exists(oid + ".5"));
-}
-
-TEST_F(TestJournalTrimmer, RemoveObjects) {
-  std::string oid = get_temp_oid();
-  ASSERT_EQ(0, create(oid, 12, 2));
-  ASSERT_EQ(0, client_register(oid));
-
-  journal::JournalMetadataPtr metadata = create_metadata(oid);
-  ASSERT_EQ(0, init_metadata(metadata));
-  ASSERT_TRUE(wait_for_update(metadata));
-
-  ASSERT_EQ(0, metadata->set_active_set(10));
-  ASSERT_TRUE(wait_for_update(metadata));
-
-  ASSERT_EQ(0, append(oid + ".0", create_payload("payload")));
-  ASSERT_EQ(0, append(oid + ".2", create_payload("payload")));
-  ASSERT_EQ(0, append(oid + ".3", create_payload("payload")));
-  ASSERT_EQ(0, append(oid + ".5", create_payload("payload")));
-
-  journal::JournalTrimmer *trimmer = create_trimmer(oid, metadata);
-
-  C_SaferCond cond;
-  trimmer->remove_objects(false, &cond);
-  ASSERT_EQ(0, cond.wait());
-
-  ASSERT_TRUE(wait_for_update(metadata));
-
-  ASSERT_EQ(-ENOENT, assert_exists(oid + ".0"));
-  ASSERT_EQ(-ENOENT, assert_exists(oid + ".2"));
-  ASSERT_EQ(-ENOENT, assert_exists(oid + ".3"));
-  ASSERT_EQ(-ENOENT, assert_exists(oid + ".5"));
-}
-
-TEST_F(TestJournalTrimmer, RemoveObjectsWithOtherClient) {
-  std::string oid = get_temp_oid();
-  ASSERT_EQ(0, create(oid, 12, 2));
-  ASSERT_EQ(0, client_register(oid));
-  ASSERT_EQ(0, client_register(oid, "client2", "other client"));
-
-  journal::JournalMetadataPtr metadata = create_metadata(oid);
-  ASSERT_EQ(0, init_metadata(metadata));
-  ASSERT_TRUE(wait_for_update(metadata));
-
-  journal::JournalTrimmer *trimmer = create_trimmer(oid, metadata);
-
-  C_SaferCond ctx1;
-  trimmer->remove_objects(false, &ctx1);
-  ASSERT_EQ(-EBUSY, ctx1.wait());
-
-  C_SaferCond ctx2;
-  trimmer->remove_objects(true, &ctx2);
-  ASSERT_EQ(0, ctx2.wait());
-}
-