Merge pull request #12 from mozilla-services/redispool

redis connection pool configuration, increase timeouts

Author: Aaron Meihm

iprepd.go

@@ -25,6 +25,8 @@ type serverCfg struct {
 		ReadTimeout  int
 		WriteTimeout int
 		DialTimeout  int
+		MaxPoolSize  int
+		MinIdleConn  int
 	}
 	Auth struct {
 		DisableAuth bool
@@ -48,13 +50,16 @@ func (cfg *serverCfg) validate() error {
 		cfg.VersionResponse = "./version.json"
 	}
 	if cfg.Redis.ReadTimeout == 0 {
-		cfg.Redis.ReadTimeout = 50
+		cfg.Redis.ReadTimeout = 100
 	}
 	if cfg.Redis.WriteTimeout == 0 {
-		cfg.Redis.WriteTimeout = 50
+		cfg.Redis.WriteTimeout = 100
 	}
 	if cfg.Redis.DialTimeout == 0 {
-		cfg.Redis.DialTimeout = 100
+		cfg.Redis.DialTimeout = 250
+	}
+	if cfg.Redis.MinIdleConn == 0 {
+		cfg.Redis.MinIdleConn = 20
 	}
 	return nil
 }

iprepd.yaml.sample

@@ -10,9 +10,17 @@ redis:
   #replicas:
   #  - 127.0.0.1:7000
   # Read, write, and dial connection timeouts in ms (defaults shown).
-  readtimeout: 50
-  writetimeout: 50
-  dialtimeout: 100
+  readtimeout: 100
+  writetimeout: 100
+  dialtimeout: 250
+  # If 0, use go-redis default maximum client pool size (10 * runtime.NumCPU()). Set to non-zero to
+  # manually specify maximum pool size.
+  # https://godoc.org/github.com/go-redis/redis#Options
+  #maxpoolsize: 0
+  # The minimum number of idle connections to try to keep open with redis. If 0, the value will
+  # default to 20. If the maximum pool size is less than 20, it will default to the entire pool
+  # size.
+  #minidleconn: 0
 auth:
   # Configure any Hawk credentials here. Each credential should be specified as a key/value
   # pair, where the key is the Hawk ID and the value is the secret.

redis.go

@@ -2,6 +2,7 @@ package iprepd
 
 import (
 	"math/rand"
+	"runtime"
 	"time"
 
 	"github.com/go-redis/redis"
@@ -48,12 +49,21 @@ func (r *redisLink) set(k string, v interface{}, e time.Duration) *redis.StatusC
 }
 
 func newRedisLink(cfg serverCfg) (ret redisLink, err error) {
+	minIdleConns := cfg.Redis.MinIdleConn
+	if cfg.Redis.MaxPoolSize != 0 && cfg.Redis.MaxPoolSize < 20 {
+		minIdleConns = cfg.Redis.MaxPoolSize
+	} else if cfg.Redis.MaxPoolSize == 0 && (10*runtime.NumCPU()) < 20 {
+		minIdleConns = 10 * runtime.NumCPU()
+	}
+
 	ret.master = redis.NewClient(&redis.Options{
 		Addr:         cfg.Redis.Addr,
 		DB:           0,
 		ReadTimeout:  time.Millisecond * time.Duration(cfg.Redis.ReadTimeout),
 		WriteTimeout: time.Millisecond * time.Duration(cfg.Redis.WriteTimeout),
 		DialTimeout:  time.Millisecond * time.Duration(cfg.Redis.DialTimeout),
+		PoolSize:     cfg.Redis.MaxPoolSize,
+		MinIdleConns: minIdleConns,
 	})
 	_, err = ret.ping().Result()
 	if err != nil {
@@ -67,10 +77,12 @@ func newRedisLink(cfg serverCfg) (ret redisLink, err error) {
 			continue
 		}
 		y := redis.NewClient(&redis.Options{
-			Addr:        x,
-			DB:          0,
-			ReadTimeout: time.Millisecond * time.Duration(cfg.Redis.ReadTimeout),
-			DialTimeout: time.Millisecond * time.Duration(cfg.Redis.DialTimeout),
+			Addr:         x,
+			DB:           0,
+			ReadTimeout:  time.Millisecond * time.Duration(cfg.Redis.ReadTimeout),
+			DialTimeout:  time.Millisecond * time.Duration(cfg.Redis.DialTimeout),
+			PoolSize:     cfg.Redis.MaxPoolSize,
+			MinIdleConns: minIdleConns,
 		})
 		ret.readClients = append(ret.readClients, y)
 	}