From 1bfb6dc99ffb51aada14c3e0f5c0e9e771e9fdb2 Mon Sep 17 00:00:00 2001
From: Rusty Bee <145002912+rustybee42@users.noreply.github.com>
Date: Thu, 3 Jul 2025 10:47:58 +0200
Subject: [PATCH] fix: Don't read and check targetNumIDs file on v7 import

Apparently old management does not remove entries in targetNumIDs when a
target is unmapped. So targets and targetNumIDs might have different
length, which would fail the check on the import process.

Since targetNumIDs is not used at all for the import, it can as well
just be ignored.
---
 mgmtd/src/db/import_v7.rs | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/mgmtd/src/db/import_v7.rs b/mgmtd/src/db/import_v7.rs
index 0389817..b5cd42d 100644
--- a/mgmtd/src/db/import_v7.rs
+++ b/mgmtd/src/db/import_v7.rs
@@ -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"),
@@ -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)?;