From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 17 Jun 2020 16:35:47 +0000 (+0200)
Subject: Revert "crimson/os: disable alienized bluestore if using seastar allocator"
X-Git-Tag: v16.1.0~1969^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ad46affde748d8b92bbdf43a0bde51cde6178be;p=ceph.git

Revert "crimson/os: disable alienized bluestore if using seastar allocator"

This reverts commit db84151ed728f6951f891690e3bb704139e2ed9a.
It's not necessary as further commits will bring experimental
(and restricted) support for running AlienStore on top of the
default Seastar's allocator.

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

diff --git a/src/crimson/os/futurized_store.cc b/src/crimson/os/futurized_store.cc
index e4c2670730ee..bb73c34787f1 100644
--- a/src/crimson/os/futurized_store.cc
+++ b/src/crimson/os/futurized_store.cc
@@ -12,11 +12,7 @@ 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 {};