Skip to content

Commit

Permalink
fix: server sql
Browse files Browse the repository at this point in the history
  • Loading branch information
MasterPtato committed Apr 23, 2024
1 parent 0696179 commit 299df84
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
4 changes: 3 additions & 1 deletion svc/pkg/cluster/worker/src/workers/datacenter_scale.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ async fn inner(
datacenter_id = $1 AND
-- Filters out servers that are being destroyed/already destroyed
cloud_destroy_ts IS NULL
-- Newer servers will be destroyed first
ORDER BY create_ts DESC
FOR UPDATE
",
datacenter_id,
Expand Down Expand Up @@ -157,7 +159,7 @@ async fn inner(
.collect::<GlobalResult<Vec<_>>>()?;

// Sort job servers by memory usage
servers.sort_unstable_by_key(|server| memory_by_server.get(&server.server_id));
servers.sort_by_key(|server| memory_by_server.get(&server.server_id));

// TODO: RVT-3732 Sort gg and ats servers by cpu usage
// servers.sort_by_key
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ ConditionPathExists=!/var/tmp/rivet_hook.completed
User=root
Group=root
Type=oneshot
RemainAfterExit=true
Restart=on-failure
RestartSec=1s
ExecStart=/usr/bin/rivet_hook.sh
ExecStartPost=/bin/touch /var/tmp/rivet_hook.completed
Expand Down
8 changes: 7 additions & 1 deletion svc/pkg/cluster/worker/src/workers/server_provision.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,19 @@ async fn inner(
SET
provider_server_id = $2,
provider_hardware = $3,
public_ip = $4
public_ip = $4,
install_complete_ts = $5
WHERE server_id = $1
",
server_id,
&provision_res.provider_server_id,
&provision_res.provider_hardware,
&provision_res.public_ip,
if provision_res.already_installed {
Some(util::timestamp::now())
} else {
None
}
)
.await?;

Expand Down

0 comments on commit 299df84

Please sign in to comment.