extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-06-26 04:31:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

restructure and rename, making mainfsm the replication package itself

Browse Source
This commit is contained in:
Christian Schwarz 2018-08-22 00:10:09 +02:00
parent 2f205d205b
commit 301c7b2dd5
17 changed files with 348 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -4,9 +4,10 @@
ROOT := github.com/zrepl/zrepl ROOT := github.com/zrepl/zrepl
SUBPKGS := cmd SUBPKGS := cmd
SUBPKGS += cmd/replication SUBPKGS += cmd/replication
SUBPKGS += cmd/replication/internal/common SUBPKGS += cmd/replication/fsrep
SUBPKGS += cmd/replication/internal/mainfsm SUBPKGS += cmd/replication/pdu
SUBPKGS += cmd/replication/internal/fsfsm SUBPKGS += cmd/replication/internal/queue
SUBPKGS += cmd/replication/internal/diff
SUBPKGS += logger util zfs SUBPKGS += logger util zfs
_TESTPKGS := $(ROOT) $(foreach p,$(SUBPKGS),$(ROOT)/$(p)) _TESTPKGS := $(ROOT) $(foreach p,$(SUBPKGS),$(ROOT)/$(p))

3
cmd/config_job_local.go
View File

@ -9,7 +9,6 @@ import (
"github.com/zrepl/zrepl/zfs" "github.com/zrepl/zrepl/zfs"
"sync" "sync"
"github.com/zrepl/zrepl/cmd/replication" "github.com/zrepl/zrepl/cmd/replication"
"github.com/zrepl/zrepl/cmd/replication/common"
) )
type LocalJob struct { type LocalJob struct {
@ -148,7 +147,7 @@ outer:
j.mainTask.Enter("replicate") j.mainTask.Enter("replicate")
rep := replication.NewReplication() rep := replication.NewReplication()
rep.Drive(ctx, common.NewEndpointPairPull(sender, receiver)) rep.Drive(ctx, sender, receiver)
j.mainTask.Finish() j.mainTask.Finish()

7
cmd/config_job_pull.go
View File

@ -14,7 +14,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/problame/go-streamrpc" "github.com/problame/go-streamrpc"
"github.com/zrepl/zrepl/cmd/replication" "github.com/zrepl/zrepl/cmd/replication"
"github.com/zrepl/zrepl/cmd/replication/common"
) )
type PullJob struct { type PullJob struct {
@ -30,7 +29,7 @@ type PullJob struct {
Debug JobDebugSettings Debug JobDebugSettings
task *Task task *Task
rep replication.Replication rep *replication.Replication
} }
func parsePullJob(c JobParsingContext, name string, i map[string]interface{}) (j *PullJob, err error) { func parsePullJob(c JobParsingContext, name string, i map[string]interface{}) (j *PullJob, err error) {
@ -189,12 +188,12 @@ func (j *PullJob) doRun(ctx context.Context) {
} }
ctx = common.ContextWithLogger(ctx, replicationLogAdaptor{j.task.Log().WithField("subsystem", "replication")}) ctx = replication.WithLogger(ctx, replicationLogAdaptor{j.task.Log().WithField("subsystem", "replication")})
ctx = streamrpc.ContextWithLogger(ctx, streamrpcLogAdaptor{j.task.Log().WithField("subsystem", "rpc.protocol")}) ctx = streamrpc.ContextWithLogger(ctx, streamrpcLogAdaptor{j.task.Log().WithField("subsystem", "rpc.protocol")})
ctx = context.WithValue(ctx, contextKeyLog, j.task.Log().WithField("subsystem", "rpc.endpoint")) ctx = context.WithValue(ctx, contextKeyLog, j.task.Log().WithField("subsystem", "rpc.endpoint"))
j.rep = replication.NewReplication() j.rep = replication.NewReplication()
j.rep.Drive(ctx, common.NewEndpointPairPull(sender, puller)) j.rep.Drive(ctx, sender, puller)
client.Close() client.Close()
j.task.Finish() j.task.Finish()

27
cmd/replication.go
View File

@ -2,7 +2,6 @@ package cmd
import ( import (
"fmt" "fmt"
"github.com/zrepl/zrepl/cmd/replication/common"
"github.com/zrepl/zrepl/cmd/replication/pdu" "github.com/zrepl/zrepl/cmd/replication/pdu"
"github.com/problame/go-streamrpc" "github.com/problame/go-streamrpc"
"github.com/zrepl/zrepl/zfs" "github.com/zrepl/zrepl/zfs"
@ -11,6 +10,7 @@ import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"bytes" "bytes"
"context" "context"
"github.com/zrepl/zrepl/cmd/replication"
) )
type InitialReplPolicy string type InitialReplPolicy string
@ -57,7 +57,7 @@ func (p *SenderEndpoint) ListFilesystemVersions(ctx context.Context, fs string)
return nil, err return nil, err
} }
if !pass { if !pass {
return nil, common.NewFilteredError(fs) return nil, replication.NewFilteredError(fs)
} }
fsvs, err := zfs.ZFSListFilesystemVersions(dp, p.FilesystemVersionFilter) fsvs, err := zfs.ZFSListFilesystemVersions(dp, p.FilesystemVersionFilter)
if err != nil { if err != nil {
@ -80,7 +80,7 @@ func (p *SenderEndpoint) Send(ctx context.Context, r *pdu.SendReq) (*pdu.SendRes
return nil, nil, err return nil, nil, err
} }
if !pass { if !pass {
return nil, nil, common.NewFilteredError(r.Filesystem) return nil, nil, replication.NewFilteredError(r.Filesystem)
} }
stream, err := zfs.ZFSSend(r.Filesystem, r.From, r.To) stream, err := zfs.ZFSSend(r.Filesystem, r.From, r.To)
if err != nil { if err != nil {
@ -324,7 +324,7 @@ func (s RemoteEndpoint) Receive(ctx context.Context, r *pdu.ReceiveReq, sendStre
} }
type HandlerAdaptor struct { type HandlerAdaptor struct {
ep common.ReplicationEndpoint ep replication.Endpoint
} }
func (a *HandlerAdaptor) Handle(ctx context.Context, endpoint string, reqStructured *bytes.Buffer, reqStream io.ReadCloser) (resStructured *bytes.Buffer, resStream io.ReadCloser, err error) { func (a *HandlerAdaptor) Handle(ctx context.Context, endpoint string, reqStructured *bytes.Buffer, reqStream io.ReadCloser) (resStructured *bytes.Buffer, resStream io.ReadCloser, err error) {
@ -369,11 +369,16 @@ func (a *HandlerAdaptor) Handle(ctx context.Context, endpoint string, reqStructu
case RPCSend: case RPCSend:
sender, ok := a.ep.(replication.Sender)
if !ok {
goto Err
}
var req pdu.SendReq var req pdu.SendReq
if err := proto.Unmarshal(reqStructured.Bytes(), &req); err != nil { if err := proto.Unmarshal(reqStructured.Bytes(), &req); err != nil {
return nil, nil, err return nil, nil, err
} }
res, sendStream, err := a.ep.Send(ctx, &req) res, sendStream, err := sender.Send(ctx, &req)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -385,11 +390,16 @@ func (a *HandlerAdaptor) Handle(ctx context.Context, endpoint string, reqStructu
case RPCReceive: case RPCReceive:
receiver, ok := a.ep.(replication.Receiver)
if !ok {
goto Err
}
var req pdu.ReceiveReq var req pdu.ReceiveReq
if err := proto.Unmarshal(reqStructured.Bytes(), &req); err != nil { if err := proto.Unmarshal(reqStructured.Bytes(), &req); err != nil {
return nil, nil, err return nil, nil, err
} }
err := a.ep.Receive(ctx, &req, reqStream) err := receiver.Receive(ctx, &req, reqStream)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -399,8 +409,7 @@ func (a *HandlerAdaptor) Handle(ctx context.Context, endpoint string, reqStructu
} }
return bytes.NewBuffer(b), nil, err return bytes.NewBuffer(b), nil, err
default:
return nil, nil, errors.New("no handler for given endpoint")
} }
Err:
return nil, nil, errors.New("no handler for given endpoint")
} }

45
cmd/replication/common/common.go
View File

@ -1,45 +0,0 @@
package common
import (
"context"
"io"
"github.com/zrepl/zrepl/cmd/replication/pdu"
"github.com/zrepl/zrepl/logger"
)
type contextKey int
const (
contextKeyLog contextKey = iota
)
type Logger = logger.Logger
func ContextWithLogger(ctx context.Context, l Logger) context.Context {
return context.WithValue(ctx, contextKeyLog, l)
}
func GetLogger(ctx context.Context) Logger {
l, ok := ctx.Value(contextKeyLog).(Logger)
if !ok {
l = logger.NewNullLogger()
}
return l
}
type ReplicationEndpoint interface {
// Does not include placeholder filesystems
ListFilesystems(ctx context.Context) ([]*pdu.Filesystem, error)
ListFilesystemVersions(ctx context.Context, fs string) ([]*pdu.FilesystemVersion, error) // fix depS
Send(ctx context.Context, r *pdu.SendReq) (*pdu.SendRes, io.ReadCloser, error)
Receive(ctx context.Context, r *pdu.ReceiveReq, sendStream io.ReadCloser) error
}
type FilteredError struct{ fs string }
func NewFilteredError(fs string) *FilteredError {
return &FilteredError{fs}
}
func (f FilteredError) Error() string { return "endpoint does not allow access to filesystem " + f.fs }

30
cmd/replication/context.go Normal file
View File

@ -0,0 +1,30 @@
package replication
import (
"github.com/zrepl/zrepl/logger"
"context"
"github.com/zrepl/zrepl/cmd/replication/fsrep"
)
type contextKey int
const (
contextKeyLog contextKey = iota
)
type Logger = logger.Logger
func WithLogger(ctx context.Context, l Logger) context.Context {
ctx = context.WithValue(ctx, contextKeyLog, l)
ctx = fsrep.WithLogger(ctx, l)
return ctx
}
func getLogger(ctx context.Context) Logger {
l, ok := ctx.Value(contextKeyLog).(Logger)
if !ok {
l = logger.NewNullLogger()
}
return l
}

175
cmd/replication/internal/fsfsm/fsfsm.go → cmd/replication/fsrep/fsfsm.go
View File

@ -1,4 +1,6 @@
package fsfsm // Package fsrep implements replication of a single file system with existing versions
// from a sender to a receiver.
package fsrep
import ( import (
"context" "context"
@ -11,16 +13,44 @@ import (
"time" "time"
"github.com/zrepl/zrepl/cmd/replication/pdu" "github.com/zrepl/zrepl/cmd/replication/pdu"
. "github.com/zrepl/zrepl/cmd/replication/common" "github.com/zrepl/zrepl/logger"
) )
type contextKey int
const (
contextKeyLogger contextKey = iota
)
type Logger = logger.Logger
func WithLogger(ctx context.Context, log Logger) context.Context {
return context.WithValue(ctx, contextKeyLogger, log)
}
func getLogger(ctx context.Context) Logger {
l, ok := ctx.Value(contextKeyLogger).(Logger)
if !ok {
l = logger.NewNullLogger()
}
return l
}
type Sender interface {
Send(ctx context.Context, r *pdu.SendReq) (*pdu.SendRes, io.ReadCloser, error)
}
type Receiver interface {
Receive(ctx context.Context, r *pdu.ReceiveReq, sendStream io.ReadCloser) error
}
type StepReport struct { type StepReport struct {
From, To string From, To string
Status string Status string
Problem string Problem string
} }
type FilesystemReplicationReport struct { type Report struct {
Filesystem string Filesystem string
Status string Status string
Problem string Problem string
@ -28,58 +58,58 @@ type FilesystemReplicationReport struct {
} }
//go:generate stringer -type=FSReplicationState //go:generate stringer -type=State
type FSReplicationState uint type State uint
const ( const (
FSReady FSReplicationState = 1 << iota Ready State = 1 << iota
FSRetryWait RetryWait
FSPermanentError PermanentError
FSCompleted Completed
) )
func (s FSReplicationState) fsrsf() fsrsf { func (s State) fsrsf() state {
idx := bits.TrailingZeros(uint(s)) idx := bits.TrailingZeros(uint(s))
if idx == bits.UintSize { if idx == bits.UintSize {
panic(s) panic(s)
} }
m := []fsrsf{ m := []state{
fsrsfReady, stateReady,
fsrsfRetryWait, stateRetryWait,
nil, nil,
nil, nil,
} }
return m[idx] return m[idx]
} }
type FSReplication struct { type Replication struct {
// lock protects all fields in this struct, but not the data behind pointers // lock protects all fields in this struct, but not the data behind pointers
lock sync.Mutex lock sync.Mutex
state FSReplicationState state State
fs string fs string
err error err error
retryWaitUntil time.Time retryWaitUntil time.Time
completed, pending []*FSReplicationStep completed, pending []*ReplicationStep
} }
func (f *FSReplication) State() FSReplicationState { func (f *Replication) State() State {
f.lock.Lock() f.lock.Lock()
defer f.lock.Unlock() defer f.lock.Unlock()
return f.state return f.state
} }
type FSReplicationBuilder struct { type ReplicationBuilder struct {
r *FSReplication r *Replication
} }
func BuildFSReplication(fs string) *FSReplicationBuilder { func BuildReplication(fs string) *ReplicationBuilder {
return &FSReplicationBuilder{&FSReplication{fs: fs}} return &ReplicationBuilder{&Replication{fs: fs}}
} }
func (b *FSReplicationBuilder) AddStep(from, to FilesystemVersion) *FSReplicationBuilder { func (b *ReplicationBuilder) AddStep(from, to FilesystemVersion) *ReplicationBuilder {
step := &FSReplicationStep{ step := &ReplicationStep{
state: StepReady, state: StepReady,
fsrep: b.r, parent: b.r,
from: from, from: from,
to: to, to: to,
} }
@ -87,31 +117,31 @@ func (b *FSReplicationBuilder) AddStep(from, to FilesystemVersion) *FSReplicatio
return b return b
} }
func (b *FSReplicationBuilder) Done() (r *FSReplication) { func (b *ReplicationBuilder) Done() (r *Replication) {
if len(b.r.pending) > 0 { if len(b.r.pending) > 0 {
b.r.state = FSReady b.r.state = Ready
} else { } else {
b.r.state = FSCompleted b.r.state = Completed
} }
r = b.r r = b.r
b.r = nil b.r = nil
return r return r
} }
func NewFSReplicationWithPermanentError(fs string, err error) *FSReplication { func NewReplicationWithPermanentError(fs string, err error) *Replication {
return &FSReplication{ return &Replication{
state: FSPermanentError, state: PermanentError,
fs: fs, fs: fs,
err: err, err: err,
} }
} }
//go:generate stringer -type=FSReplicationStepState //go:generate stringer -type=StepState
type FSReplicationStepState uint type StepState uint
const ( const (
StepReady FSReplicationStepState = 1 << iota StepReady StepState = 1 << iota
StepRetry StepRetry
StepPermanentError StepPermanentError
StepCompleted StepCompleted
@ -122,22 +152,22 @@ type FilesystemVersion interface {
RelName() string RelName() string
} }
type FSReplicationStep struct { type ReplicationStep struct {
// only protects state, err // only protects state, err
// from, to and fsrep are assumed to be immutable // from, to and parent are assumed to be immutable
lock sync.Mutex lock sync.Mutex
state FSReplicationStepState state StepState
from, to FilesystemVersion from, to FilesystemVersion
fsrep *FSReplication parent *Replication
// both retry and permanent error // both retry and permanent error
err error err error
} }
func (f *FSReplication) TakeStep(ctx context.Context, sender, receiver ReplicationEndpoint) (post FSReplicationState, nextStepDate time.Time) { func (f *Replication) TakeStep(ctx context.Context, sender Sender, receiver Receiver) (post State, nextStepDate time.Time) {
var u fsrUpdater = func(fu func(*FSReplication)) FSReplicationState { var u updater = func(fu func(*Replication)) State {
f.lock.Lock() f.lock.Lock()
defer f.lock.Unlock() defer f.lock.Unlock()
if fu != nil { if fu != nil {
@ -145,20 +175,20 @@ func (f *FSReplication) TakeStep(ctx context.Context, sender, receiver Replicati
} }
return f.state return f.state
} }
var s fsrsf = u(nil).fsrsf() var s state = u(nil).fsrsf()
pre := u(nil) pre := u(nil)
preTime := time.Now() preTime := time.Now()
s = s(ctx, sender, receiver, u) s = s(ctx, sender, receiver, u)
delta := time.Now().Sub(preTime) delta := time.Now().Sub(preTime)
post = u(func(f *FSReplication) { post = u(func(f *Replication) {
if len(f.pending) == 0 { if len(f.pending) == 0 {
return return
} }
nextStepDate = f.pending[0].to.SnapshotTime() nextStepDate = f.pending[0].to.SnapshotTime()
}) })
GetLogger(ctx). getLogger(ctx).
WithField("fs", f.fs). WithField("fs", f.fs).
WithField("transition", fmt.Sprintf("%s => %s", pre, post)). WithField("transition", fmt.Sprintf("%s => %s", pre, post)).
WithField("duration", delta). WithField("duration", delta).
@ -167,41 +197,41 @@ func (f *FSReplication) TakeStep(ctx context.Context, sender, receiver Replicati
return post, nextStepDate return post, nextStepDate
} }
type fsrUpdater func(func(fsr *FSReplication)) FSReplicationState type updater func(func(fsr *Replication)) State
type fsrsf func(ctx context.Context, sender, receiver ReplicationEndpoint, u fsrUpdater) fsrsf type state func(ctx context.Context, sender Sender, receiver Receiver, u updater) state
func fsrsfReady(ctx context.Context, sender, receiver ReplicationEndpoint, u fsrUpdater) fsrsf { func stateReady(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
var current *FSReplicationStep var current *ReplicationStep
s := u(func(f *FSReplication) { s := u(func(f *Replication) {
if len(f.pending) == 0 { if len(f.pending) == 0 {
f.state = FSCompleted f.state = Completed
return return
} }
current = f.pending[0] current = f.pending[0]
}) })
if s != FSReady { if s != Ready {
return s.fsrsf() return s.fsrsf()
} }
stepState := current.do(ctx, sender, receiver) stepState := current.do(ctx, sender, receiver)
return u(func(f *FSReplication) { return u(func(f *Replication) {
switch stepState { switch stepState {
case StepCompleted: case StepCompleted:
f.completed = append(f.completed, current) f.completed = append(f.completed, current)
f.pending = f.pending[1:] f.pending = f.pending[1:]
if len(f.pending) > 0 { if len(f.pending) > 0 {
f.state = FSReady f.state = Ready
} else { } else {
f.state = FSCompleted f.state = Completed
} }
case StepRetry: case StepRetry:
f.retryWaitUntil = time.Now().Add(10 * time.Second) // FIXME make configurable f.retryWaitUntil = time.Now().Add(10 * time.Second) // FIXME make configurable
f.state = FSRetryWait f.state = RetryWait
case StepPermanentError: case StepPermanentError:
f.state = FSPermanentError f.state = PermanentError
f.err = errors.New("a replication step failed with a permanent error") f.err = errors.New("a replication step failed with a permanent error")
default: default:
panic(f) panic(f)
@ -209,37 +239,36 @@ func fsrsfReady(ctx context.Context, sender, receiver ReplicationEndpoint, u fsr
}).fsrsf() }).fsrsf()
} }
func fsrsfRetryWait(ctx context.Context, sender, receiver ReplicationEndpoint, u fsrUpdater) fsrsf { func stateRetryWait(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
var sleepUntil time.Time var sleepUntil time.Time
u(func(f *FSReplication) { u(func(f *Replication) {
sleepUntil = f.retryWaitUntil sleepUntil = f.retryWaitUntil
}) })
t := time.NewTimer(sleepUntil.Sub(time.Now())) t := time.NewTimer(sleepUntil.Sub(time.Now()))
defer t.Stop() defer t.Stop()
select { select {
case <-ctx.Done(): case <-ctx.Done():
return u(func(f *FSReplication) { return u(func(f *Replication) {
f.state = FSPermanentError f.state = PermanentError
f.err = ctx.Err() f.err = ctx.Err()
}).fsrsf() }).fsrsf()
case <-t.C: case <-t.C:
} }
return u(func(f *FSReplication) { return u(func(f *Replication) {
f.state = FSReady f.state = Ready
}).fsrsf() }).fsrsf()
} }
// access to fsr's members must be exclusive func (fsr *Replication) Report() *Report {
func (fsr *FSReplication) Report() *FilesystemReplicationReport {
fsr.lock.Lock() fsr.lock.Lock()
defer fsr.lock.Unlock() defer fsr.lock.Unlock()
rep := FilesystemReplicationReport{ rep := Report{
Filesystem: fsr.fs, Filesystem: fsr.fs,
Status: fsr.state.String(), Status: fsr.state.String(),
} }
if fsr.state&FSPermanentError != 0 { if fsr.state&PermanentError != 0 {
rep.Problem = fsr.err.Error() rep.Problem = fsr.err.Error()
return &rep return &rep
} }
@ -255,15 +284,15 @@ func (fsr *FSReplication) Report() *FilesystemReplicationReport {
return &rep return &rep
} }
func (s *FSReplicationStep) do(ctx context.Context, sender, receiver ReplicationEndpoint) FSReplicationStepState { func (s *ReplicationStep) do(ctx context.Context, sender Sender, receiver Receiver) StepState {
fs := s.fsrep.fs fs := s.parent.fs
log := GetLogger(ctx). log := getLogger(ctx).
WithField("filesystem", fs). WithField("filesystem", fs).
WithField("step", s.String()) WithField("step", s.String())
updateStateError := func(err error) FSReplicationStepState { updateStateError := func(err error) StepState {
s.lock.Lock() s.lock.Lock()
defer s.lock.Unlock() defer s.lock.Unlock()
@ -285,7 +314,7 @@ func (s *FSReplicationStep) do(ctx context.Context, sender, receiver Replication
return s.state return s.state
} }
updateStateCompleted := func() FSReplicationStepState { updateStateCompleted := func() StepState {
s.lock.Lock() s.lock.Lock()
defer s.lock.Unlock() defer s.lock.Unlock()
s.err = nil s.err = nil
@ -338,15 +367,15 @@ func (s *FSReplicationStep) do(ctx context.Context, sender, receiver Replication
} }
func (s *FSReplicationStep) String() string { func (s *ReplicationStep) String() string {
if s.from == nil { // FIXME: ZFS semantics are that to is nil on non-incremental send if s.from == nil { // FIXME: ZFS semantics are that to is nil on non-incremental send
return fmt.Sprintf("%s%s (full)", s.fsrep.fs, s.to.RelName()) return fmt.Sprintf("%s%s (full)", s.parent.fs, s.to.RelName())
} else { } else {
return fmt.Sprintf("%s(%s => %s)", s.fsrep.fs, s.from, s.to.RelName()) return fmt.Sprintf("%s(%s => %s)", s.parent.fs, s.from, s.to.RelName())
} }
} }
func (step *FSReplicationStep) Report() *StepReport { func (step *ReplicationStep) Report() *StepReport {
var from string // FIXME follow same convention as ZFS: to should be nil on full send var from string // FIXME follow same convention as ZFS: to should be nil on full send
if step.from != nil { if step.from != nil {
from = step.from.RelName() from = step.from.RelName()

29
cmd/replication/fsrep/state_string.go Normal file
View File

@ -0,0 +1,29 @@
// Code generated by "stringer -type=State"; DO NOT EDIT.
package fsrep
import "strconv"
const (
_State_name_0 = "ReadyRetryWait"
_State_name_1 = "PermanentError"
_State_name_2 = "Completed"
)
var (
_State_index_0 = [...]uint8{0, 5, 14}
)
func (i State) String() string {
switch {
case 1 <= i && i <= 2:
i -= 1
return _State_name_0[_State_index_0[i]:_State_index_0[i+1]]
case i == 4:
return _State_name_1
case i == 8:
return _State_name_2
default:
return "State(" + strconv.FormatInt(int64(i), 10) + ")"
}
}

29
cmd/replication/fsrep/stepstate_string.go Normal file
View File

@ -0,0 +1,29 @@
// Code generated by "stringer -type=StepState"; DO NOT EDIT.
package fsrep
import "strconv"
const (
_StepState_name_0 = "StepReadyStepRetry"
_StepState_name_1 = "StepPermanentError"
_StepState_name_2 = "StepCompleted"
)
var (
_StepState_index_0 = [...]uint8{0, 9, 18}
)
func (i StepState) String() string {
switch {
case 1 <= i && i <= 2:
i -= 1
return _StepState_name_0[_StepState_index_0[i]:_StepState_index_0[i+1]]
case i == 4:
return _StepState_name_1
case i == 8:
return _StepState_name_2
default:
return "StepState(" + strconv.FormatInt(int64(i), 10) + ")"
}
}

0
cmd/replication/internal/mainfsm/diff.go → cmd/replication/internal/diff/diff.go
View File

29
cmd/replication/internal/fsfsm/fsreplicationstate_string.go
View File

@ -1,29 +0,0 @@
// Code generated by "stringer -type=FSReplicationState"; DO NOT EDIT.
package fsfsm
import "strconv"
const (
_FSReplicationState_name_0 = "FSReadyFSRetryWait"
_FSReplicationState_name_1 = "FSPermanentError"
_FSReplicationState_name_2 = "FSCompleted"
)
var (
_FSReplicationState_index_0 = [...]uint8{0, 7, 18}
)
func (i FSReplicationState) String() string {
switch {
case 1 <= i && i <= 2:
i -= 1
return _FSReplicationState_name_0[_FSReplicationState_index_0[i]:_FSReplicationState_index_0[i+1]]
case i == 4:
return _FSReplicationState_name_1
case i == 8:
return _FSReplicationState_name_2
default:
return "FSReplicationState(" + strconv.FormatInt(int64(i), 10) + ")"
}
}

29
cmd/replication/internal/fsfsm/fsreplicationstepstate_string.go
View File

@ -1,29 +0,0 @@
// Code generated by "stringer -type=FSReplicationStepState"; DO NOT EDIT.
package fsfsm
import "strconv"
const (
_FSReplicationStepState_name_0 = "StepReadyStepRetry"
_FSReplicationStepState_name_1 = "StepPermanentError"
_FSReplicationStepState_name_2 = "StepCompleted"
)
var (
_FSReplicationStepState_index_0 = [...]uint8{0, 9, 18}
)
func (i FSReplicationStepState) String() string {
switch {
case 1 <= i && i <= 2:
i -= 1
return _FSReplicationStepState_name_0[_FSReplicationStepState_index_0[i]:_FSReplicationStepState_index_0[i+1]]
case i == 4:
return _FSReplicationStepState_name_1
case i == 8:
return _FSReplicationStepState_name_2
default:
return "FSReplicationStepState(" + strconv.FormatInt(int64(i), 10) + ")"
}
}

35
cmd/replication/internal/mainfsm/replicationstate_string.go
View File

@ -1,35 +0,0 @@
// Code generated by "stringer -type=ReplicationState"; DO NOT EDIT.
package mainfsm
import "strconv"
const (
_ReplicationState_name_0 = "PlanningPlanningError"
_ReplicationState_name_1 = "Working"
_ReplicationState_name_2 = "WorkingWait"
_ReplicationState_name_3 = "Completed"
_ReplicationState_name_4 = "ContextDone"
)
var (
_ReplicationState_index_0 = [...]uint8{0, 8, 21}
)
func (i ReplicationState) String() string {
switch {
case 1 <= i && i <= 2:
i -= 1
return _ReplicationState_name_0[_ReplicationState_index_0[i]:_ReplicationState_index_0[i+1]]
case i == 4:
return _ReplicationState_name_1
case i == 8:
return _ReplicationState_name_2
case i == 16:
return _ReplicationState_name_3
case i == 32:
return _ReplicationState_name_4
default:
return "ReplicationState(" + strconv.FormatInt(int64(i), 10) + ")"
}
}

28
cmd/replication/internal/mainfsm/queue/queue.go → cmd/replication/internal/queue/queue.go
View File

@ -4,17 +4,17 @@ import (
"time" "time"
"sort" "sort"
. "github.com/zrepl/zrepl/cmd/replication/internal/fsfsm" . "github.com/zrepl/zrepl/cmd/replication/fsrep"
) )
type replicationQueueItem struct { type replicationQueueItem struct {
retriesSinceLastError int retriesSinceLastError int
// duplicates fsr.state to avoid accessing and locking fsr // duplicates fsr.state to avoid accessing and locking fsr
state FSReplicationState state State
// duplicates fsr.current.nextStepDate to avoid accessing & locking fsr // duplicates fsr.current.nextStepDate to avoid accessing & locking fsr
nextStepDate time.Time nextStepDate time.Time
fsr *FSReplication fsr *Replication
} }
type ReplicationQueue []*replicationQueueItem type ReplicationQueue []*replicationQueueItem
@ -32,14 +32,14 @@ type lessmapEntry struct{
less func(a,b *replicationQueueItem) bool less func(a,b *replicationQueueItem) bool
} }
var lessmap = map[FSReplicationState]lessmapEntry { var lessmap = map[State]lessmapEntry {
FSReady: { Ready: {
prio: 0, prio: 0,
less: func(a, b *replicationQueueItem) bool { less: func(a, b *replicationQueueItem) bool {
return a.nextStepDate.Before(b.nextStepDate) return a.nextStepDate.Before(b.nextStepDate)
}, },
}, },
FSRetryWait: { RetryWait: {
prio: 1, prio: 1,
less: func(a, b *replicationQueueItem) bool { less: func(a, b *replicationQueueItem) bool {
return a.retriesSinceLastError < b.retriesSinceLastError return a.retriesSinceLastError < b.retriesSinceLastError
@ -66,10 +66,10 @@ func (q ReplicationQueue) Less(i, j int) bool {
return al.less(a, b) return al.less(a, b)
} }
func (q *ReplicationQueue) sort() (done []*FSReplication) { func (q *ReplicationQueue) sort() (done []*Replication) {
// pre-scan for everything that is not ready // pre-scan for everything that is not ready
newq := make(ReplicationQueue, 0, len(*q)) newq := make(ReplicationQueue, 0, len(*q))
done = make([]*FSReplication, 0, len(*q)) done = make([]*Replication, 0, len(*q))
for _, qitem := range *q { for _, qitem := range *q {
if _, ok := lessmap[qitem.state]; !ok { if _, ok := lessmap[qitem.state]; !ok {
done = append(done, qitem.fsr) done = append(done, qitem.fsr)
@ -83,7 +83,7 @@ func (q *ReplicationQueue) sort() (done []*FSReplication) {
} }
// next remains valid until the next call to GetNext() // next remains valid until the next call to GetNext()
func (q *ReplicationQueue) GetNext() (done []*FSReplication, next *ReplicationQueueItemHandle) { func (q *ReplicationQueue) GetNext() (done []*Replication, next *ReplicationQueueItemHandle) {
done = q.sort() done = q.sort()
if len(*q) == 0 { if len(*q) == 0 {
return done, nil return done, nil
@ -92,7 +92,7 @@ func (q *ReplicationQueue) GetNext() (done []*FSReplication, next *ReplicationQu
return done, next return done, next
} }
func (q *ReplicationQueue) Add(fsr *FSReplication) { func (q *ReplicationQueue) Add(fsr *Replication) {
*q = append(*q, &replicationQueueItem{ *q = append(*q, &replicationQueueItem{
fsr: fsr, fsr: fsr,
state: fsr.State(), state: fsr.State(),
@ -109,16 +109,16 @@ type ReplicationQueueItemHandle struct {
i *replicationQueueItem i *replicationQueueItem
} }
func (h ReplicationQueueItemHandle) GetFSReplication() *FSReplication { func (h ReplicationQueueItemHandle) GetFSReplication() *Replication {
return h.i.fsr return h.i.fsr
} }
func (h ReplicationQueueItemHandle) Update(newState FSReplicationState, nextStepDate time.Time) { func (h ReplicationQueueItemHandle) Update(newState State, nextStepDate time.Time) {
h.i.state = newState h.i.state = newState
h.i.nextStepDate = nextStepDate h.i.nextStepDate = nextStepDate
if h.i.state&FSReady != 0 { if h.i.state&Ready != 0 {
h.i.retriesSinceLastError = 0 h.i.retriesSinceLastError = 0
} else if h.i.state&FSRetryWait != 0 { } else if h.i.state&RetryWait != 0 {
h.i.retriesSinceLastError++ h.i.retriesSinceLastError++
} }
} }

118
cmd/replication/internal/mainfsm/mainfsm.go → cmd/replication/mainfsm.go
View File

@ -1,4 +1,6 @@
package mainfsm // Package replication implements replication of filesystems with existing
// versions (snapshots) from a sender to a receiver.
package replication
import ( import (
"context" "context"
@ -8,17 +10,17 @@ import (
"sync" "sync"
"time" "time"
. "github.com/zrepl/zrepl/cmd/replication/common"
"github.com/zrepl/zrepl/cmd/replication/pdu" "github.com/zrepl/zrepl/cmd/replication/pdu"
"github.com/zrepl/zrepl/cmd/replication/internal/fsfsm" "github.com/zrepl/zrepl/cmd/replication/fsrep"
. "github.com/zrepl/zrepl/cmd/replication/internal/mainfsm/queue" . "github.com/zrepl/zrepl/cmd/replication/internal/queue"
. "github.com/zrepl/zrepl/cmd/replication/internal/diff"
) )
//go:generate stringer -type=ReplicationState //go:generate stringer -type=State
type ReplicationState uint type State uint
const ( const (
Planning ReplicationState = 1 << iota Planning State = 1 << iota
PlanningError PlanningError
Working Working
WorkingWait WorkingWait
@ -26,31 +28,35 @@ const (
ContextDone ContextDone
) )
func (s ReplicationState) rsf() replicationStateFunc { func (s State) rsf() state {
idx := bits.TrailingZeros(uint(s)) idx := bits.TrailingZeros(uint(s))
if idx == bits.UintSize { if idx == bits.UintSize {
panic(s) // invalid value panic(s) // invalid value
} }
m := []replicationStateFunc{ m := []state{
rsfPlanning, statePlanning,
rsfPlanningError, statePlanningError,
rsfWorking, stateWorking,
rsfWorkingWait, stateWorkingWait,
nil, nil,
nil, nil,
} }
return m[idx] return m[idx]
} }
// Replication implements the replication of multiple file systems from a Sender to a Receiver.
//
// It is a state machine that is driven by the Drive method
// and provides asynchronous reporting via the Report method (i.e. from another goroutine).
type Replication struct { type Replication struct {
// lock protects all fields of this struct (but not the fields behind pointers!) // lock protects all fields of this struct (but not the fields behind pointers!)
lock sync.Mutex lock sync.Mutex
state ReplicationState state State
// Working, WorkingWait, Completed, ContextDone // Working, WorkingWait, Completed, ContextDone
queue *ReplicationQueue queue *ReplicationQueue
completed []*fsfsm.FSReplication completed []*fsrep.Replication
active *ReplicationQueueItemHandle active *ReplicationQueueItemHandle
// PlanningError // PlanningError
@ -66,9 +72,9 @@ type Replication struct {
type Report struct { type Report struct {
Status string Status string
Problem string Problem string
Completed []*fsfsm.FilesystemReplicationReport Completed []*fsrep.Report
Pending []*fsfsm.FilesystemReplicationReport Pending []*fsrep.Report
Active *fsfsm.FilesystemReplicationReport Active *fsrep.Report
} }
@ -79,12 +85,45 @@ func NewReplication() *Replication {
return &r return &r
} }
type replicationUpdater func(func(*Replication)) (newState ReplicationState) type Endpoint interface {
type replicationStateFunc func(ctx context.Context, sender, receiver ReplicationEndpoint, u replicationUpdater) replicationStateFunc // Does not include placeholder filesystems
ListFilesystems(ctx context.Context) ([]*pdu.Filesystem, error)
ListFilesystemVersions(ctx context.Context, fs string) ([]*pdu.FilesystemVersion, error) // fix depS
}
func (r *Replication) Drive(ctx context.Context, sender, receiver ReplicationEndpoint) { type Sender interface {
Endpoint
fsrep.Sender
}
var u replicationUpdater = func(f func(*Replication)) ReplicationState { type Receiver interface {
Endpoint
fsrep.Receiver
}
type FilteredError struct{ fs string }
func NewFilteredError(fs string) *FilteredError {
return &FilteredError{fs}
}
func (f FilteredError) Error() string { return "endpoint does not allow access to filesystem " + f.fs }
type updater func(func(*Replication)) (newState State)
type state func(ctx context.Context, sender Sender, receiver Receiver, u updater) state
// Drive starts the state machine and returns only after replication has finished (with or without errors).
// The Logger in ctx is used for both debug and error logging, but is not guaranteed to be stable
// or end-user friendly.
// User-facing replication progress reports and can be obtained using the Report method,
// whose output will not change after Drive returns.
//
// FIXME: Drive may be only called once per instance of Replication
func (r *Replication) Drive(ctx context.Context, sender Sender, receiver Receiver) {
var u updater = func(f func(*Replication)) State {
r.lock.Lock() r.lock.Lock()
defer r.lock.Unlock() defer r.lock.Unlock()
if f != nil { if f != nil {
@ -93,21 +132,21 @@ func (r *Replication) Drive(ctx context.Context, sender, receiver ReplicationEnd
return r.state return r.state
} }
var s replicationStateFunc = rsfPlanning var s state = statePlanning
var pre, post ReplicationState var pre, post State
for s != nil { for s != nil {
preTime := time.Now() preTime := time.Now()
pre = u(nil) pre = u(nil)
s = s(ctx, sender, receiver, u) s = s(ctx, sender, receiver, u)
delta := time.Now().Sub(preTime) delta := time.Now().Sub(preTime)
post = u(nil) post = u(nil)
GetLogger(ctx). getLogger(ctx).
WithField("transition", fmt.Sprintf("%s => %s", pre, post)). WithField("transition", fmt.Sprintf("%s => %s", pre, post)).
WithField("duration", delta). WithField("duration", delta).
Debug("main state transition") Debug("main state transition")
} }
GetLogger(ctx). getLogger(ctx).
WithField("final_state", post). WithField("final_state", post).
Debug("main final state") Debug("main final state")
} }
@ -133,11 +172,11 @@ func resolveConflict(conflict error) (path []*pdu.FilesystemVersion, msg string)
return nil, "no automated way to handle conflict type" return nil, "no automated way to handle conflict type"
} }
func rsfPlanning(ctx context.Context, sender, receiver ReplicationEndpoint, u replicationUpdater) replicationStateFunc { func statePlanning(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
log := GetLogger(ctx) log := getLogger(ctx)
handlePlanningError := func(err error) replicationStateFunc { handlePlanningError := func(err error) state {
return u(func(r *Replication) { return u(func(r *Replication) {
r.planningError = err r.planningError = err
r.state = PlanningError r.state = PlanningError
@ -173,7 +212,7 @@ func rsfPlanning(ctx context.Context, sender, receiver ReplicationEndpoint, u re
if len(sfsvs) <= 1 { if len(sfsvs) <= 1 {
err := errors.New("sender does not have any versions") err := errors.New("sender does not have any versions")
log.Error(err.Error()) log.Error(err.Error())
q.Add(fsfsm.NewFSReplicationWithPermanentError(fs.Path, err)) q.Add(fsrep.NewReplicationWithPermanentError(fs.Path, err))
continue continue
} }
@ -212,11 +251,11 @@ func rsfPlanning(ctx context.Context, sender, receiver ReplicationEndpoint, u re
} }
} }
if path == nil { if path == nil {
q.Add(fsfsm.NewFSReplicationWithPermanentError(fs.Path, conflict)) q.Add(fsrep.NewReplicationWithPermanentError(fs.Path, conflict))
continue continue
} }
fsrfsm := fsfsm.BuildFSReplication(fs.Path) fsrfsm := fsrep.BuildReplication(fs.Path)
if len(path) == 1 { if len(path) == 1 {
fsrfsm.AddStep(nil, path[0]) fsrfsm.AddStep(nil, path[0])
} else { } else {
@ -236,7 +275,7 @@ func rsfPlanning(ctx context.Context, sender, receiver ReplicationEndpoint, u re
}).rsf() }).rsf()
} }
func rsfPlanningError(ctx context.Context, sender, receiver ReplicationEndpoint, u replicationUpdater) replicationStateFunc { func statePlanningError(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
sleepTime := 10 * time.Second sleepTime := 10 * time.Second
u(func(r *Replication) { u(func(r *Replication) {
r.sleepUntil = time.Now().Add(sleepTime) r.sleepUntil = time.Now().Add(sleepTime)
@ -256,7 +295,7 @@ func rsfPlanningError(ctx context.Context, sender, receiver ReplicationEndpoint,
} }
} }
func rsfWorking(ctx context.Context, sender, receiver ReplicationEndpoint, u replicationUpdater) replicationStateFunc { func stateWorking(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
var active *ReplicationQueueItemHandle var active *ReplicationQueueItemHandle
rsfNext := u(func(r *Replication) { rsfNext := u(func(r *Replication) {
@ -281,7 +320,7 @@ func rsfWorking(ctx context.Context, sender, receiver ReplicationEndpoint, u rep
}).rsf() }).rsf()
} }
func rsfWorkingWait(ctx context.Context, sender, receiver ReplicationEndpoint, u replicationUpdater) replicationStateFunc { func stateWorkingWait(ctx context.Context, sender Sender, receiver Receiver, u updater) state {
sleepTime := 10 * time.Second sleepTime := 10 * time.Second
u(func(r *Replication) { u(func(r *Replication) {
r.sleepUntil = time.Now().Add(sleepTime) r.sleepUntil = time.Now().Add(sleepTime)
@ -301,6 +340,9 @@ func rsfWorkingWait(ctx context.Context, sender, receiver ReplicationEndpoint, u
} }
} }
// Report provides a summary of the progress of the Replication,
// i.e., a condensed dump of the internal state machine.
// Report is safe to be called asynchronously while Drive is running.
func (r *Replication) Report() *Report { func (r *Replication) Report() *Report {
r.lock.Lock() r.lock.Lock()
defer r.lock.Unlock() defer r.lock.Unlock()
@ -319,10 +361,10 @@ func (r *Replication) Report() *Report {
return &rep return &rep
} }
rep.Pending = make([]*fsfsm.FilesystemReplicationReport, 0, r.queue.Len()) rep.Pending = make([]*fsrep.Report, 0, r.queue.Len())
rep.Completed = make([]*fsfsm.FilesystemReplicationReport, 0, len(r.completed)) // room for active (potentially) rep.Completed = make([]*fsrep.Report, 0, len(r.completed)) // room for active (potentially)
var active *fsfsm.FSReplication var active *fsrep.Replication
if r.active != nil { if r.active != nil {
active = r.active.GetFSReplication() active = r.active.GetFSReplication()
rep.Active = active.Report() rep.Active = active.Report()

19
cmd/replication/replication.go
View File

@ -1,19 +0,0 @@
package replication
import (
"context"
"github.com/zrepl/zrepl/cmd/replication/common"
"github.com/zrepl/zrepl/cmd/replication/internal/mainfsm"
)
type Report = mainfsm.Report
type Replication interface {
Drive(ctx context.Context, sender, receiver common.ReplicationEndpoint)
Report() *Report
}
func NewReplication() Replication {
return mainfsm.NewReplication()
}

35
cmd/replication/state_string.go Normal file
View File

@ -0,0 +1,35 @@
// Code generated by "stringer -type=State"; DO NOT EDIT.
package replication
import "strconv"
const (
_State_name_0 = "PlanningPlanningError"
_State_name_1 = "Working"
_State_name_2 = "WorkingWait"
_State_name_3 = "Completed"
_State_name_4 = "ContextDone"
)
var (
_State_index_0 = [...]uint8{0, 8, 21}
)
func (i State) String() string {
switch {
case 1 <= i && i <= 2:
i -= 1
return _State_name_0[_State_index_0[i]:_State_index_0[i+1]]
case i == 4:
return _State_name_1
case i == 8:
return _State_name_2
case i == 16:
return _State_name_3
case i == 32:
return _State_name_4
default:
return "State(" + strconv.FormatInt(int64(i), 10) + ")"
}
}