Fix for Issue 4762

substrate/frame/message-queue/src/lib.rs

@@ -645,17 +645,19 @@ pub mod pallet {
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_initialize(_n: BlockNumberFor<T>) -> Weight {
+			let context = ServiceQueuesContext::OnInitialize;
 			if let Some(weight_limit) = T::ServiceWeight::get() {
-				Self::service_queues(weight_limit)
+				Self::service_queues(weight_limit, context)
 			} else {
 				Weight::zero()
 			}
 		}
 
 		fn on_idle(_n: BlockNumberFor<T>, remaining_weight: Weight) -> Weight {
+			let context = ServiceQueuesContext::OnIdle;
 			if let Some(weight_limit) = T::IdleMaxServiceWeight::get() {
 				// Make use of the remaining weight to process enqueued messages.
-				Self::service_queues(weight_limit.min(remaining_weight))
+				Self::service_queues(weight_limit.min(remaining_weight), context)
 			} else {
 				Weight::zero()
 			}
@@ -774,6 +776,16 @@ enum MessageExecutionStatus {
 	StackLimitReached,
 }
 
+/// The context to pass to service_queues through on_idle and on_initialize hooks
+/// We don't want to throw the defensive message if called from on_idle hook
+#[derive(PartialEq)]
+enum ServiceQueuesContext {
+	/// Context of on_idle hook
+	OnIdle,
+	/// Context of on_initialize hook
+	OnInitialize,
+}
+
 impl<T: Config> Pallet<T> {
 	/// Knit `origin` into the ready ring right at the end.
 	///
@@ -1554,13 +1566,20 @@ impl<T: Get<O>, O: Into<u32>> Get<u32> for IntoU32<T, O> {
 impl<T: Config> ServiceQueues for Pallet<T> {
 	type OverweightMessageAddress = (MessageOriginOf<T>, PageIndex, T::Size);
 
-	fn service_queues(weight_limit: Weight) -> Weight {
+	fn service_queues(weight_limit: Weight, context: ServiceQueuesContext) -> Weight {
 		let mut weight = WeightMeter::with_limit(weight_limit);
 
 		// Get the maximum weight that processing a single message may take:
 		let max_weight = Self::max_message_weight(weight_limit).unwrap_or_else(|| {
-			defensive!("Not enough weight to service a single message.");
-			Weight::zero()
+			// throw defensive message when service_queues is called from on_initialize
+			// don't throw message when service_queues is called from on_idle
+			match context {
+				ServiceQueuesContext::OnInitialize => {
+					defensive!("Not enough weight to service a single message.");
+					Weight::zero()
+				},
+				ServiceQueuesContext::OnIdle => Weight::zero(),
+			}
 		});
 
 		match with_service_mutex(|| {