osd: test: Split unittest harness for EC into legacy and new code.

Signed-off-by: Alex Ainscow <[email protected]>

Author: aainscow

src/test/osd/CMakeLists.txt

@@ -60,6 +60,14 @@ add_executable(unittest_osd_types
 add_ceph_unittest(unittest_osd_types)
 target_link_libraries(unittest_osd_types global)
 
+# unittest_ecbackend_l (legacy EC)
+add_executable(unittest_ecbackend_l
+  TestECBackendL.cc
+  $<TARGET_OBJECTS:unit-main>
+  )
+add_ceph_unittest(unittest_ecbackend_l)
+target_link_libraries(unittest_ecbackend_l osd global)
+
 # unittest_ecbackend
 add_executable(unittest_ecbackend
   TestECBackend.cc
@@ -112,6 +120,13 @@ endif()
 add_ceph_unittest(unittest_osd_osdcap)
 target_link_libraries(unittest_osd_osdcap osd global ${BLKID_LIBRARIES})
 
+# unittest ExtentCache (Legacy)
+add_executable(unittest_extent_cache_l
+  test_extent_cache_l.cc
+)
+add_ceph_unittest(unittest_extent_cache_l)
+target_link_libraries(unittest_extent_cache_l osd global ${BLKID_LIBRARIES})
+
 # unittest ExtentCache
 add_executable(unittest_extent_cache
   test_extent_cache.cc
@@ -126,13 +141,21 @@ add_executable(unittest_pg_transaction
 add_ceph_unittest(unittest_pg_transaction)
 target_link_libraries(unittest_pg_transaction osd global ${BLKID_LIBRARIES})
 
+# unittest ECTransaction (Legacy)
+add_executable(unittest_ec_transaction_l
+  test_ec_transaction_l.cc
+)
+add_ceph_unittest(unittest_ec_transaction_l)
+target_link_libraries(unittest_ec_transaction_l osd global ${BLKID_LIBRARIES})
+
 # unittest ECTransaction
 add_executable(unittest_ec_transaction
   test_ec_transaction.cc
 )
 add_ceph_unittest(unittest_ec_transaction)
 target_link_libraries(unittest_ec_transaction osd global ${BLKID_LIBRARIES})
 
+# unittest_mclock_scheduler
 # unittest_mclock_scheduler
 add_executable(unittest_mclock_scheduler
   TestMClockScheduler.cc

src/test/osd/TestECBackend.cc

@@ -16,8 +16,8 @@
 #include <sstream>
 #include <errno.h>
 #include <signal.h>
-#include "osd/ECCommonL.h"
-#include "osd/ECBackendL.h"
+#include "osd/ECCommon.h"
+#include "osd/ECBackend.h"
 #include "gtest/gtest.h"
 
 using namespace std;
@@ -177,31 +177,31 @@ TEST(ECCommon, get_min_want_to_read_shards)
   // read nothing at the very beginning
   {
     std::set<int> want_to_read;
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       0, 0, s, &want_to_read);
     ASSERT_TRUE(want_to_read == std::set<int>{});
   }
 
   // read nothing at the middle (0-sized partial read)
   {
     std::set<int> want_to_read;
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       2048, 0, s, &want_to_read);
     ASSERT_TRUE(want_to_read == std::set<int>{});
   }
 
   // read not-so-many (< chunk_size) bytes at the middle (partial read)
   {
     std::set<int> want_to_read;
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       2048, 42, s, &want_to_read);
     ASSERT_TRUE(want_to_read == std::set<int>{2});
   }
 
   // read more (> chunk_size) bytes at the middle (partial read)
   {
     std::set<int> want_to_read;
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       1024, 1024+42, s, &want_to_read);
     // extra () due to a language / macro limitation
     ASSERT_TRUE(want_to_read == (std::set<int>{1, 2}));
@@ -210,7 +210,7 @@ TEST(ECCommon, get_min_want_to_read_shards)
   // full stripe except last chunk
   {
     std::set<int> want_to_read;
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       0, 3*1024, s, &want_to_read);
     // extra () due to a language / macro limitation
     ASSERT_TRUE(want_to_read == (std::set<int>{0, 1, 2}));
@@ -219,7 +219,7 @@ TEST(ECCommon, get_min_want_to_read_shards)
   // full stripe except 1st chunk
   {
     std::set<int> want_to_read;
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       1024, swidth-1024, s, &want_to_read);
     // extra () due to a language / macro limitation
     ASSERT_TRUE(want_to_read == (std::set<int>{1, 2, 3}));
@@ -228,7 +228,7 @@ TEST(ECCommon, get_min_want_to_read_shards)
   // large, multi-stripe read starting just after 1st chunk
   {
     std::set<int> want_to_read;
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       1024, swidth*42, s, &want_to_read);
     // extra () due to a language / macro limitation
     ASSERT_TRUE(want_to_read == (std::set<int>{0, 1, 2, 3}));
@@ -237,7 +237,7 @@ TEST(ECCommon, get_min_want_to_read_shards)
   // large read from the beginning
   {
     std::set<int> want_to_read;
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       0, swidth*42, s, &want_to_read);
     // extra () due to a language / macro limitation
     ASSERT_TRUE(want_to_read == (std::set<int>{0, 1, 2, 3}));
@@ -259,10 +259,10 @@ TEST(ECCommon, get_min_want_to_read_shards_bug67087)
   // multitple calls with the same want_to_read can happen during
   // multi-region reads.
   {
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       512, 512, s, &want_to_read);
     ASSERT_EQ(want_to_read, std::set<int>{0});
-    ECCommonL::ReadPipeline::get_min_want_to_read_shards(
+    ECCommon::ReadPipeline::get_min_want_to_read_shards(
       512+16*1024, 512, s, &want_to_read);
     ASSERT_EQ(want_to_read, std::set<int>{0});
   }