Skip to content

Improves external IP idempotency #1493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 26, 2022
Merged

Improves external IP idempotency #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef314e7
Improves external IP idempotency
bnaecker Jul 25, 2022
5292bda
Use inequality for DB record timestamps in tests
bnaecker Jul 26, 2022
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
46 changes: 29 additions & 17 deletions nexus/src/app/sagas/instance_create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,14 +475,14 @@ async fn sic_create_default_primary_network_interface(
/// Create an external IP address for instance source NAT.
async fn sic_allocate_instance_snat_ip(
sagactx: ActionContext<SagaInstanceCreate>,
) -> Result<Uuid, ActionError> {
) -> Result<(), ActionError> {
let osagactx = sagactx.user_data();
let datastore = osagactx.datastore();
let saga_params = sagactx.saga_params();
let opctx =
OpContext::for_saga_action(&sagactx, &saga_params.serialized_authn);
let instance_id = sagactx.lookup::<Uuid>("instance_id")?;
let ip_id = Uuid::new_v4();
let ip_id = sagactx.lookup::<Uuid>("snat_ip_id")?;
datastore
.allocate_instance_snat_ip(
&opctx,
Expand All @@ -492,7 +492,7 @@ async fn sic_allocate_instance_snat_ip(
)
.await
.map_err(ActionError::action_failed)?;
Ok(ip_id)
Ok(())
}

/// Destroy an allocated SNAT IP address for the instance.
Expand All @@ -504,7 +504,7 @@ async fn sic_allocate_instance_snat_ip_undo(
let saga_params = sagactx.saga_params();
let opctx =
OpContext::for_saga_action(&sagactx, &saga_params.serialized_authn);
let ip_id = sagactx.lookup::<Uuid>("snat_ip")?;
let ip_id = sagactx.lookup::<Uuid>("snat_ip_id")?;
datastore
.deallocate_instance_external_ip(&opctx, ip_id)
.await
Expand All @@ -517,23 +517,28 @@ async fn sic_allocate_instance_snat_ip_undo(
async fn sic_allocate_instance_external_ip(
sagactx: ActionContext<SagaInstanceCreate>,
ip_index: usize,
) -> Result<Option<Uuid>, ActionError> {
) -> Result<(), ActionError> {
let osagactx = sagactx.user_data();
let datastore = osagactx.datastore();
let saga_params = sagactx.saga_params();
let ip_params = saga_params.create_params.external_ips.get(ip_index);
let ip_params = match ip_params {
None => {
return Ok(None);
return Ok(());
}
Some(ref prs) => prs,
};
let opctx =
OpContext::for_saga_action(&sagactx, &saga_params.serialized_authn);
let instance_id = sagactx.lookup::<Uuid>("instance_id")?;
let name = format!("external_ip_id{ip_index}");
let ip_id = sagactx.lookup::<Option<Uuid>>(&name)?.ok_or_else(|| {
ActionError::action_failed(Error::internal_error(
"Expected a UUID for instance external IP",
))
})?;

// Generate an ID and collect the possible pool name for this IP address
let ip_id = Uuid::new_v4();
// Collect the possible pool name for this IP address
let pool_name = match ip_params {
params::ExternalIpCreate::Ephemeral { ref pool_name } => {
pool_name.as_ref().map(|name| db::model::Name(name.clone()))
Expand All @@ -549,7 +554,7 @@ async fn sic_allocate_instance_external_ip(
)
.await
.map_err(ActionError::action_failed)?;
Ok(Some(ip_id))
Ok(())
}

async fn sic_allocate_instance_external_ip_undo(
Expand All @@ -559,16 +564,23 @@ async fn sic_allocate_instance_external_ip_undo(
let osagactx = sagactx.user_data();
let datastore = osagactx.datastore();
let saga_params = sagactx.saga_params();
if ip_index >= saga_params.create_params.external_ips.len() {
return Ok(());
}

let opctx =
OpContext::for_saga_action(&sagactx, &saga_params.serialized_authn);
let name = format!("external_ip{ip_index}");
let maybe_ip_id = sagactx.lookup::<Option<Uuid>>(name.as_str())?;
if let Some(ip_id) = maybe_ip_id {
datastore
.deallocate_instance_external_ip(&opctx, ip_id)
.await
.map_err(ActionError::action_failed)?;
}
let name = format!("external_ip_id{ip_index}");
let ip_id =
sagactx.lookup::<Option<Uuid>>(name.as_str())?.ok_or_else(|| {
ActionError::action_failed(Error::internal_error(
"Expected a UUID for instance external IP",
))
})?;
datastore
.deallocate_instance_external_ip(&opctx, ip_id)
.await
.map_err(ActionError::action_failed)?;
Ok(())
}

Expand Down
Loading