Remove some old commented code

Author: spirali

crates/tako/src/control.rs

@@ -8,10 +8,7 @@ use tokio::net::TcpListener;
 use tokio::sync::{Notify, oneshot};
 
 use crate::events::EventProcessor;
-use crate::gateway::{
-    MultiNodeAllocationResponse, TaskSubmit,
-    WorkerRuntimeInfo,
-};
+use crate::gateway::{MultiNodeAllocationResponse, TaskSubmit, WorkerRuntimeInfo};
 use crate::internal::messages::worker::ToWorkerMessage;
 use crate::internal::scheduler::query::compute_new_worker_query;
 use crate::internal::scheduler::state::scheduler_loop;
@@ -56,30 +53,6 @@ impl ServerRef {
         self.comm_ref.set_client_events(client_events);
     }
 
-    // pub fn get_task_info(&self, tasks: &[TaskId]) -> crate::Result<Vec<TaskInfo>> {
-    //     log::debug!("Client asked for task info");
-    //     let core = self.core_ref.get();
-    //     let task_map = core.task_map();
-    //     let task_infos = tasks
-    //         .iter()
-    //         .map(|task_id| {
-    //             let task = task_map.get_task(*task_id);
-    //             TaskInfo {
-    //                 id: task.id,
-    //                 state: match task.state {
-    //                     TaskRuntimeState::Waiting(_) => TaskState::Waiting,
-    //                     TaskRuntimeState::Assigned(_) => TaskState::Waiting,
-    //                     TaskRuntimeState::Stealing(_, _) => TaskState::Waiting,
-    //                     TaskRuntimeState::Running { .. } => TaskState::Waiting,
-    //                     TaskRuntimeState::RunningMultiNode(_) => TaskState::Waiting,
-    //                     TaskRuntimeState::Finished => TaskState::Finished,
-    //                 },
-    //             }
-    //         })
-    //         .collect();
-    //     Ok(task_infos)
-    // }
-
     pub fn cancel_tasks(&self, tasks: &[TaskId]) {
         log::debug!("Client asked for canceling tasks: {:?}", tasks);
         let mut core = self.core_ref.get_mut();

crates/tako/src/gateway.rs

@@ -3,9 +3,7 @@ use std::fmt::Display;
 
 use crate::internal::common::error::DsError;
 use crate::internal::datasrv::dataobj::DataObjectId;
-use crate::resources::{
-    AllocationRequest, CPU_RESOURCE_NAME, NumOfNodes, ResourceAmount,
-};
+use crate::resources::{AllocationRequest, CPU_RESOURCE_NAME, NumOfNodes, ResourceAmount};
 use crate::{InstanceId, Map, Priority, TaskId};
 use smallvec::{SmallVec, smallvec};
 use std::time::Duration;
@@ -188,125 +186,3 @@ pub struct TaskSubmit {
     pub shared_data: Vec<SharedTaskConfiguration>,
     pub adjust_instance_id_and_crash_counters: Map<TaskId, (InstanceId, u32)>,
 }
-
-//
-// #[derive(Deserialize, Serialize, Debug)]
-// pub struct TaskInfoRequest {
-//     pub tasks: Vec<TaskId>, // If empty, then all tasks are assumed
-// }
-//
-// #[derive(Deserialize, Serialize, Debug)]
-// pub struct CancelTasks {
-//     pub tasks: Vec<TaskId>, // If empty, then all tasks are assumed
-// }
-//
-// #[derive(Deserialize, Serialize, Debug)]
-// pub struct StopWorkerRequest {
-//     pub worker_id: WorkerId,
-// }
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct WorkerTypeQuery {
-//     pub descriptor: ResourceDescriptor,
-//     pub max_sn_workers: u32,            // For single-node tasks
-//     pub max_worker_per_allocation: u32, // For multi-node tasks
-// }
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct NewWorkerQuery {
-//     pub worker_queries: Vec<WorkerTypeQuery>,
-// }
-//
-// #[derive(Deserialize, Serialize, Debug)]
-// pub enum WorkerOverviewListenerOp {
-//     Add,
-//     Remove,
-// }
-//
-// #[derive(Deserialize, Serialize, Debug)]
-// #[serde(tag = "op")]
-// pub enum FromGatewayMessage {
-//     NewTasks(NewTasksMessage),
-//     CancelTasks(CancelTasks),
-//     GetTaskInfo(TaskInfoRequest),
-//     ServerInfo,
-//     WorkerInfo(WorkerId),
-//     StopWorker(StopWorkerRequest),
-//     NewWorkerQuery(NewWorkerQuery),
-//     TryReleaseMemory,
-//     ModifyWorkerOverviewListeners(WorkerOverviewListenerOp),
-// }
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct NewTasksResponse {
-//     pub n_waiting_for_workers: u64,
-// }
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct ErrorResponse {
-//     pub message: String,
-// }
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct TaskUpdate {
-//     pub id: TaskId,
-//     pub state: TaskState,
-// }
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct TaskFailedMessage {
-//     pub id: TaskId,
-//     pub cancelled_tasks: Vec<TaskId>,
-//     pub info: TaskFailInfo,
-// }
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct ServerInfo {
-//     pub worker_listen_port: u16,
-// }
-//
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct TaskInfo {
-//     pub id: TaskId,
-//     pub state: TaskState,
-// }
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct TasksInfoResponse {
-//     pub tasks: Vec<TaskInfo>,
-// }
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct NewWorkerMessage {
-//     pub worker_id: WorkerId,
-//     pub configuration: WorkerConfiguration,
-// }
-//
-//
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// pub struct LostWorkerMessage {
-//     pub worker_id: WorkerId,
-//     pub running_tasks: Vec<TaskId>,
-//     pub reason: LostWorkerReason,
-// }
-//
-//
-// #[derive(Serialize, Deserialize, Debug)]
-// #[allow(clippy::large_enum_variant)] // This Enum will be removed soon
-// pub enum ToGatewayMessage {
-//     NewTasksResponse(NewTasksResponse),
-//     CancelTasksResponse(CancelTasksResponse),
-//     TaskUpdate(TaskUpdate),
-//     TaskFailed(TaskFailedMessage),
-//     TaskInfo(TasksInfoResponse),
-//     Error(ErrorResponse),
-//     ServerInfo(ServerInfo),
-//     WorkerInfo(Option<WorkerRuntimeInfo>),
-//     NewWorker(NewWorkerMessage),
-//     LostWorker(LostWorkerMessage),
-//     WorkerOverview(Box<WorkerOverview>),
-//     WorkerStopped,
-//     NewWorkerAllocationQueryResponse(NewWorkerAllocationResponse),
-// }