From: Mohit Agrawal <moagrawa@redhat.com>
Date: Mon, 9 Jun 2025 10:05:07 +0000 (+0530)
Subject: crimson: Use osd_objectstore instead of using crimson_osd_objectstore
X-Git-Tag: testing/wip-vshankar-testing-20250710.130520-debug~35^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd262c3e053463ba2c7b9f084495dafc157142dc;p=ceph-ci.git

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 d5ba487b9bf..ff9bcab187d 100644
--- 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 19118192c56..1674a1d8a02 100644
--- 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 d1919456ab1..148de206da3 100644
--- 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 70026505eb7..5999758e229 100644
--- 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 2173aa4bb8c..1ff05861340 100644
--- 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 63c23f38d84..8956593a99e 100755
--- 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}")