github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-25 19:21:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4441 from liubin/fix/refactor-reading-mountstat-log

Browse Source 
agent: refactor reading file timing for debugging
This commit is contained in:
Chelsea Mafrica 2022-06-14 14:18:14 -07:00 committed by GitHub
commit db2a4d6cdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/agent/src/mount.rs
View File

@ -840,15 +840,13 @@ pub fn get_mount_fs_type_from_file(mount_file: &str, mount_point: &str) -> Resul
return Err(anyhow!("Invalid mount point {}", mount_point)); return Err(anyhow!("Invalid mount point {}", mount_point));
} }
let file = File::open(mount_file)?; let content = fs::read_to_string(mount_file)?;
let reader = BufReader::new(file);
let re = Regex::new(format!("device .+ mounted on {} with fstype (.+)", mount_point).as_str())?; let re = Regex::new(format!("device .+ mounted on {} with fstype (.+)", mount_point).as_str())?;
// Read the file line by line using the lines() iterator from std::io::BufRead. // Read the file line by line using the lines() iterator from std::io::BufRead.
for (_index, line) in reader.lines().enumerate() { for (_index, line) in content.lines().enumerate() {
let line = line?; let capes = match re.captures(line) {
let capes = match re.captures(line.as_str()) {
Some(c) => c, Some(c) => c,
None => continue, None => continue,
}; };
@ -861,7 +859,7 @@ pub fn get_mount_fs_type_from_file(mount_file: &str, mount_point: &str) -> Resul
Err(anyhow!( Err(anyhow!(
"failed to find FS type for mount point {}, mount file content: {:?}", "failed to find FS type for mount point {}, mount file content: {:?}",
mount_point, mount_point,
fs::read_to_string(mount_file) content
)) ))
} }