Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion svc/pkg/cluster/worker/src/workers/datacenter_taint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ async fn worker(
) -> GlobalResult<()> {
let datacenter_id = unwrap_ref!(ctx.datacenter_id).as_uuid();

// Taint server records
// Taint server records. These will be incrementally drained and destroyed by `cluster-datacenter-scale`
sql_execute!(
[ctx]
"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ async fn worker(
) -> GlobalResult<()> {
let server_id = unwrap_ref!(ctx.server_id).as_uuid();

// Set as completed draining
// Set as completed draining. Will be destroyed by `cluster-datacenter-scale`
let (datacenter_id,) = sql_fetch_one!(
[ctx, (Uuid,)]
"
Expand Down
3 changes: 3 additions & 0 deletions svc/pkg/cluster/worker/src/workers/server_dns_create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ async fn worker(
.await?;
let record_id = create_record_res.result.id;

// This is solely for compatibility with Discord activities. Their docs say they support parameter
// mapping but it does not work
// https://discord.com/developers/docs/activities/development-guides#prefixtarget-formatting-rules
let secondary_record_name = format!(
"lobby.{}.{}",
server.datacenter_id,
Expand Down
1 change: 1 addition & 0 deletions svc/pkg/cluster/worker/src/workers/server_drain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ async fn worker(ctx: &OperationContext<cluster::msg::server_drain::Message>) ->
return Ok(());
};

// Drain complete message is caught by `cluster-nomad-node-drain-complete`
nodes_api::update_node_drain(
&NOMAD_CONFIG,
&nomad_node_id,
Expand Down
5 changes: 5 additions & 0 deletions svc/pkg/faker/ops/region/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ async fn handle(
region_ids: region_list.region_ids.clone(),
})
.await?;

// For consistency
let mut regions = region_get.regions.clone();
regions.sort_by_key(|region| region.region_id.map(|id| id.as_uuid()));

let region = unwrap!(region_get.regions.first());

Ok(faker::region::Response {
Expand Down
2 changes: 1 addition & 1 deletion svc/pkg/linode/ops/instance-type-get/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub async fn handle(
let instance_types_res = ctx
.cache()
.ttl(util::duration::days(1))
.fetch_one_proto("instance_type", "linode", {
.fetch_one_proto("instance_types", "linode", {
let client = client.clone();
move |mut cache, key| {
let client = client.clone();
Expand Down