Skip to content
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

fix(vm): close libvirt connections #2392

Merged
merged 2 commits into from
Oct 15, 2024
Merged

fix(vm): close libvirt connections #2392

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9c515c
fix(vm): close libvirt connections
kmd-fl Oct 9, 2024
44cdf23
fix clippy
kmd-fl Oct 9, 2024
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
45 changes: 38 additions & 7 deletions crates/vm-utils/src/vm_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,37 @@ impl VmStatus {
}
}

struct AutocloseConnect(Connect);

impl AutocloseConnect {
fn open(uri: &str) -> Result<Self, VmError> {
Connect::open(Some(uri))
.map(Self)
.map_err(|err| VmError::FailedToConnect { err })
}
}

impl std::ops::Deref for AutocloseConnect {
type Target = Connect;

fn deref(&self) -> &Self::Target {
&self.0
}
}

impl Drop for AutocloseConnect {
fn drop(&mut self) {
match self.0.close() {
Ok(_) => {}
Err(err) => {
tracing::warn!(target: "vm-utils","Failed to close connection properly: {err}");
}
}
}
}

pub fn create_domain(uri: &str, params: &CreateVMDomainParams) -> Result<(), VmError> {
let conn = Connect::open(Some(uri)).map_err(|err| VmError::FailedToConnect { err })?;
let conn = AutocloseConnect::open(uri)?;
let domain = Domain::lookup_by_name(&conn, params.name.as_str()).ok();

match domain {
Expand All @@ -180,12 +209,13 @@ pub fn create_domain(uri: &str, params: &CreateVMDomainParams) -> Result<(), VmE
tracing::info!(target: "vm-utils","Domain with name {} already exists. Skipping", params.name);
}
};

Ok(())
}

pub fn remove_domain(uri: &str, name: &str) -> Result<(), VmError> {
tracing::info!(target: "vm-utils","Removing domain with name {}", name);
let conn = Connect::open(Some(uri)).map_err(|err| VmError::FailedToConnect { err })?;
let conn = AutocloseConnect::open(uri)?;
let domain = Domain::lookup_by_name(&conn, name).map_err(|err| VmError::VmNotFound {
name: name.to_string(),
err,
Expand Down Expand Up @@ -217,7 +247,7 @@ pub fn remove_domain(uri: &str, name: &str) -> Result<(), VmError> {
}
pub fn start_vm(uri: &str, name: &str) -> Result<u32, VmError> {
tracing::info!(target: "vm-utils","Starting VM with name {name}");
let conn = Connect::open(Some(uri)).map_err(|err| VmError::FailedToConnect { err })?;
let conn = AutocloseConnect::open(uri)?;
let domain = Domain::lookup_by_name(&conn, name).map_err(|err| VmError::VmNotFound {
name: name.to_string(),
err,
Expand Down Expand Up @@ -246,7 +276,7 @@ pub fn start_vm(uri: &str, name: &str) -> Result<u32, VmError> {

pub fn stop_vm(uri: &str, name: &str) -> Result<(), VmError> {
tracing::info!(target: "vm-utils","Stopping VM with name {name}");
let conn = Connect::open(Some(uri)).map_err(|err| VmError::FailedToConnect { err })?;
let conn = AutocloseConnect::open(uri)?;
let domain = Domain::lookup_by_name(&conn, name).map_err(|err| VmError::VmNotFound {
name: name.to_string(),
err,
Expand All @@ -261,7 +291,7 @@ pub fn stop_vm(uri: &str, name: &str) -> Result<(), VmError> {

pub fn reboot_vm(uri: &str, name: &str) -> Result<(), VmError> {
tracing::info!(target: "vm-utils","Rebooting VM with name {name}");
let conn = Connect::open(Some(uri)).map_err(|err| VmError::FailedToConnect { err })?;
let conn = AutocloseConnect::open(uri)?;
let domain = Domain::lookup_by_name(&conn, name).map_err(|err| VmError::VmNotFound {
name: name.to_string(),
err,
Expand All @@ -277,7 +307,7 @@ pub fn reboot_vm(uri: &str, name: &str) -> Result<(), VmError> {

pub fn reset_vm(uri: &str, name: &str) -> Result<(), VmError> {
tracing::info!(target: "vm-utils","Resetting VM with name {name}");
let conn = Connect::open(Some(uri)).map_err(|err| VmError::FailedToConnect { err })?;
let conn = AutocloseConnect::open(uri)?;
let domain = Domain::lookup_by_name(&conn, name).map_err(|err| VmError::VmNotFound {
name: name.to_string(),
err,
Expand All @@ -291,7 +321,7 @@ pub fn reset_vm(uri: &str, name: &str) -> Result<(), VmError> {

pub fn status_vm(uri: &str, name: &str) -> Result<VmStatus, VmError> {
tracing::info!(target: "vm-utils","Getting info for VM with name {name}");
let conn = Connect::open(Some(uri)).map_err(|err| VmError::FailedToConnect { err })?;
let conn = AutocloseConnect::open(uri)?;
let domain = Domain::lookup_by_name(&conn, name).map_err(|err| VmError::VmNotFound {
name: name.to_string(),
err,
Expand Down Expand Up @@ -529,6 +559,7 @@ mod tests {
use super::*;
use nonempty::nonempty;
use std::fs;

const DEFAULT_URI: &str = "test:///default";

fn list_defined() -> Result<Vec<String>, VmError> {
Expand Down
Loading