mirror of
https://github.com/zrepl/zrepl.git
synced 2024-12-23 07:28:57 +01:00
58c08c855f
- **Resumable Send & Recv Support** No knobs required, automatically used where supported. - **Hold-Protected Send & Recv** Automatic ZFS holds to ensure that we can always resume a replication step. - **Encrypted Send & Recv Support** for OpenZFS native encryption. Configurable at the job level, i.e., for all filesystems a job is responsible for. - **Receive-side hold on last received dataset** The counterpart to the replication cursor bookmark on the send-side. Ensures that incremental replication will always be possible between a sender and receiver. Design Doc ---------- `replication/design.md` doc describes how we use ZFS holds and bookmarks to ensure that a single replication step is always resumable. The replication algorithm described in the design doc introduces the notion of job IDs (please read the details on this design doc). We reuse the job names for job IDs and use `JobID` type to ensure that a job name can be embedded into hold tags, bookmark names, etc. This might BREAK CONFIG on upgrade. Protocol Version Bump --------------------- This commit makes backwards-incompatible changes to the replication/pdu protobufs. Thus, bump the version number used in the protocol handshake. Replication Cursor Format Change -------------------------------- The new replication cursor bookmark format is: `#zrepl_CURSOR_G_${this.GUID}_J_${jobid}` Including the GUID enables transaction-safe moving-forward of the cursor. Including the job id enables that multiple sending jobs can send the same filesystem without interfering. The `zrepl migrate replication-cursor:v1-v2` subcommand can be used to safely destroy old-format cursors once zrepl has created new-format cursors. Changes in This Commit ---------------------- - package zfs - infrastructure for holds - infrastructure for resume token decoding - implement a variant of OpenZFS's `entity_namecheck` and use it for validation in new code - ZFSSendArgs to specify a ZFS send operation - validation code protects against malicious resume tokens by checking that the token encodes the same send parameters that the send-side would use if no resume token were available (i.e. same filesystem, `fromguid`, `toguid`) - RecvOptions support for `recv -s` flag - convert a bunch of ZFS operations to be idempotent - achieved through more differentiated error message scraping / additional pre-/post-checks - package replication/pdu - add field for encryption to send request messages - add fields for resume handling to send & recv request messages - receive requests now contain `FilesystemVersion To` in addition to the filesystem into which the stream should be `recv`d into - can use `zfs recv $root_fs/$client_id/path/to/dataset@${To.Name}`, which enables additional validation after recv (i.e. whether `To.Guid` matched what we received in the stream) - used to set `last-received-hold` - package replication/logic - introduce `PlannerPolicy` struct, currently only used to configure whether encrypted sends should be requested from the sender - integrate encryption and resume token support into `Step` struct - package endpoint - move the concepts that endpoint builds on top of ZFS to a single file `endpoint/endpoint_zfs.go` - step-holds + step-bookmarks - last-received-hold - new replication cursor + old replication cursor compat code - adjust `endpoint/endpoint.go` handlers for - encryption - resumability - new replication cursor - last-received-hold - client subcommand `zrepl holds list`: list all holds and hold-like bookmarks that zrepl thinks belong to it - client subcommand `zrepl migrate replication-cursor:v1-v2`
88 lines
1.9 KiB
Go
88 lines
1.9 KiB
Go
package client
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/zrepl/zrepl/cli"
|
|
"github.com/zrepl/zrepl/daemon/filters"
|
|
"github.com/zrepl/zrepl/endpoint"
|
|
"github.com/zrepl/zrepl/zfs"
|
|
)
|
|
|
|
var (
|
|
HoldsCmd = &cli.Subcommand{
|
|
Use: "holds",
|
|
Short: "manage holds & step bookmarks",
|
|
SetupSubcommands: func() []*cli.Subcommand {
|
|
return holdsList
|
|
},
|
|
}
|
|
)
|
|
|
|
var holdsList = []*cli.Subcommand{
|
|
&cli.Subcommand{
|
|
Use: "list [FSFILTER]",
|
|
Run: doHoldsList,
|
|
NoRequireConfig: true,
|
|
Short: `
|
|
FSFILTER SYNTAX:
|
|
representation of a 'filesystems' filter statement on the command line
|
|
`,
|
|
},
|
|
}
|
|
|
|
func fsfilterFromCliArg(arg string) (zfs.DatasetFilter, error) {
|
|
mappings := strings.Split(arg, ",")
|
|
f := filters.NewDatasetMapFilter(len(mappings), true)
|
|
for _, m := range mappings {
|
|
thisMappingErr := fmt.Errorf("expecting comma-separated list of <dataset-pattern>:<ok|!> pairs, got %q", m)
|
|
lhsrhs := strings.SplitN(m, ":", 2)
|
|
if len(lhsrhs) != 2 {
|
|
return nil, thisMappingErr
|
|
}
|
|
err := f.Add(lhsrhs[0], lhsrhs[1])
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%s: %s", thisMappingErr, err)
|
|
}
|
|
}
|
|
return f.AsFilter(), nil
|
|
}
|
|
|
|
func doHoldsList(sc *cli.Subcommand, args []string) error {
|
|
var err error
|
|
ctx := context.Background()
|
|
|
|
if len(args) > 1 {
|
|
return errors.New("this subcommand takes at most one argument")
|
|
}
|
|
|
|
var filter zfs.DatasetFilter
|
|
if len(args) == 0 {
|
|
filter = zfs.NoFilter()
|
|
} else {
|
|
filter, err = fsfilterFromCliArg(args[0])
|
|
if err != nil {
|
|
return errors.Wrap(err, "cannot parse filesystem filter args")
|
|
}
|
|
}
|
|
|
|
listing, err := endpoint.ListZFSHoldsAndBookmarks(ctx, filter)
|
|
if err != nil {
|
|
return err // context clear by invocation of command
|
|
}
|
|
|
|
enc := json.NewEncoder(os.Stdout)
|
|
enc.SetIndent(" ", " ")
|
|
if err := enc.Encode(listing); err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
return nil
|
|
}
|