sched: handle failure to allocate pucch format2

Author: frankist

lib/du_manager/ran_resource_management/du_ran_resource_manager_impl.cpp

@@ -84,6 +84,7 @@ ue_ran_resource_configurator du_ran_resource_manager_impl::create_ue_resource_co
   // UE initialized PCell.
   if (not allocate_cell_resources(ue_index, pcell_index, SERVING_CELL_PCELL_IDX)) {
     logger.warning("RAN Resource Allocation failed for ue={}", ue_index);
+    ue_res_pool.erase(ue_index);
     return ue_ran_resource_configurator{std::unique_ptr<du_ue_ran_resource_updater_impl>{nullptr}};
   }
 

lib/scheduler/pucch_scheduling/pucch_allocator_impl.cpp

@@ -674,13 +674,14 @@ pucch_harq_ack_grant pucch_allocator_impl::convert_to_format2(cell_slot_resource
   // indicator as for existing F1.
   else if (csi_part1_nof_bits > 0 and curr_harq_bits > 0) {
     int f1_pucch_res_ind = resource_manager.fetch_f1_pucch_res_indic(pucch_slot_alloc.slot, rnti);
-    srsran_sanity_check(f1_pucch_res_ind >= 0, "PUCCH Resource Indicator for allocated resource not found");
-    format2_res.pucch_res = resource_manager.reserve_specific_format2_res(
-        pucch_slot_alloc.slot,
-        rnti,
-        static_cast<unsigned>(f1_pucch_res_ind),
-        ue_cell_cfg.cfg_dedicated().ul_config.value().init_ul_bwp.pucch_cfg.value());
-    format2_res.pucch_res_indicator = static_cast<unsigned>(f1_pucch_res_ind);
+    if (f1_pucch_res_ind >= 0) {
+      format2_res.pucch_res = resource_manager.reserve_specific_format2_res(
+          pucch_slot_alloc.slot,
+          rnti,
+          static_cast<unsigned>(f1_pucch_res_ind),
+          ue_cell_cfg.cfg_dedicated().ul_config.value().init_ul_bwp.pucch_cfg.value());
+      format2_res.pucch_res_indicator = static_cast<unsigned>(f1_pucch_res_ind);
+    }
   }
   // Case C) In any other case, just get any available PUCCH resource 2.
   else {

lib/scheduler/pucch_scheduling/pucch_resource_manager.cpp

@@ -153,8 +153,11 @@ const pucch_resource* pucch_resource_manager::reserve_specific_format2_res(slot_
   rnti_pucch_res_id_slot_record& res_counter = get_slot_resource_counter(slot_harq);
 
   const unsigned PUCCH_RESOURCE_SET_FORMAT2_IDX = 1;
-  srsran_sanity_check(res_indicator < pucch_cfg.pucch_res_set[PUCCH_RESOURCE_SET_FORMAT2_IDX].pucch_res_id_list.size(),
-                      "PUCCH resource indicator exceeds the PUCCH resource set list.");
+  if (res_indicator >= std::min(res_counter.ues_using_format2_res.size(),
+                                pucch_cfg.pucch_res_set[PUCCH_RESOURCE_SET_FORMAT2_IDX].pucch_res_id_list.size())) {
+    // PUCCH resource indicator exceeds the PUCCH resource set list.
+    return nullptr;
+  }
 
   const auto& pucch_res_list = pucch_cfg.pucch_res_list;