From: Ronen Friedman <rfriedma@redhat.com>
Date: Wed, 12 Mar 2025 09:28:37 +0000 (-0500)
Subject: osd: use cmd_getval_cast_or() to fetch shard-id
X-Git-Tag: v20.3.0~310^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9382d87d64d5719d49e2c09522698c63b82868c;p=ceph.git

osd: use cmd_getval_cast_or() to fetch shard-id

as that interface alleviates the need to cast shard_id_t::NO_SHARD
back and forth to/from int.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 5db2e2204ed..5081143ca3f 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -193,6 +193,7 @@ using ceph::make_mutex;
 using namespace ceph::osd::scheduler;
 using TOPNSPC::common::cmd_getval;
 using TOPNSPC::common::cmd_getval_or;
+using TOPNSPC::common::cmd_getval_cast_or;
 using namespace std::literals;
 
 static ostream& _prefix(std::ostream* _dout, int whoami, epoch_t epoch) {
@@ -6582,10 +6583,10 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store,
       return;
     }
 
-    int64_t shardid64 = cmd_getval_or<int64_t>(cmdmap, "shardid", static_cast<int64_t>(shard_id_t::NO_SHARD));
-    shard_id_t shardid = shard_id_t(static_cast<int8_t>(shardid64));
-
-    hobject_t obj(object_t(objname), string(""), CEPH_NOSNAP, rawpg.ps(), pool, nspace);
+    shard_id_t shardid =
+	cmd_getval_cast_or<int64_t>(cmdmap, "shardid", shard_id_t::NO_SHARD);
+    hobject_t obj(
+	object_t(objname), ""s, CEPH_NOSNAP, rawpg.ps(), pool, nspace);
     ghobject_t gobj(obj, ghobject_t::NO_GEN, shardid);
     spg_t pgid(curmap->raw_pg_to_pg(rawpg), shardid);
     if (curmap->pg_is_ec(rawpg)) {