[invoker] removing unnecessary async on action handling

crates/admin/src/cluster_controller/service/cluster_controller_state.rs

@@ -15,14 +15,14 @@ use futures::future::OptionFuture;
 use itertools::Itertools;
 use tracing::info;
 
-use crate::cluster_controller::service::Service;
-use crate::cluster_controller::service::scheduler::Scheduler;
-use crate::cluster_controller::service::scheduler_task::SchedulerTask;
-use crate::cluster_controller::service::trim_logs_task::TrimLogsTask;
 use restate_core::network::TransportConnect;
 use restate_core::{TaskCenter, TaskId, TaskKind, my_node_id};
 use restate_types::nodes_config::NodesConfiguration;
 
+use crate::cluster_controller::service::Service;
+use crate::cluster_controller::service::scheduler::Scheduler;
+use crate::cluster_controller::service::scheduler_task::SchedulerTask;
+
 pub enum ClusterControllerState {
     Follower,
     Leader(Leader),
@@ -82,7 +82,6 @@ impl ClusterControllerState {
 }
 
 pub struct Leader {
-    trim_logs_task: TaskId,
     scheduler_task: TaskId,
 }
 
@@ -94,20 +93,6 @@ impl Leader {
             service.replica_set_states.clone(),
         );
 
-        let trim_task = TrimLogsTask::new(
-            service.bifrost.clone(),
-            service.cluster_state_refresher.cluster_state_watcher(),
-        );
-
-        // We spawn the trim task as a child task to make use of the built-in error handling of
-        // managed tasks. Otherwise, we would have to monitor for failed tasks ourselves.
-        let trim_logs_task =
-            TaskCenter::spawn_child(TaskKind::Background, "trim-logs", async move {
-                trim_task.run().await;
-                Ok(())
-            })
-            .expect("failed to spawn trim logs task");
-
         // We spawn the scheduler task as a child task to make use of the built-in error handling of
         // managed tasks. Otherwise, we would have to monitor for failed tasks ourselves.
         let scheduler_task = TaskCenter::spawn_child(
@@ -122,21 +107,14 @@ impl Leader {
         )
         .expect("failed to spawn scheduler task");
 
-        Self {
-            trim_logs_task,
-            scheduler_task,
-        }
+        Self { scheduler_task }
     }
 
     /// Stops the leader tasks to make sure that no other leader activity is running.
     async fn stop(self) {
-        let trim_logs_task = TaskCenter::cancel_task(self.trim_logs_task);
         let scheduler_task = TaskCenter::cancel_task(self.scheduler_task);
 
         // ignore if the task failed during cancellation
-        let (_trim_logs_task, _scheduler_task) = tokio::join!(
-            OptionFuture::from(trim_logs_task),
-            OptionFuture::from(scheduler_task)
-        );
+        let _scheduler_task = OptionFuture::from(scheduler_task).await;
     }
 }