kata-types: introduce StorageDevice and StorageHandlerManager

Introduce StorageDevice and StorageHandlerManager, which will be used
to refine storage device management for kata-agent.

Signed-off-by: Jiang Liu <gerry@linux.alibaba.com>
This commit is contained in:
Jiang Liu
2023-08-09 10:12:47 +08:00
parent b03b1f6134
commit fcbda0b419
3 changed files with 111 additions and 16 deletions

View File

@@ -5,6 +5,7 @@
//
use anyhow::{anyhow, Context, Error, Result};
use std::collections::hash_map::Entry;
use std::convert::TryFrom;
use std::fmt::Formatter;
use std::{collections::HashMap, fs, path::PathBuf};
@@ -431,6 +432,7 @@ impl TryFrom<&NydusExtraOptions> for KataVirtualVolume {
/// An implementation of generic storage device.
pub struct StorageDeviceGeneric {
refcount: u32,
path: String,
}
impl std::fmt::Debug for StorageDeviceGeneric {
@@ -443,26 +445,85 @@ impl std::fmt::Debug for StorageDeviceGeneric {
impl StorageDeviceGeneric {
/// Create a new instance of `StorageStateCommon`.
pub fn new() -> Self {
StorageDeviceGeneric { refcount: 0 }
pub fn new(path: String) -> Self {
StorageDeviceGeneric { refcount: 1, path }
}
}
impl StorageDevice for StorageDeviceGeneric {
fn path(&self) -> &str {
&self.path
}
/// Get reference count.
pub fn ref_count(&self) -> u32 {
fn ref_count(&self) -> u32 {
self.refcount
}
/// Decrease reference count and return true if it reaches zero.
pub fn inc_ref_count(&mut self) {
fn inc_ref_count(&mut self) {
self.refcount += 1;
}
/// Decrease reference count and return true if it reaches zero.
pub fn dec_and_test_ref_count(&mut self) -> bool {
fn dec_and_test_ref_count(&mut self) -> bool {
assert!(self.refcount > 0);
self.refcount -= 1;
self.refcount == 0
}
fn cleanup(&self) {}
}
/// Trait object for storage device.
pub trait StorageDevice: Send + Sync {
/// Path
fn path(&self) -> &str;
/// Get reference count.
fn ref_count(&self) -> u32;
/// Increase reference count.
fn inc_ref_count(&mut self);
/// Decrease reference count and return true if it reaches zero.
fn dec_and_test_ref_count(&mut self) -> bool;
/// Clean up resources related to the storage device.
fn cleanup(&self);
}
/// Manager to manage registered storage device handlers.
pub struct StorageHandlerManager<H> {
handlers: HashMap<String, H>,
}
impl<H> Default for StorageHandlerManager<H> {
fn default() -> Self {
Self::new()
}
}
impl<H> StorageHandlerManager<H> {
/// Create a new instance of `StorageHandlerManager`.
pub fn new() -> Self {
Self {
handlers: HashMap::new(),
}
}
/// Register a storage device handler.
pub fn add_handler(&mut self, id: &str, handler: H) -> Result<()> {
match self.handlers.entry(id.to_string()) {
Entry::Occupied(_) => Err(anyhow!("storage handler for {} already exists", id)),
Entry::Vacant(entry) => {
entry.insert(handler);
Ok(())
}
}
}
/// Get storage handler with specified `id`.
pub fn handler(&self, id: &str) -> Option<&H> {
self.handlers.get(id)
}
}
/// Join user provided volume path with kata direct-volume root path.
@@ -700,12 +761,14 @@ mod tests {
#[test]
fn test_storage_state_common() {
let mut state = StorageDeviceGeneric::new();
assert_eq!(state.ref_count(), 0);
state.inc_ref_count();
let mut state = StorageDeviceGeneric::new("".to_string());
assert_eq!(state.ref_count(), 1);
state.inc_ref_count();
assert_eq!(state.ref_count(), 2);
state.inc_ref_count();
assert_eq!(state.ref_count(), 3);
assert!(!state.dec_and_test_ref_count());
assert_eq!(state.ref_count(), 2);
assert!(!state.dec_and_test_ref_count());
assert_eq!(state.ref_count(), 1);
assert!(state.dec_and_test_ref_count());