Merge pull request #102 from vansante/errs

Always include dataset in error + Use more samey error messages
vansante · Jul 19, 2024 · b8ff0fb · b8ff0fb
2 parents 9237a18 + ecf2e7c
commit b8ff0fb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/job/filesystem_prune.go b/job/filesystem_prune.go
@@ -99,7 +99,7 @@ func (r *Runner) pruneAgedFilesystem(filesystem string) error {
 
 	deleteAt, err := parseDatasetTimeProperty(fs, deleteProp)
 	if err != nil {
-		return fmt.Errorf("error parsing %s for %s: %w", deleteProp, filesystem, err)
+		return fmt.Errorf("error parsing %s on %s: %w", deleteProp, filesystem, err)
 	}
 
 	if deleteAt.After(time.Now()) {

diff --git a/job/snapshots_create.go b/job/snapshots_create.go
@@ -76,7 +76,7 @@ func (r *Runner) createDatasetSnapshot(ds *zfs.Dataset) error {
 	intervalMinsProp := r.config.Properties.snapshotIntervalMinutes()
 	intervalMins, err := strconv.ParseInt(ds.ExtraProps[intervalMinsProp], 10, 64)
 	if err != nil {
-		return fmt.Errorf("error parsing %s property: %w", intervalMinsProp, err)
+		return fmt.Errorf("error parsing %s property on %s: %w", intervalMinsProp, ds.Name, err)
 	}
 
 	// Do not create snapshots for datasets marked for deletion
@@ -91,7 +91,7 @@ func (r *Runner) createDatasetSnapshot(ds *zfs.Dataset) error {
 		ExtraProperties: []string{createdProp, ignoreProp},
 	})
 	if err != nil {
-		return fmt.Errorf("error listing existing snapshots: %w", err)
+		return fmt.Errorf("error listing existing snapshots on %s: %w", ds.Name, err)
 	}
 	latestSnap := earliestSnapshot // A long, long time ago...
 

diff --git a/job/snapshots_mark.go b/job/snapshots_mark.go
@@ -51,7 +51,7 @@ func (r *Runner) markPrunableExcessSnapshots() error {
 
 		retentionCount, err := parseDatasetIntProperty(ds, countProp)
 		if err != nil {
-			return fmt.Errorf("error parsing %s property for %s: %w", countProp, dataset, err)
+			return fmt.Errorf("error parsing %s property on %s: %w", countProp, dataset, err)
 		}
 
 		if retentionCount <= 0 { // Zero or less is considered to be Off.
@@ -182,7 +182,7 @@ func (r *Runner) markPrunableSnapshotsByAge() error {
 
 		retentionMinutes, err := parseDatasetIntProperty(ds, retentionProp)
 		if err != nil {
-			return fmt.Errorf("error parsing %s property for %s: %w", retentionProp, dataset, err)
+			return fmt.Errorf("error parsing %s property on %s: %w", retentionProp, dataset, err)
 		}
 
 		if retentionMinutes <= 0 { // Zero or less is considered to be Off.
@@ -240,7 +240,7 @@ func (r *Runner) markAgingDatasetSnapshots(ds *zfs.Dataset, duration time.Durati
 
 		createdAt, err := parseDatasetTimeProperty(snap, createdProp)
 		if err != nil {
-			return fmt.Errorf("error parsing %s property for %s: %w", createdProp, snap.Name, err)
+			return fmt.Errorf("error parsing %s property on %s: %w", createdProp, snap.Name, err)
 		}
 
 		if createdAt.Add(duration).After(now) {
@@ -249,7 +249,7 @@ func (r *Runner) markAgingDatasetSnapshots(ds *zfs.Dataset, duration time.Durati
 
 		err = snap.SetProperty(r.ctx, deleteProp, deleteAt.Format(dateTimeFormat))
 		if err != nil {
-			return fmt.Errorf("error setting %s property for %s: %w", deleteProp, snap.Name, err)
+			return fmt.Errorf("error setting %s property on %s: %w", deleteProp, snap.Name, err)
 		}
 
 		err = r.markRemoteDatasetSnapshot(snap, snap.ExtraProps[serverProp], deleteProp, deleteAt)

diff --git a/job/snapshots_prune.go b/job/snapshots_prune.go
@@ -83,7 +83,7 @@ func (r *Runner) pruneMarkedSnapshot(snapshot string) error {
 
 	deleteAt, err := parseDatasetTimeProperty(snap, deleteProp)
 	if err != nil {
-		return fmt.Errorf("error parsing %s for %s: %w", deleteProp, snap.Name, err)
+		return fmt.Errorf("error parsing %s on %s: %w", deleteProp, snap.Name, err)
 	}
 
 	if deleteAt.After(time.Now()) {

diff --git a/job/snapshots_send.go b/job/snapshots_send.go
@@ -168,7 +168,8 @@ func (r *Runner) sendDatasetSnapshots(ds *zfs.Dataset) error {
 
 		err = r.setSendSnapshotProperties(client, send.Snapshot.Name)
 		if err != nil {
-			r.logger.Error("zfs.job.Runner.resumeSendSnapshot: Error setting snapshot properties", "error", err, "snapshot", send.Snapshot.Name)
+			r.logger.Error("zfs.job.Runner.resumeSendSnapshot: Error setting snapshot properties",
+				"error", err, "snapshot", send.Snapshot.Name)
 		}
 
 		err = send.Snapshot.SetProperty(r.ctx, sentProp, time.Now().Format(dateTimeFormat))