fix: improve scale sorting

packages/common/config/src/config/server/rivet/cluster_provision.rs

@@ -44,7 +44,7 @@ pub struct ClusterPools {
 #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema)]
 #[serde(rename_all = "snake_case", deny_unknown_fields)]
 pub struct ClusterPoolJob {
-	pub provision_margin: u32,
+	pub autoscale_margin: u32,
 	// All other properties are read from Pegboard since they're identical
 }
 
@@ -53,7 +53,7 @@ pub struct ClusterPoolJob {
 #[derive(Debug, Serialize, Deserialize, Clone, Default, JsonSchema)]
 #[serde(rename_all = "snake_case", deny_unknown_fields)]
 pub struct ClusterPoolPegboard {
-	pub provision_margin: u32,
+	pub autoscale_margin: u32,
 
 	pub vlan_addr_range_min: Option<Ipv4Addr>,
 	pub vlan_addr_range_max: Option<Ipv4Addr>,
@@ -125,6 +125,8 @@ impl ClusterPoolPegboard {
 #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema)]
 #[serde(rename_all = "snake_case", deny_unknown_fields)]
 pub struct ClusterPoolGg {
+	pub autoscale_margin: u32,
+
 	#[schemars(with = "Option<String>")]
 	pub vlan_ip_net: Option<Ipv4Net>,
 	pub firewall_rules: Option<Vec<FirewallRule>>,
@@ -205,6 +207,8 @@ impl ClusterPoolGg {
 #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema)]
 #[serde(rename_all = "snake_case", deny_unknown_fields)]
 pub struct ClusterPoolAts {
+	pub autoscale_margin: u32,
+
 	#[schemars(with = "Option<String>")]
 	pub vlan_ip_net: Option<Ipv4Net>,
 	pub firewall_rules: Option<Vec<FirewallRule>>,

packages/common/util/core/src/math.rs

@@ -1,4 +1,5 @@
 /// Divide integers of any type, rounding up. Panics on dividing by 0.
+#[deprecated(note="use x.div_ceil(y) instead")]
 #[macro_export]
 macro_rules! div_up {
 	($a:expr, $b:expr) => {

packages/services/cluster/src/workflows/datacenter/scale.rs

@@ -76,6 +76,12 @@ struct PoolCtx {
 	desired_count: usize,
 }
 
+#[derive(Clone)]
+struct ServerSortTopology {
+	cpu: u32,
+	memory: u32,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Input {
 	pub datacenter_id: Uuid,
@@ -189,20 +195,29 @@ async fn calculate_diff(
 
 	let dc = unwrap!(datacenter_res.datacenters.first());
 
+	// Build hashmap from topos for sorting
 	let topology = unwrap!(topology_res.datacenters.first());
-	let memory_by_server = topology
+	let topo_by_server = topology
 		.servers
 		.iter()
-		.map(|server| Ok((server.server_id, server.usage.memory)))
+		.map(|server| {
+			Ok((
+				server.server_id,
+				ServerSortTopology {
+					cpu: server.usage.cpu,
+					memory: server.usage.memory,
+				},
+			))
+		})
 		.collect::<GlobalResult<HashMap<_, _>>>()?;
 
 	// Run everything in a locking transaction
 	let actions = rivet_pools::utils::crdb::tx(&ctx.crdb().await?, |tx| {
 		let ctx = ctx.clone();
 		let dc = dc.clone();
-		let memory_by_server = memory_by_server.clone();
+		let topo_by_server = topo_by_server.clone();
 
-		inner(ctx, tx, dc, memory_by_server).boxed()
+		inner(ctx, tx, dc, topo_by_server).boxed()
 	})
 	.await?;
 
@@ -213,7 +228,7 @@ async fn inner(
 	ctx: ActivityCtx,
 	tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
 	dc: Datacenter,
-	memory_by_server: HashMap<Uuid, u32>,
+	topo_by_server: HashMap<Uuid, ServerSortTopology>,
 ) -> GlobalResult<Vec<Action>> {
 	let servers = sql_fetch_all!(
 		[ctx, ServerRow, @tx tx]
@@ -244,8 +259,16 @@ async fn inner(
 		.map(TryInto::try_into)
 		.collect::<GlobalResult<Vec<Server>>>()?;
 
-	// Sort servers by memory usage
-	servers.sort_by_key(|server| memory_by_server.get(&server.server_id));
+	// Sort servers
+	servers.sort_by_key(|server| {
+		let topo = topo_by_server.get(&server.server_id);
+		match server.pool_type {
+			// Sort job and pb servers by memory
+			PoolType::Job | PoolType::Pegboard => (topo.map(|t| t.memory), None),
+			// Sort the rest by cpu
+			_ => (None, topo.map(|t| t.cpu)),
+		}
+	});
 
 	let mut actions = Vec::new();
 

packages/services/cluster/src/workflows/server/install/install_scripts/components/traefik.rs

@@ -6,8 +6,8 @@ use indoc::formatdoc;
 use super::{
 	ok_server::OK_SERVER_PORT,
 	pegboard::TUNNEL_PEGBOARD_WS_PORT,
-	vector::{TUNNEL_VECTOR_PORT, TUNNEL_VECTOR_TCP_JSON_PORT},
 	rivet::TUNNEL_API_EDGE_PORT,
+	vector::{TUNNEL_VECTOR_PORT, TUNNEL_VECTOR_TCP_JSON_PORT},
 };
 
 pub const TUNNEL_SERVICES: &[TunnelService] = &[