Merge pull request #4988 from blackpiglet/add-more-info-for-get-path-or-snapshot-fail-by-restic

Add more information for failing to get path or snapshot in restic ba…

changelogs/unreleased/4988-jxun

@@ -0,0 +1 @@
+Add more information for failing to get path or snapshot in restic backup and restore.

pkg/controller/pod_volume_backup_controller.go

@@ -211,7 +211,7 @@ func (r *PodVolumeBackupReconciler) singlePathMatch(path string) (string, error)
 	}
 
 	if len(matches) != 1 {
-		return "", errors.Errorf("expected one matching path, got %d", len(matches))
+		return "", errors.Errorf("expected one matching path: %s, got %d", path, len(matches))
 	}
 
 	return matches[0], nil

pkg/controller/pod_volume_restore_controller.go

@@ -222,7 +222,7 @@ func singlePathMatch(path string) (string, error) {
 	}
 
 	if len(matches) != 1 {
-		return "", errors.Errorf("expected one matching path, got %d", len(matches))
+		return "", errors.Errorf("expected one matching path: %s, got %d", path, len(matches))
 	}
 
 	return matches[0], nil

pkg/restic/exec_commands.go

@@ -63,7 +63,7 @@ func GetSnapshotID(snapshotIdCmd *Command) (string, error) {
 	}
 
 	if len(snapshots) != 1 {
-		return "", errors.Errorf("expected one matching snapshot, got %d", len(snapshots))
+		return "", errors.Errorf("expected one matching snapshot by command: %s, got %d", snapshotIdCmd.String(), len(snapshots))
 	}
 
 	return snapshots[0].ShortID, nil