Merge pull request #104 from vansante/skip-empty-prop

If property becomes unset during process, skip the dataset
vansante · Jul 23, 2024 · 679c9e1 · 679c9e1
2 parents 8457150 + b2f7c84
commit 679c9e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/job/snapshots_create.go b/job/snapshots_create.go
@@ -74,6 +74,10 @@ func (r *Runner) createDatasetSnapshot(ds *zfs.Dataset) error {
 	}()
 
 	intervalMinsProp := r.config.Properties.snapshotIntervalMinutes()
+	if !propertyIsSet(ds.ExtraProps[intervalMinsProp]) {
+		return nil // Not set (anymore), skip
+	}
+
 	intervalMins, err := strconv.ParseInt(ds.ExtraProps[intervalMinsProp], 10, 64)
 	if err != nil {
 		return fmt.Errorf("error parsing %s property on %s: %w", intervalMinsProp, ds.Name, err)

diff --git a/job/snapshots_mark.go b/job/snapshots_mark.go
@@ -49,6 +49,10 @@ func (r *Runner) markPrunableExcessSnapshots() error {
 			return fmt.Errorf("error retrieving count retention dataset %s: %w", dataset, err)
 		}
 
+		if !propertyIsSet(ds.ExtraProps[countProp]) {
+			continue // Not set (anymore), skip
+		}
+
 		retentionCount, err := parseDatasetIntProperty(ds, countProp)
 		if err != nil {
 			return fmt.Errorf("error parsing %s property on %s: %w", countProp, dataset, err)
@@ -180,6 +184,10 @@ func (r *Runner) markPrunableSnapshotsByAge() error {
 			return fmt.Errorf("error retrieving time retention dataset %s: %w", dataset, err)
 		}
 
+		if !propertyIsSet(ds.ExtraProps[retentionProp]) {
+			continue // Not set (anymore), skip
+		}
+
 		retentionMinutes, err := parseDatasetIntProperty(ds, retentionProp)
 		if err != nil {
 			return fmt.Errorf("error parsing %s property on %s: %w", retentionProp, dataset, err)