Merge branch 'refactor-smarthttp' into 'master'

Use io.Copy in gitaly smarthttp

See merge request !159

internal/gitaly/smarthttp.go

@@ -8,23 +8,12 @@ import (
 	pbhelper "gitlab.com/gitlab-org/gitaly-proto/go/helper"
 
 	"golang.org/x/net/context"
-	"google.golang.org/grpc"
 )
 
 type SmartHTTPClient struct {
 	pb.SmartHTTPClient
 }
 
-type uploadPackWriter struct {
-	pb.SmartHTTP_PostUploadPackClient
-}
-
-type receivePackWriter struct {
-	pb.SmartHTTP_PostReceivePackClient
-}
-
-const sendChunkSize = 16384
-
 func (client *SmartHTTPClient) InfoRefsResponseWriterTo(ctx context.Context, repo *pb.Repository, rpc string) (io.WriterTo, error) {
 	rpcRequest := &pb.InfoRefsRequest{Repository: repo}
 	var c pbhelper.InfoRefsClient
@@ -64,21 +53,31 @@ func (client *SmartHTTPClient) ReceivePack(repo *pb.Repository, GlId string, cli
 		return fmt.Errorf("initial request: %v", err)
 	}
 
-	waitc := make(chan error, 1)
+	numStreams := 2
+	errC := make(chan error, numStreams)
 
-	go receiveGitalyResponse(stream, waitc, clientResponse, func() ([]byte, error) {
+	go func() {
+		rr := pbhelper.NewReceiveReader(func() ([]byte, error) {
 			response, err := stream.Recv()
 			return response.GetData(), err
 		})
+		_, err := io.Copy(clientResponse, rr)
+		errC <- err
+	}()
 
-	_, sendErr := io.Copy(receivePackWriter{stream}, clientRequest)
+	go func() {
+		sw := pbhelper.NewSendWriter(func(data []byte) error {
+			return stream.Send(&pb.PostReceivePackRequest{Data: data})
+		})
+		_, err := io.Copy(sw, clientRequest)
 		stream.CloseSend()
+		errC <- err
+	}()
 
-	if recvErr := <-waitc; recvErr != nil {
-		return recvErr
+	for i := 0; i < numStreams; i++ {
+		if err := <-errC; err != nil {
+			return err
 		}
-	if sendErr != nil {
-		return fmt.Errorf("send: %v", sendErr)
 	}
 
 	return nil
@@ -101,60 +100,32 @@ func (client *SmartHTTPClient) UploadPack(repo *pb.Repository, clientRequest io.
 		return fmt.Errorf("initial request: %v", err)
 	}
 
-	waitc := make(chan error, 1)
+	numStreams := 2
+	errC := make(chan error, numStreams)
 
-	go receiveGitalyResponse(stream, waitc, clientResponse, func() ([]byte, error) {
+	go func() {
+		rr := pbhelper.NewReceiveReader(func() ([]byte, error) {
 			response, err := stream.Recv()
 			return response.GetData(), err
 		})
+		_, err := io.Copy(clientResponse, rr)
+		errC <- err
+	}()
 
-	_, sendErr := io.Copy(uploadPackWriter{stream}, clientRequest)
+	go func() {
+		sw := pbhelper.NewSendWriter(func(data []byte) error {
+			return stream.Send(&pb.PostUploadPackRequest{Data: data})
+		})
+		_, err := io.Copy(sw, clientRequest)
 		stream.CloseSend()
-
-	if recvErr := <-waitc; recvErr != nil {
-		return recvErr
-	}
-	if sendErr != nil {
-		return fmt.Errorf("send: %v", sendErr)
-	}
-
-	return nil
-}
-
-func receiveGitalyResponse(cs grpc.ClientStream, waitc chan error, clientResponse io.Writer, receiver func() ([]byte, error)) {
-	defer func() {
-		close(waitc)
-		cs.CloseSend()
+		errC <- err
 	}()
 
-	for {
-		data, err := receiver()
-		if err != nil {
-			if err != io.EOF {
-				waitc <- fmt.Errorf("receive: %v", err)
-			}
-			return
-		}
-
-		if _, err := clientResponse.Write(data); err != nil {
-			waitc <- fmt.Errorf("write: %v", err)
-			return
+	for i := 0; i < numStreams; i++ {
+		if err := <-errC; err != nil {
+			return err
 		}
 	}
-}
 
-func (rw uploadPackWriter) Write(p []byte) (int, error) {
-	resp := &pb.PostUploadPackRequest{Data: p}
-	if err := rw.Send(resp); err != nil {
-		return 0, err
-	}
-	return len(p), nil
-}
-
-func (rw receivePackWriter) Write(p []byte) (int, error) {
-	resp := &pb.PostReceivePackRequest{Data: p}
-	if err := rw.Send(resp); err != nil {
-		return 0, err
-	}
-	return len(p), nil
+	return nil
 }

vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION

-0.5.0
+0.5.1

vendor/gitlab.com/gitlab-org/gitaly-proto/go/helper/stream.go

+package helper
+
+import (
+	"io"
+)
+
+// NewReceiveReader turns receiver into an io.Reader. Errors from the
+// receiver function are passed on unmodified. This means receiver should
+// emit io.EOF when done.
+func NewReceiveReader(receiver func() ([]byte, error)) io.Reader {
+	return &receiveReader{receiver: receiver}
+}
+
+type receiveReader struct {
+	receiver func() ([]byte, error)
+	data     []byte
+	err      error
+}
+
+func (rr *receiveReader) Read(p []byte) (int, error) {
+	if len(rr.data) == 0 {
+		rr.data, rr.err = rr.receiver()
+	}
+	n := copy(p, rr.data)
+	rr.data = rr.data[n:]
+	if len(rr.data) == 0 {
+		return n, rr.err
+	}
+	return n, nil
+}
+
+// NewSendWriter turns sender into an io.Writer. The number of 'bytes
+// written' reported back is always len(p).
+func NewSendWriter(sender func(p []byte) error) io.Writer {
+	return &sendWriter{sender: sender}
+}
+
+type sendWriter struct {
+	sender func([]byte) error
+}
+
+func (sw *sendWriter) Write(p []byte) (int, error) {
+	return len(p), sw.sender(p)
+}

vendor/vendor.json

@@ -128,20 +128,20 @@
 			"revisionTime": "2016-11-17T07:43:51Z"
 		},
 		{
-			"checksumSHA1": "qnITGZYkVMWqbOeVVt6jMKJ544M=",
+			"checksumSHA1": "8+jRNQyKFIBwS222eR6mKOhgXrY=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "52f77b23166e640a932e50223472d761404afb42",
-			"revisionTime": "2017-03-29T16:52:58Z",
-			"version": "v0.5.0",
-			"versionExact": "v0.5.0"
+			"revision": "fcdb86aa58b7d3a729b4bb17fef12bf0a3fba131",
+			"revisionTime": "2017-04-25T15:29:29Z",
+			"version": "v0.5.1",
+			"versionExact": "v0.5.1"
 		},
 		{
-			"checksumSHA1": "2E36lBoyaVky2EJP1E5ub6Rg+uI=",
+			"checksumSHA1": "GkeSZfXVbtAkBZOrswot19GJZqQ=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go/helper",
-			"revision": "52f77b23166e640a932e50223472d761404afb42",
-			"revisionTime": "2017-03-29T16:52:58Z",
-			"version": "v0.5.0",
-			"versionExact": "v0.5.0"
+			"revision": "fcdb86aa58b7d3a729b4bb17fef12bf0a3fba131",
+			"revisionTime": "2017-04-25T15:29:29Z",
+			"version": "v0.5.1",
+			"versionExact": "v0.5.1"
 		},
 		{
 			"checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",