cmd: add skip-missing option (#415)

Author: pabloyoyoista

README.md

@@ -200,6 +200,7 @@ Flags:
   -R, --replication                See the -R flag on zfs send for more information
       --resume                     set this flag to true when you want to try and resume a previously cancled or failed backup. It is up to the caller to ensure the same command line arguments are provided between the original backup and the resumed one.
       --separator string           the separator to use between object component names. (default "|")
+  -s, --skip-missing               See the -s flag on zfs send for more information
       --uploadChunkSize int        the chunk size, in MiB, to use when uploading. A minimum of 5MiB and maximum of 100MiB is enforced. (default 10)
       --volsize uint               the maximum size (in MiB) a volume should be before splitting to a new volume. Note: zfsbackup will try its best to stay close/under this limit but it is not garaunteed. (default 200)
 

cmd/send.go

@@ -73,6 +73,7 @@ func init() {
 
 	// ZFS send command options
 	sendCmd.Flags().BoolVarP(&jobInfo.Replication, "replication", "R", false, "See the -R flag on zfs send for more information")
+	sendCmd.Flags().BoolVarP(&jobInfo.SkipMissing, "skip-missing", "s", false, "See the -s flag on zfs send for more information")
 	sendCmd.Flags().BoolVarP(&jobInfo.Deduplication, "deduplication", "D", false, "See the -D flag for zfs send for more information.")
 	sendCmd.Flags().StringVarP(&jobInfo.IncrementalSnapshot.Name, "incremental", "i", "", "See the -i flag on zfs send for more information")
 	sendCmd.Flags().StringVarP(&fullIncremental, "intermediary", "I", "", "See the -I flag on zfs send for more information")
@@ -185,6 +186,7 @@ func ResetSendJobInfo() {
 	resetRootFlags()
 	// ZFS send command options
 	jobInfo.Replication = false
+	jobInfo.SkipMissing = false
 	jobInfo.Deduplication = false
 	jobInfo.IncrementalSnapshot = files.SnapshotInfo{}
 	jobInfo.BaseSnapshot = files.SnapshotInfo{}

files/jobinfo.go

@@ -56,6 +56,7 @@ type JobInfo struct {
 	EncryptTo               string
 	SignFrom                string
 	Replication             bool
+	SkipMissing             bool
 	Deduplication           bool
 	Properties              bool
 	IntermediaryIncremental bool
@@ -135,6 +136,7 @@ func (j *JobInfo) String() string {
 	output = append(
 		output,
 		fmt.Sprintf("Replication: %v", j.Replication),
+		fmt.Sprintf("SkipMissing: %v", j.SkipMissing),
 		fmt.Sprintf("Archives: %d - %d bytes (%s)", len(j.Volumes), totalWrittenBytes, humanize.IBytes(totalWrittenBytes)),
 		fmt.Sprintf("Volume Size (Raw): %d bytes (%s)", j.ZFSStreamBytes, humanize.IBytes(j.ZFSStreamBytes)),
 		fmt.Sprintf("Uploaded: %v (took %v)\n\n", j.StartTime, j.EndTime.Sub(j.StartTime)),

zfs/zfs.go

@@ -120,6 +120,11 @@ func GetZFSSendCommand(ctx context.Context, j *files.JobInfo) *exec.Cmd {
 		zfsArgs = append(zfsArgs, "-R")
 	}
 
+	if j.SkipMissing {
+		log.AppLogger.Infof("Enabling the skip-missing (-s) flag on the send.")
+		zfsArgs = append(zfsArgs, "-s")
+	}
+
 	if j.Deduplication {
 		log.AppLogger.Infof("Enabling the deduplication (-D) flag on the send.")
 		zfsArgs = append(zfsArgs, "-D")