From db84151ed728f6951f891690e3bb704139e2ed9a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 14 Jun 2020 21:47:28 +0800 Subject: [PATCH] crimson/os: disable alienized bluestore if using seastar allocator before figuring out how to colocate alien store and seastar's builtin allocator. we need to disable alienized bluestore, if SEASTAR_DEFAULT_ALLOCATOR is not defined. See-also: https://tracker.ceph.com/issues/45985 Signed-off-by: Kefu Chai (cherry picked from commit 3dd052c4558144d7252aa8a856c1601ea17b74e7) --- src/crimson/os/futurized_store.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/crimson/os/futurized_store.cc b/src/crimson/os/futurized_store.cc index bb73c34787f12..e4c2670730eeb 100644 --- a/src/crimson/os/futurized_store.cc +++ b/src/crimson/os/futurized_store.cc @@ -12,7 +12,11 @@ FuturizedStore::create(const std::string& type, if (type == "memstore") { return std::make_unique(data); } else if (type == "bluestore") { +#ifdef SEASTAR_DEFAULT_ALLOCATOR return std::make_unique(data, values); +#else + #warning please define SEASTAR_DEFAULT_ALLOCATOR for using alien store +#endif } else { ceph_abort_msgf("unsupported objectstore type: %s", type.c_str()); return {}; -- 2.39.5