crimson/osd, osd: build and link ECCommon

The modifications of the code shared with the classical OSD boil
down to just adding some `WITH_CRIMSON` guards; nothing more.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/crimson/osd/CMakeLists.txt b/src/crimson/osd/CMakeLists.txt
index 4fdcb4bba32ab5bc90448938c12dab6391129609..7cecc53c36e8e2cde602fbe640160db3995839a4 100644 (file)
--- a/src/crimson/osd/CMakeLists.txt
+++ b/src/crimson/osd/CMakeLists.txt
@@ -46,6 +46,8 @@ add_executable(crimson-osd
   objclass.cc
   ${PROJECT_SOURCE_DIR}/src/objclass/class_api.cc
   ${PROJECT_SOURCE_DIR}/src/osd/ClassHandler.cc
+  ${PROJECT_SOURCE_DIR}/src/osd/ECCommon.cc
+  ${PROJECT_SOURCE_DIR}/src/osd/ECExtentCache.cc
   ${PROJECT_SOURCE_DIR}/src/osd/ECUtil.cc
   ${PROJECT_SOURCE_DIR}/src/osd/ECUtilL.cc
   ${PROJECT_SOURCE_DIR}/src/osd/osd_op_util.cc

diff --git a/src/osd/ECCommon.cc b/src/osd/ECCommon.cc
index 62b0615ee6aabfb613cb8fd8ec53e40c81fe5787..c995c1663e0bc87bf07658316c5be14444143f0b 100644 (file)
--- a/src/osd/ECCommon.cc
+++ b/src/osd/ECCommon.cc
@@ -158,11 +158,13 @@ void ECCommon::ReadPipeline::get_all_avail_shards(
       continue;
     }
     const shard_id_t &shard = pg_shard.shard;
+#ifndef WITH_CRIMSON
     if (cct->_conf->bluestore_debug_inject_read_err &&
       ECInject::test_read_error1(ghobject_t(hoid, ghobject_t::NO_GEN, shard))) {
       dout(0) << __func__ << " Error inject - Missing shard " << shard << dendl;
       continue;
     }
+#endif
     if (!missing.is_missing(hoid)) {
       ceph_assert(!have.contains(shard));
       have.insert(shard);
@@ -924,12 +926,14 @@ void ECCommon::RMWPipeline::cache_ready(Op &op) {
     if (pg_shard == get_parent()->whoami_shard()) {
       should_write_local = true;
       local_write_op.claim(sop);
+#ifndef WITH_CRIMSON
     } else if (cct->_conf->bluestore_debug_inject_read_err &&
       ECInject::test_write_error1(ghobject_t(op.hoid,
                                              ghobject_t::NO_GEN,
                                              pg_shard.shard))) {
       dout(0) << " Error inject - Dropping write message to shard " <<
           pg_shard.shard << dendl;
+#endif
     } else {
       auto *r = new MOSDECSubOpWrite(sop);
       r->pgid = spg_t(get_parent()->primary_spg_t().pgid, pg_shard.shard);

diff --git a/src/osd/ECCommon.h b/src/osd/ECCommon.h
index 8300964c4ffb7a9bf94666e0841ed6f6dbf18bc3..79d094c04f8ccc5921e11c10117d6ae143435bcc 100644 (file)
--- a/src/osd/ECCommon.h
+++ b/src/osd/ECCommon.h
@@ -794,7 +794,11 @@ struct ECCommon {
             << " missing_on_shards=" << missing_on_shards
             << " recovery_info=" << recovery_info
             << " recovery_progress=" << recovery_progress
+#ifndef WITH_CRIMSON
             << " obc refcount=" << obc.use_count()
+#else
+            << " obc refcount=" << obc->get_use_count()
+#endif
             << " state=" << ECCommon::RecoveryBackend::RecoveryOp::tostr(state)
             << " waiting_on_pushes=" << waiting_on_pushes
             << ")";