extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-21 16:03:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

rpc: bytestream: listen: consistent error handling

Browse Source
This commit is contained in:
Christian Schwarz 2017-04-30 23:43:09 +02:00
parent ec4284f80c
commit 8bdcdd5ec6
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rpc/rpc.go
View File

@ -57,6 +57,8 @@ func ListenByteStreamRPC(conn io.ReadWriteCloser, handler RPCHandler) error {
// a) a chunked response
// b) or another JSON object
defer conn.Close()
decoder := json.NewDecoder(conn)
encoder := json.NewEncoder(conn)
@ -65,8 +67,7 @@ func ListenByteStreamRPC(conn io.ReadWriteCloser, handler RPCHandler) error {
var header RequestHeader = RequestHeader{}
if err := decoder.Decode(&header); err != nil {
respondWithError(encoder, EDecodeHeader, err)
conn.Close()
return err
return conn.Close()
}
switch header.Type {
@ -74,34 +75,37 @@ func ListenByteStreamRPC(conn io.ReadWriteCloser, handler RPCHandler) error {
var rq ByteStreamRPCProtocolVersionRequest
if err := decoder.Decode(&rq); err != nil {
respondWithError(encoder, EDecodeRequestBody, nil)
conn.Close()
return conn.Close()
}
if rq.ClientVersion != ByteStreamRPCProtocolVersion {
respondWithError(encoder, EProtocolVersionMismatch, nil)
conn.Close()
return conn.Close()
}
r := ResponseHeader{
RequestId: header.Id,
RequestId: header.Id,
ResponseType: ROK,
}
if err := encoder.Encode(&r); err != nil {
return err
panic(err)
}
case RTFilesystemRequest:
var rq FilesystemRequest
if err := decoder.Decode(&rq); err != nil {
respondWithError(encoder, EDecodeRequestBody, nil)
conn.Close()
return conn.Close()
}
roots, err := handler.HandleFilesystemRequest(rq)
if err != nil {
respondWithError(encoder, EHandler, err)
return conn.Close()
} else {
if err := encoder.Encode(&roots); err != nil {
return err
panic(err)
}
}
@ -109,16 +113,18 @@ func ListenByteStreamRPC(conn io.ReadWriteCloser, handler RPCHandler) error {
var rq InitialTransferRequest
if err := decoder.Decode(&rq); err != nil {
respondWithError(encoder, EDecodeRequestBody, nil)
return conn.Close()
}
snapReader, err := handler.HandleInitialTransferRequest(rq)
if err != nil {
respondWithError(encoder, EHandler, err)
return conn.Close()
} else {
chunker := NewChunker(snapReader)
_, err := io.Copy(conn, &chunker)
if err != nil {
return err
panic(err)
}
}
@ -127,6 +133,7 @@ func ListenByteStreamRPC(conn io.ReadWriteCloser, handler RPCHandler) error {
var rq IncrementalTransferRequest
if err := decoder.Decode(&rq); err != nil {
respondWithError(encoder, EDecodeRequestBody, nil)
return conn.Close()
}
snapReader, err := handler.HandleIncrementalTransferRequest(rq)
@ -136,13 +143,13 @@ func ListenByteStreamRPC(conn io.ReadWriteCloser, handler RPCHandler) error {
chunker := NewChunker(snapReader)
_, err := io.Copy(conn, &chunker)
if err != nil {
return err
panic(err)
}
}
default:
respondWithError(encoder, EUnknownRequestType, nil)
conn.Close()
return conn.Close()
}
}