thin id is optional

Signed-off-by: Anton Sergunov <anton.sergunov@flant.com>
deckhouse · Feb 26, 2025 · c6aaac4 · c6aaac4
1 parent a2e6bcb
commit c6aaac4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/images/agent/src/internal/controller/llv/reconciler.go b/images/agent/src/internal/controller/llv/reconciler.go
@@ -608,13 +608,16 @@ func (r *Reconciler) deleteLVIfNeeded(ctx context.Context, vgName string, llv *v
 		if err != nil {
 			err = fmt.Errorf("dumping thin pool map: %w", err)
 			r.log.Error(err, fmt.Sprintf("[deleteLVIfNeeded] can't find pool map for LV %s in VG %s", llv.Spec.ActualLVNameOnTheNode, vgName))
-			return false, err
+			return true, err
 		}
-
-		ranges, err := utils.ThinVolumeUsedRanges(ctx, r.log, superblock, utils.LVMThinDeviceID(lv.Data.ThinID))
+		if lv.Data.ThinID == nil {
+			err = fmt.Errorf("missing deviceId for thin volume %s", llv.Spec.ActualLVNameOnTheNode)
+			return true, err
+		}
+		ranges, err := utils.ThinVolumeUsedRanges(ctx, r.log, superblock, utils.LVMThinDeviceID(*lv.Data.ThinID))
 		if err != nil {
 			err = fmt.Errorf("finding used ranges for deviceId %d in thin pool %s", lv.Data.ThinID, lv.Data.PoolName)
-			return false, err
+			return true, err
 		}
 		usedRanges = &ranges
 	}

diff --git a/images/agent/src/internal/type.go b/images/agent/src/internal/type.go
@@ -157,7 +157,7 @@ type LVData struct {
 	CopyPercent     string            `json:"copy_percent"`
 	ConvertLv       string            `json:"convert_lv"`
 	LvTags          string            `json:"lv_tags"`
-	ThinID          uint64            `json:"thin_id"`
+	ThinID          *uint64           `json:"thin_id,omitempty"`
 	MetadataLv      string            `json:"metadata_lv"`
 	LVDmPath        string            `json:"lv_dm_path"`
 }