Server stream stats removed

crates/hyperqueue/src/client/output/cli.rs

@@ -15,8 +15,8 @@ use crate::server::job::{JobTaskCounters, JobTaskInfo, JobTaskState};
 use crate::stream::reader::streamdir::Summary;
 use crate::transfer::messages::{
     AutoAllocListResponse, JobDetail, JobInfo, JobTaskDescription, PinMode, QueueData, QueueState,
-    ServerInfo, StatsResponse, TaskDescription, TaskKind, TaskKindProgram, WaitForJobsResponse,
-    WorkerExitInfo, WorkerInfo,
+    ServerInfo, TaskDescription, TaskKind, TaskKindProgram, WaitForJobsResponse, WorkerExitInfo,
+    WorkerInfo,
 };
 use crate::{JobId, JobTaskCount, WorkerId};
 
@@ -394,31 +394,6 @@ impl Output for CliOutput {
         self.print_vertical_table(rows);
     }
 
-    fn print_server_stats(&self, stats: StatsResponse) {
-        let rows = vec![
-            vec![
-                "Stream connections".cell().bold(true),
-                stats.stream_stats.connections.join("\n").cell(),
-            ],
-            vec![
-                "Stream registrations".cell().bold(true),
-                stats
-                    .stream_stats
-                    .registrations
-                    .iter()
-                    .map(|(job_id, path)| format!("{}: {}", job_id, path.display()))
-                    .collect::<Vec<_>>()
-                    .join("\n")
-                    .cell(),
-            ],
-            vec![
-                "Open files".cell().bold(true),
-                stats.stream_stats.files.join("\n").cell(),
-            ],
-        ];
-        self.print_vertical_table(rows);
-    }
-
     fn print_job_submitted(&self, job: JobDetail) {
         println!(
             "Job submitted {}, job ID: {}",

crates/hyperqueue/src/client/output/json.rs

@@ -25,7 +25,7 @@ use crate::server::job::{JobTaskInfo, JobTaskState, StartedTaskData};
 use crate::stream::reader::streamdir::Summary;
 use crate::transfer::messages::{
     AutoAllocListResponse, JobDetail, JobInfo, JobTaskDescription, PinMode, QueueData, ServerInfo,
-    StatsResponse, TaskDescription, TaskKind, TaskKindProgram, WaitForJobsResponse, WorkerInfo,
+    TaskDescription, TaskKind, TaskKindProgram, WaitForJobsResponse, WorkerInfo,
 };
 use crate::{JobId, JobTaskId};
 
@@ -64,9 +64,6 @@ impl Output for JsonOutput {
         });
         self.print(json);
     }
-    fn print_server_stats(&self, stats: StatsResponse) {
-        self.print(json!(stats));
-    }
 
     fn print_job_submitted(&self, job: JobDetail) {
         self.print(json!({

crates/hyperqueue/src/client/output/outputs.rs

@@ -1,6 +1,5 @@
 use crate::transfer::messages::{
-    AutoAllocListResponse, JobDetail, JobInfo, ServerInfo, StatsResponse, WaitForJobsResponse,
-    WorkerInfo,
+    AutoAllocListResponse, JobDetail, JobInfo, ServerInfo, WaitForJobsResponse, WorkerInfo,
 };
 
 use crate::client::job::WorkerMap;
@@ -40,7 +39,6 @@ pub trait Output {
 
     // Server
     fn print_server_description(&self, server_dir: Option<&Path>, record: &ServerInfo);
-    fn print_server_stats(&self, stats: StatsResponse);
 
     // Jobs
     fn print_job_submitted(&self, job: JobDetail);

crates/hyperqueue/src/client/output/quiet.rs

@@ -18,8 +18,8 @@ use crate::server::autoalloc::Allocation;
 use crate::server::job::JobTaskInfo;
 use crate::stream::reader::streamdir::Summary;
 use crate::transfer::messages::{
-    AutoAllocListResponse, JobDetail, JobInfo, ServerInfo, StatsResponse, WaitForJobsResponse,
-    WorkerExitInfo, WorkerInfo,
+    AutoAllocListResponse, JobDetail, JobInfo, ServerInfo, WaitForJobsResponse, WorkerExitInfo,
+    WorkerInfo,
 };
 use crate::JobId;
 
@@ -64,7 +64,6 @@ impl Output for Quiet {
             println!("{}", dir.display());
         }
     }
-    fn print_server_stats(&self, _stats: StatsResponse) {}
 
     // Jobs
     fn print_job_submitted(&self, job: JobDetail) {

crates/hyperqueue/src/dashboard/ui/screens/overview_screen/worker/worker_config_table.rs

@@ -57,14 +57,6 @@ fn create_rows(worker_info: &WorkerConfiguration) -> Vec<WorkerConfigDataRow> {
                 .unwrap_or(missing_data_str.as_str())
                 .to_string()),
         },
-        WorkerConfigDataRow {
-            label: "Log Dir: ",
-            data: worker_info
-                .log_dir
-                .to_str()
-                .unwrap_or(missing_data_str.as_str())
-                .to_string(),
-        },
         WorkerConfigDataRow {
             label: "Heartbeat Interval: ",
             data: humantime::format_duration(worker_info.heartbeat_interval).to_string(),

crates/hyperqueue/src/transfer/messages.rs

@@ -331,7 +331,6 @@ pub enum ToClientMessage {
     SubmitResponse(SubmitResponse),
     WorkerListResponse(WorkerListResponse),
     WorkerInfoResponse(Option<WorkerInfo>),
-    StatsResponse(StatsResponse),
     StopWorkerResponse(Vec<(WorkerId, StopWorkerResponse)>),
     CancelJobResponse(Vec<(JobId, CancelJobResponse)>),
     ForgetJobResponse(ForgetJobResponse),
@@ -374,18 +373,6 @@ pub enum StopWorkerResponse {
     Failed(String),
 }
 
-#[derive(Serialize, Deserialize, Debug)]
-pub struct StreamStats {
-    pub connections: Vec<String>,
-    pub registrations: Vec<(JobId, PathBuf)>,
-    pub files: Vec<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct StatsResponse {
-    pub stream_stats: StreamStats,
-}
-
 #[derive(Serialize, Deserialize, Debug)]
 #[allow(clippy::large_enum_variant)]
 pub enum SubmitResponse {

crates/pyhq/src/cluster/worker.rs

@@ -31,7 +31,6 @@ impl RunningWorker {
 
             let worker_dir = server_dir.join("worker");
             let work_dir = worker_dir.join("workdir");
-            let log_dir = worker_dir.join("logs");
             let mut configuration = WorkerConfiguration {
                 resources: ResourceDescriptor::new(vec![ResourceDescriptorItem {
                     name: CPU_RESOURCE_NAME.to_string(),
@@ -44,7 +43,6 @@ impl RunningWorker {
                 hostname: get_hostname(None),
                 group: "default".to_string(),
                 work_dir,
-                log_dir,
                 heartbeat_interval: Duration::from_secs(10),
                 overview_configuration: None,
                 idle_timeout: None,

crates/tako/benches/utils/mod.rs

@@ -39,7 +39,6 @@ pub fn create_worker(id: u64) -> Worker {
             hostname: "".to_string(),
             group: "default".to_string(),
             work_dir: Default::default(),
-            log_dir: Default::default(),
             heartbeat_interval: Default::default(),
             overview_configuration: None,
             idle_timeout: None,

crates/tako/src/internal/tests/integration/utils/worker.rs

@@ -72,7 +72,6 @@ pub(super) fn create_worker_configuration(
             hostname: "".to_string(),
             group: "".to_string(),
             work_dir: Default::default(),
-            log_dir: Default::default(),
             heartbeat_interval,
             overview_configuration: send_overview_interval.map(|send_interval| {
                 OverviewConfiguration {
@@ -154,8 +153,6 @@ pub(super) async fn start_worker(
 
     configuration.work_dir.clone_from(&workdir);
     std::fs::create_dir_all(&configuration.work_dir).unwrap();
-    configuration.log_dir.clone_from(&logdir);
-    std::fs::create_dir_all(&configuration.log_dir).unwrap();
 
     let server_address: SocketAddr = SocketAddr::new(Ipv4Addr::LOCALHOST.into(), port);
 

crates/tako/src/internal/tests/test_reactor.rs

@@ -45,7 +45,6 @@ fn test_worker_add() {
         listen_address: "test1:123".into(),
         hostname: "test1".to_string(),
         work_dir: Default::default(),
-        log_dir: Default::default(),
         heartbeat_interval: Duration::from_millis(1000),
         overview_configuration: Some(OverviewConfiguration {
             send_interval: Duration::from_millis(1000),
@@ -99,7 +98,6 @@ fn test_worker_add() {
         hostname: "test2".to_string(),
         group: "default".to_string(),
         work_dir: Default::default(),
-        log_dir: Default::default(),
         heartbeat_interval: Duration::from_millis(1000),
         overview_configuration: Some(OverviewConfiguration {
             send_interval: Duration::from_millis(1000),

crates/tako/src/internal/tests/test_worker.rs

@@ -38,7 +38,6 @@ fn create_test_worker_config() -> WorkerConfiguration {
         hostname: "test1".to_string(),
         group: "default".to_string(),
         work_dir: Default::default(),
-        log_dir: Default::default(),
         heartbeat_interval: Duration::from_millis(1000),
         overview_configuration: Some(OverviewConfiguration {
             send_interval: Duration::from_millis(1000),

crates/tako/src/internal/tests/utils/env.rs

@@ -112,7 +112,6 @@ impl TestEnv {
                 hostname: format!("test{}", i),
                 group: "default".to_string(),
                 work_dir: Default::default(),
-                log_dir: Default::default(),
                 heartbeat_interval: Duration::from_millis(1000),
                 overview_configuration: Some(OverviewConfiguration {
                     send_interval: Duration::from_millis(1000),

crates/tako/src/internal/tests/utils/schedule.rs

@@ -25,7 +25,6 @@ pub fn create_test_worker_config(
         hostname: format!("test{}", worker_id),
         group: "default".to_string(),
         work_dir: Default::default(),
-        log_dir: Default::default(),
         heartbeat_interval: Duration::from_millis(1000),
         overview_configuration: Some(OverviewConfiguration {
             send_interval: Duration::from_millis(1000),