crimson: Use osd_objectstore instead of using crimson_osd_objectstore

Originally the idea with introducing a crimson dedicated
configurable was to allow changing the default object store to
SeaStore without affecting the Classic option. Moreover, if we
were to consider hybrid clusters, different OSD types would require
two different dedicated options.

Given that cephadm (and possibly other orchestrators) use
`--osd-obejctstore` to set the backend - we would prefer to
retain (at least for now) this behavior to not break the
**existing** cluster deployment methods.

Note: A follow up PR would be pushed against cephadm to
      fully support Seastore as backend option.

Fixes: https://tracker.ceph.com/issues/71593
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>

diff --git a/qa/config/crimson_bluestore.yaml b/qa/config/crimson_bluestore.yaml
index d5ba487b9bfd27aae05a17cef7453e461eaaaf4b..ff9bcab187d6635459455b642571bdca370854b4 100644 (file)
--- a/qa/config/crimson_bluestore.yaml
+++ b/qa/config/crimson_bluestore.yaml
@@ -4,7 +4,7 @@ overrides:
     conf:
       osd:
         # crimson's osd objectstore option
-        crimson osd objectstore: bluestore
+        osd objectstore: bluestore
         debug alienstore: 20
         bluestore block size: 96636764160
         debug bluestore: 20

diff --git a/qa/config/crimson_seastore_rbm.yaml b/qa/config/crimson_seastore_rbm.yaml
index 19118192c56f1d55944e14439c3640424709cd74..1674a1d8a02eda79ffbffc9647d578d53f3ce74a 100644 (file)
--- a/qa/config/crimson_seastore_rbm.yaml
+++ b/qa/config/crimson_seastore_rbm.yaml
@@ -3,7 +3,7 @@ overrides:
     conf:
       osd:
         # crimson's osd objectstore option
-        crimson osd objectstore: seastore
+        osd objectstore: seastore
         seastore main device type: RANDOM_BLOCK_SSD
         debug seastore: 20
         debug seastore onode: 20

diff --git a/qa/config/crimson_seastore_segmented.yaml b/qa/config/crimson_seastore_segmented.yaml
index d1919456ab1c7a9beb9861b78b87767212a34180..148de206da371f191e31656365a5ca7ecbc03594 100644 (file)
--- a/qa/config/crimson_seastore_segmented.yaml
+++ b/qa/config/crimson_seastore_segmented.yaml
@@ -3,7 +3,7 @@ overrides:
     conf:
       osd:
         # crimson's osd objectstore option
-        crimson osd objectstore: seastore
+        osd objectstore: seastore
         debug seastore: 20
         debug seastore onode: 20
         debug seastore odata: 20

diff --git a/src/common/options/crimson.yaml.in b/src/common/options/crimson.yaml.in
index 70026505eb7d9f04d735dcc1dc059db4a09daa98..5999758e22935be0c08885169efba460cc316a00 100644 (file)
--- a/src/common/options/crimson.yaml.in
+++ b/src/common/options/crimson.yaml.in
@@ -2,17 +2,6 @@
 ---
 
 options:
-- name: crimson_osd_objectstore
-  type: str
-  level: advanced
-  desc: backend type for a Crimson OSD (e.g seastore or bluestore)
-  default: bluestore
-  enum_values:
-  - bluestore
-  - seastore
-  - cyanstore
-  flags:
-  - create
 - name: crimson_osd_obc_lru_size
   type: uint
   level: advanced

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 2173aa4bb8c80030b273d58f6ea4c8f84bfde470..1ff0586134088a199915e653aa7a3a81048d0eea 100644 (file)
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@ -203,10 +203,10 @@ int main(int argc, const char* argv[])
                                                    true);
           }
           auto store = crimson::os::FuturizedStore::create(
-            local_conf().get_val<std::string>("crimson_osd_objectstore"),
+            local_conf().get_val<std::string>("osd_objectstore"),
             local_conf().get_val<std::string>("osd_data"),
             local_conf().get_config_values());
-
+          logger().info("passed objectstore is {}", local_conf().get_val<std::string>("osd_objectstore"));
           crimson::osd::OSD osd(
             whoami, nonce, std::ref(should_stop.abort_source()),
             std::ref(*store), cluster_msgr, client_msgr,

diff --git a/src/vstart.sh b/src/vstart.sh
index 63c23f38d84760acbdcb28144383b817d4d1c6e9..8956593a99ed5f18b0956855021e9895503ec992 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1022,17 +1022,7 @@ $BLUESTORE_OPTS
 
         ; kstore
         kstore fsck on mount = true
-EOF
-    if [ "$crimson" -eq 1 ]; then
-        wconf <<EOF
-        crimson osd objectstore = $objectstore
-EOF
-    else
-        wconf <<EOF
         osd objectstore = $objectstore
-EOF
-    fi
-    wconf <<EOF
 $SEASTORE_OPTS
 $COSDSHORT
         $(format_conf "${extra_conf}")