session: allow more attempts if bblfsh is reconnecting

Signed-off-by: Miguel Molina <[email protected]>

Author: erizocosmico

.travis.yml

@@ -5,14 +5,10 @@ go:
   - 1.9
   - tip
 
-<<<<<<< HEAD
-go_import_path: github.com/src-d/gitbase
-=======
 services:
   - docker
 
 go_import_path: github.com/src-d/gitbase
->>>>>>> internal/function: implement uast and uast_xpath functions
 
 matrix:
   fast_finish: true

internal/function/uast_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/bblfsh/client-go.v2/tools"
@@ -192,7 +193,7 @@ func setup(t *testing.T) (*sql.Context, func()) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session)
+	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 	return ctx, func() {
 		require.NoError(t, fixtures.Clean())

session.go

@@ -68,16 +68,17 @@ func (s *Session) BblfshClient() (*bblfsh.Client, error) {
 		}
 	}
 
-	var attempts int
+	var attempts, totalAttempts int
 	for {
-		if attempts > bblfshMaxAttempts {
+		if attempts > bblfshMaxAttempts || totalAttempts > 3*bblfshMaxAttempts {
 			return nil, ErrBblfshConnection.New()
 		}
 
 		switch s.bblfshClient.GetState() {
 		case connectivity.Ready, connectivity.Idle:
 			return s.bblfshClient, nil
 		case connectivity.Connecting:
+			attempts = 0
 			time.Sleep(100 * time.Millisecond)
 		default:
 			if err := s.bblfshClient.Close(); err != nil {
@@ -91,6 +92,7 @@ func (s *Session) BblfshClient() (*bblfsh.Client, error) {
 		}
 
 		attempts++
+		totalAttempts++
 	}
 }