Add D-Bus method to get filesystem metadata #3656
Conversation
mulkieran
force-pushed
the
debug-filesystem-metadata
branch
from
87a3542 to
e3674b7
Compare
|
Cockpit tests failed for commit 87a3542. @martinpitt, @jelly, @mvollmer please check. |
|
Cockpit tests failed for commit e3674b7. @martinpitt, @jelly, @mvollmer please check. |
mulkieran
force-pushed
the
debug-filesystem-metadata
branch
6 times, most recently
from
5acae53 to
8273f20
Compare
mulkieran
force-pushed
the
debug-filesystem-metadata
branch
3 times, most recently
from
5cb1a8d to
62c7d21
Compare
src/engine/sim_engine/pool.rs
Outdated
| fn current_fs_metadata(&self, fs_name: Option<&str>) -> StratisResult<String> { | ||
| self.filesystems | ||
| .iter() | ||
| .filter_map(|(name, uuid, fs)| { | ||
| if fs_name.map(|n| *n == **name).unwrap_or(true) { | ||
| Some(serde_json::to_string(&fs.record(name, *uuid)).map_err(|e| e.into())) | ||
| } else { | ||
| None | ||
| } | ||
| }) | ||
| .collect::<StratisResult<Vec<_>>>() | ||
| .map(|v| v.join("\n")) | ||
| } |
There was a problem hiding this comment.
If I'm understanding this correctly, this means if fs_name is None it will return a bunch of JSON blobs separated by newlines for all filesystems present in the pool. Wouldn't it be better to put this all into a JSON object mapping UUIDs to metadata? I'm unaware of any JSON parser that can handle multiple separate blobs of JSON at once.
There was a problem hiding this comment.
@jbaublitz That's exactly what it does. I was of two minds about this, but then I found that jq is fine with distinct blobs of JSON and I grew more satisfied with it.
$ cat junk.txt | jq
{}
{
"key": 2
}
But your proposed solution is likely better.
There was a problem hiding this comment.
I don't know of any JSON parser in a programming language like Python that will do the same unfortunately.
| pub fn current_fs_metadata(&self, fs_name: Option<&str>) -> StratisResult<String> { | ||
| self.filesystems | ||
| .iter() | ||
| .filter_map(|(name, uuid, fs)| { | ||
| if fs_name.map(|n| *n == **name).unwrap_or(true) { | ||
| Some(serde_json::to_string(&fs.record(name, *uuid)).map_err(|e| e.into())) | ||
| } else { | ||
| None | ||
| } | ||
| }) | ||
| .collect::<StratisResult<Vec<_>>>() | ||
| .map(|v| v.join("\n")) | ||
| } | ||
|
|
||
| /// Read filesystem metadata from mdv | ||
| pub fn last_fs_metadata(&self, fs_name: Option<&str>) -> StratisResult<String> { | ||
| self.mdv | ||
| .filesystems()? | ||
| .iter() | ||
| .filter_map(|fssave| { | ||
| if fs_name.map(|n| *n == fssave.name).unwrap_or(true) { | ||
| Some(serde_json::to_string(fssave).map_err(|e| e.into())) | ||
| } else { | ||
| None | ||
| } | ||
| }) | ||
| .collect::<StratisResult<Vec<_>>>() | ||
| .map(|v| v.join("\n")) |
There was a problem hiding this comment.
Same comment here as in the SimPool.
mulkieran
force-pushed
the
debug-filesystem-metadata
branch
2 times, most recently
from
639a920 to
43027a8
Compare
Signed-off-by: mulhern <[email protected]>
mulkieran
force-pushed
the
debug-filesystem-metadata
branch
from
43027a8 to
b2e1777
Compare
|
infrastructure problem on tests, ignoring |
Related #3621