From 35de475ad78d36f083caaa660c8862f771057b36 Mon Sep 17 00:00:00 2001
From: MasterPtato <maxpopkov.contact@gmail.com>
Date: Fri, 6 Sep 2024 20:35:47 +0000
Subject: [PATCH] fix(ds, mm): hard code disk per core

---
 svc/pkg/ds/src/workflows/server/mod.rs           | 16 +++-------------
 svc/pkg/linode/src/util/mod.rs                   |  3 ++-
 .../worker/src/workers/lobby_create/nomad_job.rs |  1 -
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/svc/pkg/ds/src/workflows/server/mod.rs b/svc/pkg/ds/src/workflows/server/mod.rs
index 8e1ace8fd0..de2b9c0614 100644
--- a/svc/pkg/ds/src/workflows/server/mod.rs
+++ b/svc/pkg/ds/src/workflows/server/mod.rs
@@ -477,7 +477,7 @@ async fn submit_job(ctx: &ActivityCtx, input: &SubmitJobInput) -> GlobalResult<S
 		// Nomad configures CPU based on MHz, not millicores. We havel to calculate the CPU share
 		// by knowing how many MHz are on the client.
 		CPU: if tier.rivet_cores_numerator < tier.rivet_cores_denominator {
-			Some((tier.cpu - util_job::TASK_CLEANUP_CPU as u64).try_into()?)
+			Some(tier.cpu.try_into()?)
 		} else {
 			None
 		},
@@ -486,20 +486,10 @@ async fn submit_job(ctx: &ActivityCtx, input: &SubmitJobInput) -> GlobalResult<S
 		} else {
 			None
 		},
-		memory_mb: Some(
-			(TryInto::<i64>::try_into(memory)? / (1024 * 1024)
-				- util_job::TASK_CLEANUP_MEMORY as i64)
-				.try_into()?,
-		),
+		memory_mb: Some(tier.memory.try_into()?),
 		// Allow oversubscribing memory by 50% of the reserved
 		// memory if using less than the node's total memory
-		memory_max_mb: None,
-		// Some(
-		// 	(TryInto::<i64>::try_into(memory_max)? / (1024 * 1024)
-		// 		- util_job::TASK_CLEANUP_MEMORY as i64)
-		// 		.try_into()?,
-		// ),
-		disk_mb: Some(tier.disk as i32), // TODO: Is this deprecated?
+		memory_max_mb: Some(tier.memory_max.try_into()?),
 		..Resources::new()
 	};
 
diff --git a/svc/pkg/linode/src/util/mod.rs b/svc/pkg/linode/src/util/mod.rs
index cdd526c1b8..4f48969fff 100644
--- a/svc/pkg/linode/src/util/mod.rs
+++ b/svc/pkg/linode/src/util/mod.rs
@@ -12,6 +12,7 @@ const RESERVE_LB_MEMORY: u64 = 512;
 const RESERVE_MEMORY: u64 = RESERVE_SYSTEM_MEMORY + RESERVE_LB_MEMORY;
 
 const CPU_PER_CORE: u64 = 1999;
+const DISK_PER_CORE: u64 = 8192;
 
 /// Provider agnostic hardware specs.
 #[derive(Debug)]
@@ -53,7 +54,7 @@ impl JobNodeConfig {
 	}
 
 	pub fn disk_per_core(&self) -> u64 {
-		self.disk / self.cpu_cores
+		DISK_PER_CORE
 	}
 
 	pub fn bandwidth_per_core(&self) -> u64 {
diff --git a/svc/pkg/mm/worker/src/workers/lobby_create/nomad_job.rs b/svc/pkg/mm/worker/src/workers/lobby_create/nomad_job.rs
index ab2e1a6020..83c1d1f69a 100644
--- a/svc/pkg/mm/worker/src/workers/lobby_create/nomad_job.rs
+++ b/svc/pkg/mm/worker/src/workers/lobby_create/nomad_job.rs
@@ -107,7 +107,6 @@ pub fn gen_lobby_docker_job(
 		// Allow oversubscribing memory by 50% of the reserved
 		// memory if using less than the node's total memory
 		memory_max_mb: Some(tier.memory_max.try_into()?),
-		disk_mb: Some(tier.disk as i32), // TODO: Is this deprecated?
 		..Resources::new()
 	};