Skip to content

fix: Don't read and check targetNumIDs file on v7 import #17

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

Merged
merged 1 commit into from
Jul 9, 2025
Merged

fix: Don't read and check targetNumIDs file on v7 import #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 8 additions & 21 deletions mgmtd/src/db/import_v7.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ pub fn import_v7(tx: &rusqlite::Transaction, base_path: &Path) -> Result<()> {

// Storage
storage_nodes(tx, &base_path.join("storage.nodes")).context("storage.nodes")?;
storage_targets(
tx,
&base_path.join("targets"),
&base_path.join("targetNumIDs"),
)
.context("storage targets (target + targetNumIDs)")?;
storage_targets(tx, &base_path.join("targets"))
.context("storage targets (target + targetNumIDs)")?;
buddy_groups(
tx,
&base_path.join("storagebuddygroups"),
Expand Down Expand Up @@ -267,23 +263,14 @@ fn buddy_groups(tx: &Transaction, f: &Path, nt: NodeTypeServer) -> Result<()> {
}

/// Imports storage targets
fn storage_targets(
tx: &Transaction,
targets_path: &Path,
target_num_ids_path: &Path,
) -> Result<()> {
fn storage_targets(tx: &Transaction, targets_path: &Path) -> Result<()> {
let targets = std::fs::read_to_string(targets_path)?;
let target_num_ids = std::fs::read_to_string(target_num_ids_path)?;

if targets.lines().count() != target_num_ids.lines().count() {
bail!("line count mismatch between {targets_path:?} and {target_num_ids_path:?}");
}

for l in targets.lines().zip(target_num_ids.lines()) {
let (target, node) =
l.0.trim()
.split_once('=')
.ok_or_else(|| anyhow!("invalid line '{}'", l.0))?;
for l in targets.lines() {
let (target, node) = l
.trim()
.split_once('=')
.ok_or_else(|| anyhow!("invalid line '{}'", l))?;

let node_id = NodeId::from_str_radix(node.trim(), 16)?;
let target_id = TargetId::from_str_radix(target.trim(), 16)?;
Expand Down
Loading