Merge pull request ceph#63817 from mohit84/objectstore_type

crimson: Use osd_objectstore instead of using crimson_osd_objectstore

Reviewed-by: Matan Breizman <[email protected]>

Author: Matan-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

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

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

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

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,

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}")