From 58604f7c8e1a996522ee157442b229112ca18a13 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 26 Nov 2019 16:24:17 +0800 Subject: [PATCH] crimson: move os/cyan_* down to os/cyanstore/* prepare for bluestore and seastore Signed-off-by: Kefu Chai --- src/crimson/os/CMakeLists.txt | 5 ++--- src/crimson/os/cyanstore/CMakeLists.txt | 6 ++++++ src/crimson/os/{ => cyanstore}/cyan_collection.cc | 0 src/crimson/os/{ => cyanstore}/cyan_collection.h | 2 +- src/crimson/os/{ => cyanstore}/cyan_object.cc | 0 src/crimson/os/{ => cyanstore}/cyan_object.h | 0 src/crimson/os/{ => cyanstore}/cyan_store.cc | 4 ++-- src/crimson/os/{ => cyanstore}/cyan_store.h | 2 +- src/crimson/os/futurized_store.cc | 2 +- src/crimson/osd/osd.cc | 2 +- src/crimson/osd/pg.cc | 2 +- src/crimson/osd/pg_backend.cc | 2 +- src/crimson/osd/replicated_backend.cc | 2 +- src/crimson/osd/shard_services.cc | 5 ++--- src/osd/PGLog.h | 2 +- 15 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 src/crimson/os/cyanstore/CMakeLists.txt rename src/crimson/os/{ => cyanstore}/cyan_collection.cc (100%) rename src/crimson/os/{ => cyanstore}/cyan_collection.h (96%) rename src/crimson/os/{ => cyanstore}/cyan_object.cc (100%) rename src/crimson/os/{ => cyanstore}/cyan_object.h (100%) rename src/crimson/os/{ => cyanstore}/cyan_store.cc (99%) rename src/crimson/os/{ => cyanstore}/cyan_store.h (98%) diff --git a/src/crimson/os/CMakeLists.txt b/src/crimson/os/CMakeLists.txt index 38b352449c0..3be23677d1b 100644 --- a/src/crimson/os/CMakeLists.txt +++ b/src/crimson/os/CMakeLists.txt @@ -1,8 +1,7 @@ add_library(crimson-os - cyan_store.cc - cyan_collection.cc - cyan_object.cc futurized_store.cc ${PROJECT_SOURCE_DIR}/src/os/Transaction.cc) +add_subdirectory(cyanstore) target_link_libraries(crimson-os + crimson-cyanstore crimson) diff --git a/src/crimson/os/cyanstore/CMakeLists.txt b/src/crimson/os/cyanstore/CMakeLists.txt new file mode 100644 index 00000000000..24c3df40231 --- /dev/null +++ b/src/crimson/os/cyanstore/CMakeLists.txt @@ -0,0 +1,6 @@ +add_library(crimson-cyanstore + cyan_store.cc + cyan_collection.cc + cyan_object.cc) +target_link_libraries(crimson-cyanstore + crimson) diff --git a/src/crimson/os/cyan_collection.cc b/src/crimson/os/cyanstore/cyan_collection.cc similarity index 100% rename from src/crimson/os/cyan_collection.cc rename to src/crimson/os/cyanstore/cyan_collection.cc diff --git a/src/crimson/os/cyan_collection.h b/src/crimson/os/cyanstore/cyan_collection.h similarity index 96% rename from src/crimson/os/cyan_collection.h rename to src/crimson/os/cyanstore/cyan_collection.h index 4dc9e45ebcf..068e427d8df 100644 --- a/src/crimson/os/cyan_collection.h +++ b/src/crimson/os/cyanstore/cyan_collection.h @@ -11,7 +11,7 @@ #include "include/buffer.h" #include "osd/osd_types.h" -#include "futurized_collection.h" +#include "crimson/os/futurized_collection.h" namespace crimson::os { diff --git a/src/crimson/os/cyan_object.cc b/src/crimson/os/cyanstore/cyan_object.cc similarity index 100% rename from src/crimson/os/cyan_object.cc rename to src/crimson/os/cyanstore/cyan_object.cc diff --git a/src/crimson/os/cyan_object.h b/src/crimson/os/cyanstore/cyan_object.h similarity index 100% rename from src/crimson/os/cyan_object.h rename to src/crimson/os/cyanstore/cyan_object.h diff --git a/src/crimson/os/cyan_store.cc b/src/crimson/os/cyanstore/cyan_store.cc similarity index 99% rename from src/crimson/os/cyan_store.cc rename to src/crimson/os/cyanstore/cyan_store.cc index f0a76bd4900..6bc620430df 100644 --- a/src/crimson/os/cyan_store.cc +++ b/src/crimson/os/cyanstore/cyan_store.cc @@ -12,8 +12,8 @@ #include "crimson/common/buffer_io.h" #include "crimson/common/config_proxy.h" -#include "crimson/os/cyan_collection.h" -#include "crimson/os/cyan_object.h" +#include "cyan_collection.h" +#include "cyan_object.h" namespace { seastar::logger& logger() { diff --git a/src/crimson/os/cyan_store.h b/src/crimson/os/cyanstore/cyan_store.h similarity index 98% rename from src/crimson/os/cyan_store.h rename to src/crimson/os/cyanstore/cyan_store.h index fa40692e59a..7fab6d643eb 100644 --- a/src/crimson/os/cyan_store.h +++ b/src/crimson/os/cyanstore/cyan_store.h @@ -15,7 +15,7 @@ #include "osd/osd_types.h" #include "include/uuid.h" -#include "futurized_store.h" +#include "crimson/os/futurized_store.h" namespace ceph::os { class Transaction; diff --git a/src/crimson/os/futurized_store.cc b/src/crimson/os/futurized_store.cc index 22d90b7554b..0e535396b42 100644 --- a/src/crimson/os/futurized_store.cc +++ b/src/crimson/os/futurized_store.cc @@ -1,5 +1,5 @@ #include "futurized_store.h" -#include "cyan_store.h" +#include "cyanstore/cyan_store.h" namespace crimson::os { diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index 426e4f34fab..f173ac87ea6 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -27,8 +27,8 @@ #include "crimson/mon/MonClient.h" #include "crimson/net/Connection.h" #include "crimson/net/Messenger.h" +#include "crimson/os/cyanstore/cyan_object.h" #include "crimson/os/futurized_collection.h" -#include "crimson/os/cyan_object.h" #include "crimson/os/futurized_store.h" #include "crimson/osd/heartbeat.h" #include "crimson/osd/osd_meta.h" diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index 65723aa39cb..ed0f40b3505 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -30,7 +30,7 @@ #include "crimson/net/Connection.h" #include "crimson/net/Messenger.h" -#include "crimson/os/cyan_store.h" +#include "crimson/os/cyanstore/cyan_store.h" #include "crimson/os/futurized_collection.h" #include "crimson/osd/exceptions.h" #include "crimson/osd/pg_meta.h" diff --git a/src/crimson/osd/pg_backend.cc b/src/crimson/osd/pg_backend.cc index edb20dd0b99..ae81708ad2f 100644 --- a/src/crimson/osd/pg_backend.cc +++ b/src/crimson/osd/pg_backend.cc @@ -14,8 +14,8 @@ #include "messages/MOSDOp.h" #include "os/Transaction.h" +#include "crimson/os/cyanstore/cyan_object.h" #include "crimson/os/futurized_collection.h" -#include "crimson/os/cyan_object.h" #include "crimson/os/futurized_store.h" #include "replicated_backend.h" #include "ec_backend.h" diff --git a/src/crimson/osd/replicated_backend.cc b/src/crimson/osd/replicated_backend.cc index 71ae5165f57..18c98faeadb 100644 --- a/src/crimson/osd/replicated_backend.cc +++ b/src/crimson/osd/replicated_backend.cc @@ -3,7 +3,7 @@ #include "messages/MOSDRepOpReply.h" #include "crimson/common/log.h" -#include "crimson/os/cyan_object.h" +#include "crimson/os/cyanstore/cyan_object.h" #include "crimson/os/futurized_store.h" #include "crimson/osd/shard_services.h" diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc index f5c240f0a8a..e282df5ce97 100644 --- a/src/crimson/osd/shard_services.cc +++ b/src/crimson/osd/shard_services.cc @@ -5,13 +5,12 @@ #include "osd/osd_perf_counters.h" #include "osd/PeeringState.h" -#include "crimson/osd/osdmap_service.h" -#include "crimson/os/cyan_store.h" #include "crimson/mgr/client.h" #include "crimson/mon/MonClient.h" #include "crimson/net/Messenger.h" #include "crimson/net/Connection.h" -#include "crimson/os/cyan_store.h" +#include "crimson/os/cyanstore/cyan_store.h" +#include "crimson/osd/osdmap_service.h" #include "messages/MOSDPGTemp.h" #include "messages/MOSDPGCreated.h" #include "messages/MOSDPGNotify.h" diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index a3b87915262..f39dc979c40 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -25,7 +25,7 @@ #ifdef WITH_SEASTAR #include #include "crimson/os/futurized_store.h" -#include "crimson/os/cyan_collection.h" +#include "crimson/os/cyanstore/cyan_collection.h" #endif constexpr auto PGLOG_INDEXED_OBJECTS = 1 << 0; -- 2.47.3