Re-add api url to ParseTablets()

Author: timvaillancourt

pkg/config/config.go

@@ -108,7 +108,7 @@ 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
+	VitessAPITimeoutSecs int      // timeout for Vitess vtctld HTTP API(s)
 	Stores               StoresSettings
 }
 

pkg/throttle/throttler.go

@@ -322,8 +322,9 @@ func (throttler *Throttler) refreshMySQLInventory() error {
 
 			if !clusterSettings.VitessSettings.IsEmpty() {
 				if throttler.vitessClient == nil {
-					apiTimeout := time.Duration(config.Settings().VitessAPITimeoutSecs) * time.Second
-					throttler.vitessClient = vitess.New(apiTimeout)
+					throttler.vitessClient = vitess.New(
+						time.Duration(config.Settings().VitessAPITimeoutSecs) * time.Second,
+					)
 				}
 				log.Debugf("getting vitess data from %s", clusterSettings.VitessSettings.API)
 				keyspace := clusterSettings.VitessSettings.Keyspace

pkg/vitess/api_client.go

@@ -24,18 +24,6 @@ func (t Tablet) IsValidReplica() bool {
 	return t.Type == topodata.TabletType_REPLICA
 }
 
-// Client gathers info from the Vitess API
-type Client struct {
-	client *http.Client
-}
-
-// New returns a new Client
-func New(apiTimeout time.Duration) *Client {
-	return &Client{
-		client: base.SetupHttpClient(apiTimeout),
-	}
-}
-
 func constructAPIURL(api string, keyspace string, shard string) (url string) {
 	api = strings.TrimRight(api, "/")
 	if !strings.HasSuffix(api, "/api") {
@@ -56,9 +44,21 @@ func filterReplicaTablets(tablets []Tablet) (replicas []Tablet) {
 	return replicas
 }
 
+// Client gathers info from the Vitess API
+type Client struct {
+	client *http.Client
+}
+
+// New returns a new Client
+func New(timeout time.Duration) *Client {
+	return &Client{
+		client: base.SetupHttpClient(timeout),
+	}
+}
+
 // 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 string, keyspace string, shard string) (tablets []Tablet, err error) {
+func (c *Client) ParseTablets(api, keyspace, shard string) (tablets []Tablet, err error) {
 	url := constructAPIURL(api, keyspace, shard)
 	resp, err := c.client.Get(url)
 	if err != nil {

pkg/vitess/api_client_test.go

@@ -50,10 +50,10 @@ func TestParseTablets(t *testing.T) {
 	}))
 	defer vitessApi.Close()
 
-	vt := New(time.Second)
+	vtClient := New(time.Second)
 
 	t.Run("success", func(t *testing.T) {
-		tablets, err := vt.ParseTablets(vitessApi.URL, "test", "00")
+		tablets, err := vtClient.ParseTablets(vitessApi.URL, "test", "00")
 		if err != nil {
 			t.Fatalf("Expected no error, got %q", err)
 		}
@@ -68,7 +68,7 @@ func TestParseTablets(t *testing.T) {
 	})
 
 	t.Run("not-found", func(t *testing.T) {
-		tablets, err := vt.ParseTablets(vitessApi.URL, "not-found", "00")
+		tablets, err := vtClient.ParseTablets(vitessApi.URL, "not-found", "00")
 		if err != nil {
 			t.Fatalf("Expected no error, got %q", err)
 		}
@@ -80,7 +80,7 @@ func TestParseTablets(t *testing.T) {
 
 	t.Run("failed", func(t *testing.T) {
 		vitessApi.Close() // kill the mock vitess API
-		_, err := vt.ParseTablets(vitessApi.URL, "fail", "00")
+		_, err := vtClient.ParseTablets(vitessApi.URL, "fail", "00")
 		if err == nil {
 			t.Fatal("Expected error, got nil")
 		}