adminer/zrepl_patched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zfs send/recv: Support raw sends (-w/-Lce) and property handling (-p, -b, -o, -x)

Browse Source 
Signed-off-by: InsanePrawn <insane.prawny@gmail.com>
This commit is contained in:
InsanePrawn
2020-08-30 18:16:31 +02:00
parent 8e1937fe75
commit 893d686eef
8 changed files with 448 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/job/active.go
+12 -2
View File
@@ -153,9 +153,16 @@ func modePushFromConfig(g *config.Global, in *config.PushJob, jobID endpoint.Job
m.senderConfig = &endpoint.SenderConfig{
FSF: fsf,
Encrypt: &zfs.NilBool{B: in.Send.Encrypted},
DisableIncrementalStepHolds: in.Send.StepHolds.DisableIncremental,
JobID: jobID,
DisableIncrementalStepHolds: in.Send.StepHolds.DisableIncremental,
Encrypt: &zfs.NilBool{B: in.Send.Encrypted},
SendRaw: in.Send.Raw,
SendProperties: in.Send.SendProperties,
SendBackupProperties: in.Send.BackupProperties,
SendLargeBlocks: in.Send.LargeBlocks,
SendCompressed: in.Send.Compressed,
SendEmbeddedData: in.Send.EmbeddedData,
}
m.plannerPolicy = &logic.PlannerPolicy{
EncryptedSend: logic.TriFromBool(in.Send.Encrypted),
@@ -264,6 +271,9 @@ func modePullFromConfig(g *config.Global, in *config.PullJob, jobID endpoint.Job
RootWithoutClientComponent: m.rootFS,
AppendClientIdentity: false, // !
UpdateLastReceivedHold: true,
InheritProperties: in.Recv.Properties.Inherit,
OverrideProperties: in.Recv.Properties.Override,
}
if err := m.receiverConfig.Validate(); err != nil {
return nil, errors.Wrap(err, "cannot build receiver config")
daemon/job/passive.go
+12 -2
View File
@@ -58,6 +58,9 @@ func modeSinkFromConfig(g *config.Global, in *config.SinkJob, jobID endpoint.Job
RootWithoutClientComponent: rootDataset,
AppendClientIdentity: true, // !
UpdateLastReceivedHold: true,
InheritProperties: in.Recv.Properties.Inherit,
OverrideProperties: in.Recv.Properties.Override,
}
if err := m.receiverConfig.Validate(); err != nil {
return nil, errors.Wrap(err, "cannot build receiver config")
@@ -80,9 +83,16 @@ func modeSourceFromConfig(g *config.Global, in *config.SourceJob, jobID endpoint
}
m.senderConfig = &endpoint.SenderConfig{
FSF: fsf,
Encrypt: &zfs.NilBool{B: in.Send.Encrypted},
DisableIncrementalStepHolds: in.Send.StepHolds.DisableIncremental,
JobID: jobID,
DisableIncrementalStepHolds: in.Send.StepHolds.DisableIncremental,
Encrypt: &zfs.NilBool{B: in.Send.Encrypted},
SendRaw: in.Send.Raw,
SendProperties: in.Send.SendProperties,
SendBackupProperties: in.Send.BackupProperties,
SendLargeBlocks: in.Send.LargeBlocks,
SendCompressed: in.Send.Compressed,
SendEmbeddedData: in.Send.EmbeddedData,
}
if m.snapper, err = snapper.FromConfig(g, fsf, in.Snapshotting); err != nil {