]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os: disable alienized bluestore if using seastar allocator 35561/head
authorKefu Chai <kchai@redhat.com>
Sun, 14 Jun 2020 13:47:28 +0000 (21:47 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 15 Jun 2020 01:40:30 +0000 (09:40 +0800)
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 <kchai@redhat.com>
(cherry picked from commit 3dd052c4558144d7252aa8a856c1601ea17b74e7)

src/crimson/os/futurized_store.cc

index bb73c34787f126e7cd36c36dd79f195c5545a525..e4c2670730eeb0abc568f38bac1b0965ae1e1960 100644 (file)
@@ -12,7 +12,11 @@ FuturizedStore::create(const std::string& type,
   if (type == "memstore") {
     return std::make_unique<crimson::os::CyanStore>(data);
   } else if (type == "bluestore") {
+#ifdef SEASTAR_DEFAULT_ALLOCATOR
     return std::make_unique<crimson::os::AlienStore>(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 {};