stop the execution loop before stopping the node

Author: musitdev

networks/movement/movement-full-node/src/node/manager.rs

@@ -52,16 +52,16 @@ impl Manager {
 			.await
 			.context("Failed to create the executor")?;
 
-		let join_handle = tokio::spawn(node.run(mempool_commit_tx_receiver));
-
-		// Use tokio::select! to wait for either the handle or a cancellation signal
-		tokio::select! {
-			_ = stop_rx.changed() =>(),
-			// manage Movement node execution return.
-			res = join_handle => {
-				res??;
-			},
-		};
+		let join_handle = tokio::spawn(node.run(mempool_commit_tx_receiver, stop_rx));
+		join_handle.await??;
+		// // Use tokio::select! to wait for either the handle or a cancellation signal
+		// tokio::select! {
+		// 	_ = stop_rx.changed() =>(),
+		// 	// manage Movement node execution return.
+		// 	res = join_handle => {
+		// 		res??;
+		// 	},
+		// };
 
 		Ok(())
 	}

networks/movement/movement-full-node/src/node/partial.rs

@@ -39,6 +39,7 @@ where
 	pub async fn run(
 		self,
 		mempool_commit_tx_receiver: UnboundedReceiver<Vec<TxExecutionResult>>,
+		stop_rx: tokio::sync::watch::Receiver<()>,
 	) -> Result<(), anyhow::Error> {
 		let (context, exec_background) = self
 			.executor
@@ -89,6 +90,7 @@ where
 							self.config.da_db.allow_sync_from_zero,
 							propagate_execution_state,
 							&da_signer,
+							stop_rx,
 						)
 						.await
 				}

networks/movement/movement-full-node/src/node/tasks/execute_settle.rs

@@ -71,6 +71,7 @@ where
 		allow_sync_from_zero: bool,
 		propagate_execution_state: bool,
 		da_batch_signer: &SignerIdentifier,
+		mut stop_rx: tokio::sync::watch::Receiver<()>,
 	) -> anyhow::Result<()> {
 		let synced_height = self.da_db.get_synced_height()?;
 		// Sync Da from 0 is rejected by default. Only if forced it's allowed.
@@ -163,6 +164,8 @@ where
 					tracing::error!("Da client stream channel timeout because it's idle. Exit");
 					break;
 				}
+				// Stop the node. No block are executing at this point.
+				_ = stop_rx.changed() => break,
 				else => break,
 			}
 		}