Merge pull request ceph#62809 from rzarzynski/wip-bug-70878

SrinivasaBharath · web-flow · commit 849e96540dea · 2025-05-04T06:17:53.000+05:30
osd: fix init of op_queue_type_t due to returnable ceph_assert()
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -2444,7 +2444,7 @@ OSD::OSD(CephContext *cct_,
       } else {
         // This should never happen
         dout(0) << "Invalid value passed for 'osd_op_queue': " << type << dendl;
-        ceph_assert(0 == "Unsupported op queue type");
+        ceph_abort_msg("Unsupported op queue type");
       }
     } else {
       static const std::vector<op_queue_type_t> index_lookup = {

Original file line number	Diff line number	Diff line change
`@@ -2444,7 +2444,7 @@ OSD::OSD(CephContext *cct_,`
`2444`	`2444`	`} else {`
`2445`	`2445`	`// This should never happen`
`2446`	`2446`	`dout(0) << "Invalid value passed for 'osd_op_queue': " << type << dendl;`
`2447`		`- ceph_assert(0 == "Unsupported op queue type");`
	`2447`	`+ ceph_abort_msg("Unsupported op queue type");`
`2448`	`2448`	`}`
`2449`	`2449`	`} else {`
`2450`	`2450`	`static const std::vector<op_queue_type_t> index_lookup = {`