Move http timeout to VitessConfigurationSettings

Author: timvaillancourt

conf/freno.conf.json

@@ -2,6 +2,5 @@
   "ListenPort": 8088,
   "RaftBind": "127.0.0.1:10008",
   "RaftDataDir": "/tmp",
-  "RaftNodes": [],
-  "VitessAPITimeoutSecs": 5
+  "RaftNodes": []
 }

pkg/config/config.go

@@ -108,23 +108,21 @@ type ConfigurationSettings struct {
 	BackendMySQLPassword string
 	MemcacheServers      []string // if given, freno will report to aggregated values to given memcache
 	MemcachePath         string   // use as prefix to metric path in memcache key, e.g. if `MemcachePath` is "myprefix" the key would be "myprefix/mysql/maincluster". Default: "freno"
-	VitessAPITimeoutSecs int      // timeout for Vitess vtctld HTTP API(s)
 	Stores               StoresSettings
 }
 
 func newConfigurationSettings() *ConfigurationSettings {
 	return &ConfigurationSettings{
-		ListenPort:           8087,
-		RaftBind:             "127.0.0.1:10008",
-		RaftDataDir:          "",
-		DefaultRaftPort:      0,
-		RaftNodes:            []string{},
-		BackendMySQLHost:     "",
-		BackendMySQLSchema:   "",
-		BackendMySQLPort:     3306,
-		MemcacheServers:      []string{},
-		MemcachePath:         "freno",
-		VitessAPITimeoutSecs: 5,
+		ListenPort:         8087,
+		RaftBind:           "127.0.0.1:10008",
+		RaftDataDir:        "",
+		DefaultRaftPort:    0,
+		RaftNodes:          []string{},
+		BackendMySQLHost:   "",
+		BackendMySQLSchema: "",
+		BackendMySQLPort:   3306,
+		MemcacheServers:    []string{},
+		MemcachePath:       "freno",
 		//Debug:                                        false,
 		//ListenSocket:                                 "",
 		//AnExampleListOfStrings:                       []string{"*"},

pkg/config/vitess_config.go

@@ -5,9 +5,10 @@ package config
 //
 
 type VitessConfigurationSettings struct {
-	API      string
-	Keyspace string
-	Shard    string
+	API         string
+	Keyspace    string
+	Shard       string
+	TimeoutSecs float64
 }
 
 func (settings *VitessConfigurationSettings) IsEmpty() bool {

pkg/throttle/throttler.go

@@ -322,14 +322,12 @@ func (throttler *Throttler) refreshMySQLInventory() error {
 
 			if !clusterSettings.VitessSettings.IsEmpty() {
 				if throttler.vitessClient == nil {
-					throttler.vitessClient = vitess.New(
-						time.Duration(config.Settings().VitessAPITimeoutSecs) * time.Second,
-					)
+					throttler.vitessClient = vitess.New(throttler.httpClient)
 				}
 				log.Debugf("getting vitess data from %s", clusterSettings.VitessSettings.API)
 				keyspace := clusterSettings.VitessSettings.Keyspace
 				shard := clusterSettings.VitessSettings.Shard
-				tablets, err := throttler.vitessClient.ParseTablets(clusterSettings.VitessSettings.API, keyspace, shard)
+				tablets, err := throttler.vitessClient.ParseTablets(clusterSettings.VitessSettings.API, keyspace, shard, clusterSettings.VitessSettings.TimeoutSecs)
 				if err != nil {
 					return log.Errorf("Unable to get vitess hosts from %s, %s/%s: %+v", clusterSettings.VitessSettings.API, keyspace, shard, err)
 				}

pkg/vitess/api_client.go

@@ -8,10 +8,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/github/freno/pkg/base"
 	"vitess.io/vitess/go/vt/proto/topodata"
 )
 
+const defaultTimeout = 5 * time.Second
+
 // Tablet represents information about a running instance of vttablet.
 type Tablet struct {
 	MysqlHostname string              `json:"mysql_hostname,omitempty"`
@@ -24,7 +25,7 @@ func (t Tablet) IsValidReplica() bool {
 	return t.Type == topodata.TabletType_REPLICA
 }
 
-func constructAPIURL(api string, keyspace string, shard string) (url string) {
+func constructAPIURL(api, keyspace, shard string) (url string) {
 	api = strings.TrimRight(api, "/")
 	if !strings.HasSuffix(api, "/api") {
 		api = fmt.Sprintf("%s/api", api)
@@ -50,15 +51,19 @@ type Client struct {
 }
 
 // New returns a new Client
-func New(timeout time.Duration) *Client {
-	return &Client{
-		client: base.SetupHttpClient(timeout),
-	}
+func New(client *http.Client) *Client {
+	return &Client{client: client}
 }
 
 // ParseTablets reads from vitess /api/ks_tablets/<keyspace>/[shard] and returns a
 // listing (mysql_hostname, mysql_port, type) of REPLICA tablets
-func (c *Client) ParseTablets(api, keyspace, shard string) (tablets []Tablet, err error) {
+func (c *Client) ParseTablets(api, keyspace, shard string, timeoutSecs float64) (tablets []Tablet, err error) {
+	if timeoutSecs == 0 {
+		c.client.Timeout = defaultTimeout
+	} else {
+		c.client.Timeout = time.Duration(timeoutSecs) * time.Second
+	}
+
 	url := constructAPIURL(api, keyspace, shard)
 	resp, err := c.client.Get(url)
 	if err != nil {