mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-03 13:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

krata: improvements to event handling during reconciliation

Browse Source
This commit is contained in:
Alex Zenla
2024-03-14 23:29:07 +00:00
parent 9bbf8420f2
commit 31a43f9108
9 changed files with 156 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/kratart/src/launch/mod.rs
View File

@ -45,7 +45,7 @@ impl GuestLauncher {
request: GuestLaunchRequest<'r>,
) -> Result<GuestInfo> {
let uuid = request.uuid.unwrap_or_else(Uuid::new_v4);
let name = format!("krata-{uuid}");
let xen_name = format!("krata-{uuid}");
let image_info = self.compile(request.image, &context.image_cache).await?;
let mut gateway_mac = MacAddr6::random();
@ -161,7 +161,7 @@ impl GuestLauncher {
let config = DomainConfig {
backend_domid: 0,
name: &name,
name: &xen_name,
max_vcpus: request.vcpus,
mem_mb: request.mem,
kernel_path: &context.kernel,

25
crates/kratart/src/lib.rs
View File

@ -178,18 +178,9 @@ impl RuntimeContext {
Ok(guests)
}
pub async fn resolve(&mut self, id: &str) -> Result<Option<GuestInfo>> {
pub async fn resolve(&mut self, uuid: Uuid) -> Result<Option<GuestInfo>> {
for guest in self.list().await? {
let uuid_string = guest.uuid.to_string();
let domid_string = guest.domid.to_string();
if let Some(ref name) = guest.name {
if name == id {
return Ok(Some(guest));
}
}
if uuid_string == id || domid_string == id || id == format!("krata-{}", uuid_string) {
if guest.uuid == uuid {
return Ok(Some(guest));
}
}
@ -241,12 +232,12 @@ impl Runtime {
launcher.launch(&mut context, request).await
}
pub async fn destroy(&self, id: &str) -> Result<Uuid> {
pub async fn destroy(&self, uuid: Uuid) -> Result<Uuid> {
let mut context = self.context.lock().await;
let info = context
.resolve(id)
.resolve(uuid)
.await?
.ok_or_else(|| anyhow!("unable to resolve guest: {}", id))?;
.ok_or_else(|| anyhow!("unable to resolve guest: {}", uuid))?;
let domid = info.domid;
let mut store = XsdClient::open().await?;
let dom_path = store.get_domain_path(domid).await?;
@ -288,12 +279,12 @@ impl Runtime {
Ok(uuid)
}
pub async fn console(&self, id: &str) -> Result<XenConsole> {
pub async fn console(&self, uuid: Uuid) -> Result<XenConsole> {
let mut context = self.context.lock().await;
let info = context
.resolve(id)
.resolve(uuid)
.await?
.ok_or_else(|| anyhow!("unable to resolve guest: {}", id))?;
.ok_or_else(|| anyhow!("unable to resolve guest: {}", uuid))?;
let domid = info.domid;
let tty = context.xen.get_console_path(domid).await?;
XenConsole::new(&tty).await