Merge pull request #65 from mvlabat/webhook-autoscaling

Fix game server autoscaling
vladbat00 · Nov 20, 2021 · 4e6490d · 4e6490d
2 parents 155fa1d + f2d7ca5
commit 4e6490d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bins/matchmaker/src/main.rs b/bins/matchmaker/src/main.rs
@@ -289,9 +289,9 @@ async fn serve_webhook_service(tx: Sender<MatchmakerMessage>, servers: Servers)
                 let servers = servers.all().await;
                 let active_players = tx.receiver_count() as u32
                     + servers.iter().map(|s| s.player_count).sum::<u16>() as u32;
-                let total_capacity = servers.iter().map(|s| s.player_capacity).sum::<u16>() as u32;
+                let desired_replicas_count =
+                    active_players.unstable_div_ceil(PLAYER_CAPACITY as u32);
 
-                let desired_replicas_count = active_players.unstable_div_ceil(total_capacity);
                 fleet_autoscale_review.response = Some(FleetAutoscaleResponse {
                     uid: fleet_autoscale_review.request.uid.clone(),
                     scale: desired_replicas_count != fleet_autoscale_review.request.status.replicas,

diff --git a/libs/server_lib/src/lib.rs b/libs/server_lib/src/lib.rs
@@ -130,7 +130,7 @@ pub fn init_level(
     if let Some(agones) = agones {
         let mut sdk = agones.sdk.clone();
         TOKIO.spawn(async move {
-            if let Err(err) = sdk.mark_ready().await {
+            if let Err(err) = sdk.allocate().await {
                 log::error!(
                     "Failed to mark the Game Server as ready, exiting: {:?}",
                     err