Merge pull request #522 from ajnavarro/configurable-timeout

Configurable timeout

Author: ajnavarro

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "120f7d7ae8720f843dca0ce8fbc8429a8952a25a"
+  revision = "679d33772845593ce5fdf17925f49f2335bc8356"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"
@@ -75,3 +75,9 @@
 [[override]]
   name = "github.com/moovweb/rubex"
   branch = "go1"
+
+[prune]
+  [[prune.project]]
+    name = "gopkg.in/src-d/go-mysql-server.v0"
+    go-tests = true
+    non-go = true

Gopkg.toml

@@ -7,6 +7,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/src-d/gitbase"
 	"github.com/src-d/gitbase/internal/function"
@@ -46,6 +47,7 @@ type Server struct {
 	Port          int            `short:"p" long:"port" default:"3306" description:"Port where the server is going to listen"`
 	User          string         `short:"u" long:"user" default:"root" description:"User name used for connection"`
 	Password      string         `short:"P" long:"password" default:"" description:"Password used for connection"`
+	ConnTimeout   int            `short:"t" long:"timeout" env:"GITBASE_CONNECTION_TIMEOUT" description:"Timeout in seconds used for connections"`
 	IndexDir      string         `short:"i" long:"index" default:"/var/lib/gitbase/index" description:"Directory where the gitbase indexes information will be persisted." env:"GITBASE_INDEX_DIR"`
 	CacheSize     cache.FileSize `long:"cache" default:"512" description:"Object cache size in megabytes" env:"GITBASE_CACHESIZE_MB"`
 	Parallelism   uint           `long:"parallelism" description:"Maximum number of parallel threads per table. By default, it's the number of CPU cores. 0 means default, 1 means disabled."`
@@ -146,12 +148,15 @@ func (c *Server) Execute(args []string) error {
 	}
 
 	hostString := net.JoinHostPort(c.Host, strconv.Itoa(c.Port))
+	timeout := time.Duration(c.ConnTimeout) * time.Second
 	s, err := server.NewServer(
 		server.Config{
-			Protocol: "tcp",
-			Address:  hostString,
-			Auth:     auth,
-			Tracer:   tracer,
+			Protocol:         "tcp",
+			Address:          hostString,
+			Auth:             auth,
+			Tracer:           tracer,
+			ConnReadTimeout:  timeout,
+			ConnWriteTimeout: timeout,
 		},
 		c.engine,
 		gitbase.NewSessionBuilder(c.pool,

cmd/gitbase/command/server.go

@@ -14,6 +14,7 @@
 | `GITBASE_LANGUAGE_CACHE_SIZE`| size of the cache for the `language` UDF. The size is the maximum number of elements kept in the cache, 10000 by default |
 | `GITBASE_UAST_CACHE_SIZE`    | size of the cache for the `uast` and `uast_mode` UDFs. The size is the maximum number of elements kept in the cache, 10000 by default |
 | `GITBASE_CACHESIZE_MB`       | size of the cache for git objects specified as MB                                  |
+| `GITBASE_CONNECTION_TIMEOUT` | timeout in seconds used for client connections on write and reads. No timeout by default.     |
 
 ### Jaeger tracing variables
 
@@ -67,18 +68,23 @@ Help Options:
   -h, --help             Show this help message
 
 [server command options]
-      -d, --directories= Path where the git repositories are located (standard and siva), multiple directories can be defined. Accepts globs.
+      -d, --directories= Path where the git repositories are located (standard and siva), multiple directories can be
+                         defined. Accepts globs.
           --depth=       load repositories looking at less than <depth> nested subdirectories. (default: 1000)
           --host=        Host where the server is going to listen (default: localhost)
       -p, --port=        Port where the server is going to listen (default: 3306)
       -u, --user=        User name used for connection (default: root)
       -P, --password=    Password used for connection
-      -i, --index=       Directory where the gitbase indexes information will be persisted. (default: /var/lib/gitbase/index) [$GITBASE_INDEX_DIR]
+      -t, --timeout=     Timeout in seconds used for connections [$GITBASE_CONNECTION_TIMEOUT]
+      -i, --index=       Directory where the gitbase indexes information will be persisted. (default:
+                         /var/lib/gitbase/index) [$GITBASE_INDEX_DIR]
           --cache=       Object cache size in megabytes (default: 512) [$GITBASE_CACHESIZE_MB]
-          --parallelism= Maximum number of parallel threads per table. By default, it's the number of CPU cores. 0 means default, 1 means disabled.
+          --parallelism= Maximum number of parallel threads per table. By default, it's the number of CPU cores. 0
+                         means default, 1 means disabled.
           --no-squash    Disables the table squashing.
           --trace        Enables jaeger tracing [$GITBASE_TRACE]
-      -r, --readonly     Only allow read queries. This disables creating and deleting indexes as well. [$GITBASE_READONLY]
+      -r, --readonly     Only allow read queries. This disables creating and deleting indexes as well.
+                         [$GITBASE_READONLY]
           --no-git       disable the load of git standard repositories.
           --no-siva      disable the load of siva files.
       -v                 Activates the verbose mode

docs/using-gitbase/configuration.md

@@ -32,4 +32,4 @@ BigEndianInt32(len(marhsal(node))+marshal(node)+
 
 ## Standard functions
 
-You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/120f7d7ae8720f843dca0ce8fbc8429a8952a25a#custom-functions).
+You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/679d33772845593ce5fdf17925f49f2335bc8356#custom-functions).

docs/using-gitbase/functions.md

@@ -10,4 +10,4 @@ Note that you can create an index either **on one or more columns** or **on a si
 
 You can find some more examples in the [examples](./examples.md#create-an-index-for-columns-on-a-table) section.
 
-See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/120f7d7ae8720f843dca0ce8fbc8429a8952a25a#indexes) documentation for more details
+See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/679d33772845593ce5fdf17925f49f2335bc8356#indexes) documentation for more details

docs/using-gitbase/indexes.md

@@ -1,3 +1,3 @@
 ## Supported syntax
 
-To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/120f7d7ae8720f843dca0ce8fbc8429a8952a25a/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).
+To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/679d33772845593ce5fdf17925f49f2335bc8356/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).