github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-31 17:37:20 +00:00
Code Issues Projects Releases Wiki Activity

libs/kata-types: change return type of getting CPU period/quota

Browse Source 
period should have a type of u64, and quota should be i64, the
function of getting CPU period and quota from annotations should
use the same data type as function return type.

Fixes: #5100

Signed-off-by: Bin Liu <bin@hyper.sh>
This commit is contained in:
Bin Liu
2022-09-06 11:35:52 +08:00
parent ba013c5d0f
commit 96c8be715b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/kata-types/src/annotations/mod.rs
View File

@@ -379,17 +379,17 @@ impl Annotation {
} }
/// Get the annotation of cpu quota for sandbox /// Get the annotation of cpu quota for sandbox
pub fn get_sandbox_cpu_quota(&self) -> u64 { pub fn get_sandbox_cpu_quota(&self) -> i64 {
let value = self let value = self
.get_value::<u64>(SANDBOX_CPU_QUOTA_KEY) .get_value::<i64>(SANDBOX_CPU_QUOTA_KEY)
.unwrap_or(Some(0)); .unwrap_or(Some(0));
value.unwrap_or(0) value.unwrap_or(0)
} }
/// Get the annotation of cpu period for sandbox /// Get the annotation of cpu period for sandbox
pub fn get_sandbox_cpu_period(&self) -> i64 { pub fn get_sandbox_cpu_period(&self) -> u64 {
let value = self let value = self
.get_value::<i64>(SANDBOX_CPU_PERIOD_KEY) .get_value::<u64>(SANDBOX_CPU_PERIOD_KEY)
.unwrap_or(Some(0)); .unwrap_or(Some(0));
value.unwrap_or(0) value.unwrap_or(0)
} }

4
src/runtime-rs/crates/runtimes/src/static_resource.rs
View File

@@ -128,8 +128,8 @@ fn get_sizing_info(annotation: Annotation) -> Result<(u64, i64, i64)> {
// since we are *adding* our result to the config, a value of 0 will cause no change // since we are *adding* our result to the config, a value of 0 will cause no change
// and if the annotation is not assigned (but static resource management is), we will // and if the annotation is not assigned (but static resource management is), we will
// log a *warning* to fill that with zero value // log a *warning* to fill that with zero value
let period = annotation.get_sandbox_cpu_quota(); let period = annotation.get_sandbox_cpu_period();
let quota = annotation.get_sandbox_cpu_period(); let quota = annotation.get_sandbox_cpu_quota();
let memory = annotation.get_sandbox_mem(); let memory = annotation.get_sandbox_mem();
Ok((period, quota, memory)) Ok((period, quota, memory))
} }