extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-08-09 23:17:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement push support.

Browse Source 
Pushing is achieved by inverting the roles on the established
connection, i.e. the client tells the server what data it should pull
from the client (PullMeRequest).

Role inversion is achieved by moving the server loop to the serverLoop
function of ByteStreamRPC, which can be called from both the Listen()
function (server-side) and the PullMeRequest() client-side function.

A donwside of this PullMe approach is that the replication policies
become part of the rpc, because the puller must follow the policy.
This commit is contained in:
Christian Schwarz
2017-05-16 16:57:24 +02:00
parent c7161cf8e6
commit 35dcfc234e
6 changed files with 200 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/config.go
View File

@ -21,7 +21,7 @@ type Pool struct {
}
type Transport interface {
Connect() (rpc.RPCRequester, error)
Connect(rpcLog Logger) (rpc.RPCRequester, error)
}
type LocalTransport struct {
Handler rpc.RPCHandler
@ -40,7 +40,7 @@ type SSHTransport struct {
type Push struct {
To *Pool
Datasets []zfs.DatasetPath
Filter zfs.DatasetMapping
InitialReplPolicy rpc.InitialReplPolicy
}
type Pull struct {
@ -169,7 +169,7 @@ func parsePushs(v interface{}, pl poolLookup) (p []Push, err error) {
asList := make([]struct {
To string
Datasets []string
Filter map[string]string
InitialReplPolicy string
}, 0)
@ -186,14 +186,11 @@ func parsePushs(v interface{}, pl poolLookup) (p []Push, err error) {
return
}
push := Push{
To: toPool,
Datasets: make([]zfs.DatasetPath, len(e.Datasets)),
To: toPool,
}
for i, ds := range e.Datasets {
if push.Datasets[i], err = zfs.NewDatasetPath(ds); err != nil {
return
}
if push.Filter, err = parseComboMapping(e.Filter); err != nil {
return
}
if push.InitialReplPolicy, err = parseInitialReplPolicy(e.InitialReplPolicy, rpc.DEFAULT_INITIAL_REPL_POLICY); err != nil {
@ -376,7 +373,7 @@ func parseComboMapping(m map[string]string) (c zfs.ComboMapping, err error) {
}
func (t SSHTransport) Connect() (r rpc.RPCRequester, err error) {
func (t SSHTransport) Connect(rpcLog Logger) (r rpc.RPCRequester, err error) {
var stream io.ReadWriteCloser
var rpcTransport sshbytestream.SSHTransport
if err = copier.Copy(&rpcTransport, t); err != nil {
@ -389,10 +386,10 @@ func (t SSHTransport) Connect() (r rpc.RPCRequester, err error) {
if err != nil {
return
}
return rpc.ConnectByteStreamRPC(stream)
return rpc.ConnectByteStreamRPC(stream, rpcLog)
}
func (t LocalTransport) Connect() (r rpc.RPCRequester, err error) {
func (t LocalTransport) Connect(rpcLog Logger) (r rpc.RPCRequester, err error) {
if t.Handler == nil {
panic("local transport with uninitialized handler")
}