change cassandra timeout to duration var

Author: replay

cmd/mt-split-metrics-by-ttl/main.go

@@ -23,7 +23,7 @@ func main() {
 	flag.StringVar(&storeConfig.Keyspace, "cassandra-keyspace", storeConfig.Keyspace, "cassandra keyspace to use for storing the metric data table")
 	flag.StringVar(&storeConfig.Consistency, "cassandra-consistency", storeConfig.Consistency, "write consistency (any|one|two|three|quorum|all|local_quorum|each_quorum|local_one")
 	flag.StringVar(&storeConfig.HostSelectionPolicy, "cassandra-host-selection-policy", storeConfig.HostSelectionPolicy, "")
-	flag.IntVar(&storeConfig.Timeout, "cassandra-timeout", storeConfig.Timeout, "cassandra timeout in milliseconds")
+	flag.DurationVar(&storeConfig.Timeout, "cassandra-timeout", storeConfig.Timeout, "cassandra timeout")
 	flag.IntVar(&storeConfig.Retries, "cassandra-retries", storeConfig.Retries, "how many times to retry a query before failing it")
 	flag.IntVar(&storeConfig.CqlProtocolVersion, "cql-protocol-version", storeConfig.CqlProtocolVersion, "cql protocol version to use")
 	flag.BoolVar(&storeConfig.DisableInitialHostLookup, "cassandra-disable-initial-host-lookup", storeConfig.DisableInitialHostLookup, "instruct the driver to not attempt to get host info from the system.peers table")

cmd/mt-store-cat/main.go

@@ -45,7 +45,7 @@ func main() {
 	flag.StringVar(&storeConfig.Keyspace, "cassandra-keyspace", storeConfig.Keyspace, "cassandra keyspace to use for storing the metric data table")
 	flag.StringVar(&storeConfig.Consistency, "cassandra-consistency", storeConfig.Consistency, "write consistency (any|one|two|three|quorum|all|local_quorum|each_quorum|local_one")
 	flag.StringVar(&storeConfig.HostSelectionPolicy, "cassandra-host-selection-policy", storeConfig.HostSelectionPolicy, "")
-	flag.IntVar(&storeConfig.Timeout, "cassandra-timeout", storeConfig.Timeout, "cassandra timeout in milliseconds")
+	flag.DurationVar(&storeConfig.Timeout, "cassandra-timeout", storeConfig.Timeout, "cassandra timeout")
 	flag.IntVar(&storeConfig.ReadConcurrency, "cassandra-read-concurrency", storeConfig.ReadConcurrency, "max number of concurrent reads to cassandra.")
 	//flag.IntVar(&storeConfig.WriteConcurrency, "write-concurrency", storeConfig.WriteConcurrency, "max number of concurrent writes to cassandra.")
 	flag.IntVar(&storeConfig.ReadQueueSize, "cassandra-read-queue-size", storeConfig.ReadQueueSize, "max number of outstanding reads before reads will be dropped. This is important if you run queries that result in many reads in parallel.")

cmd/mt-update-ttl/main.go

@@ -23,7 +23,7 @@ var (
 	cassandraKeyspace            = flag.String("cassandra-keyspace", "metrictank", "cassandra keyspace to use for storing the metric data table")
 	cassandraConsistency         = flag.String("cassandra-consistency", "one", "write consistency (any|one|two|three|quorum|all|local_quorum|each_quorum|local_one")
 	cassandraHostSelectionPolicy = flag.String("cassandra-host-selection-policy", "tokenaware,hostpool-epsilon-greedy", "")
-	cassandraTimeout             = flag.Int("cassandra-timeout", 1000, "cassandra timeout in milliseconds")
+	cassandraTimeout             = flag.Duration("cassandra-timeout", time.Second, "cassandra timeout")
 	cassandraConcurrency         = flag.Int("cassandra-concurrency", 20, "max number of concurrent reads to cassandra.")
 	cassandraRetries             = flag.Int("cassandra-retries", 0, "how many times to retry a query before failing it")
 	cqlProtocolVersion           = flag.Int("cql-protocol-version", 4, "cql protocol version to use")

cmd/mt-whisper-importer-writer/main.go

@@ -89,7 +89,7 @@ func main() {
 	globalFlags.StringVar(&storeConfig.Keyspace, "cassandra-keyspace", storeConfig.Keyspace, "cassandra keyspace to use for storing the metric data table")
 	globalFlags.StringVar(&storeConfig.Consistency, "cassandra-consistency", storeConfig.Consistency, "write consistency (any|one|two|three|quorum|all|local_quorum|each_quorum|local_one")
 	globalFlags.StringVar(&storeConfig.HostSelectionPolicy, "cassandra-host-selection-policy", storeConfig.HostSelectionPolicy, "")
-	globalFlags.IntVar(&storeConfig.Timeout, "cassandra-timeout", storeConfig.Timeout, "cassandra timeout in milliseconds")
+	globalFlags.DurationVar(&storeConfig.Timeout, "cassandra-timeout", storeConfig.Timeout, "cassandra timeout")
 	globalFlags.IntVar(&storeConfig.ReadConcurrency, "cassandra-read-concurrency", storeConfig.ReadConcurrency, "max number of concurrent reads to cassandra.")
 	globalFlags.IntVar(&storeConfig.WriteConcurrency, "cassandra-write-concurrency", storeConfig.WriteConcurrency, "max number of concurrent writes to cassandra.")
 	globalFlags.IntVar(&storeConfig.ReadQueueSize, "cassandra-read-queue-size", storeConfig.ReadQueueSize, "max number of outstanding reads before reads will be dropped. This is important if you run queries that result in many reads in parallel.")

docker/docker-chaos/metrictank.ini

@@ -70,8 +70,8 @@ consistency = one
 # tokenaware,hostpool-simple         : prefer host that has the needed data, fallback to hostpool-simple.
 # tokenaware,hostpool-epsilon-greedy : prefer host that has the needed data, fallback to hostpool-epsilon-greedy.
 host-selection-policy = tokenaware,hostpool-epsilon-greedy
-# cassandra timeout in milliseconds
-timeout = 4000
+# cassandra timeout
+timeout = 4s
 # max number of concurrent reads to cassandra
 read-concurrency = 500
 # max number of concurrent writes to cassandra

docker/docker-cluster/metrictank.ini

@@ -70,8 +70,8 @@ consistency = one
 # tokenaware,hostpool-simple         : prefer host that has the needed data, fallback to hostpool-simple.
 # tokenaware,hostpool-epsilon-greedy : prefer host that has the needed data, fallback to hostpool-epsilon-greedy.
 host-selection-policy = tokenaware,hostpool-epsilon-greedy
-# cassandra timeout in milliseconds
-timeout = 4000
+# cassandra timeout
+timeout = 4s
 # max number of concurrent reads to cassandra
 read-concurrency = 500
 # max number of concurrent writes to cassandra

docker/docker-cosmosdb/docker-compose.yml

@@ -17,7 +17,7 @@ services:
      WAIT_TIMEOUT: 60
      MT_STATS_ADDR: graphite:2003
      MT_CASSANDRA_ADDRS: <addr>
-     MT_CASSANDRA_TIMEOUT: 30000
+     MT_CASSANDRA_TIMEOUT: 30s
      MT_CASSANDRA_SSL: "true"
      MT_CASSANDRA_CA_PATH: ""
      MT_CASSANDRA_HOST_VERIFICATION: "false"

docker/docker-dev-custom-cfg-kafka/metrictank.ini

@@ -70,8 +70,8 @@ consistency = one
 # tokenaware,hostpool-simple         : prefer host that has the needed data, fallback to hostpool-simple.
 # tokenaware,hostpool-epsilon-greedy : prefer host that has the needed data, fallback to hostpool-epsilon-greedy.
 host-selection-policy = tokenaware,hostpool-epsilon-greedy
-# cassandra timeout in milliseconds
-timeout = 1000
+# cassandra timeout
+timeout = 1s
 # max number of concurrent reads to cassandra
 read-concurrency = 20
 # max number of concurrent writes to cassandra

docs/config.md

@@ -99,8 +99,8 @@ consistency = one
 # tokenaware,hostpool-simple         : prefer host that has the needed data, fallback to hostpool-simple.
 # tokenaware,hostpool-epsilon-greedy : prefer host that has the needed data, fallback to hostpool-epsilon-greedy.
 host-selection-policy = tokenaware,hostpool-epsilon-greedy
-# cassandra timeout in milliseconds
-timeout = 1000
+# cassandra timeout
+timeout = 1s
 # max number of concurrent reads to cassandra
 read-concurrency = 20
 # max number of concurrent writes to cassandra

docs/tools.md

@@ -298,8 +298,8 @@ Flags:
     	how many times to retry a query before failing it
   -cassandra-ssl
     	enable SSL connection to cassandra
-  -cassandra-timeout int
-    	cassandra timeout in milliseconds (default 1000)
+  -cassandra-timeout duration (default 1s)
+    	cassandra timeout
   -cassandra-username string
     	username for authentication (default "cassandra")
   -cql-protocol-version int
@@ -364,8 +364,8 @@ Flags:
     	File containing the needed schemas in case database needs initializing (default "/etc/metrictank/schema-store-cassandra.toml")
   -cassandra-ssl
     	enable SSL connection to cassandra
-  -cassandra-timeout int
-    	cassandra timeout in milliseconds (default 1000)
+  -cassandra-timeout duration (default 1s)
+    	cassandra timeout
   -cassandra-username string
     	username for authentication (default "cassandra")
   -config string
@@ -432,8 +432,8 @@ Flags:
     	how many times to retry a query before failing it
   -cassandra-ssl
     	enable SSL connection to cassandra
-  -cassandra-timeout int
-    	cassandra timeout in milliseconds (default 1000)
+  -cassandra-timeout duration (default 1s)
+    	cassandra timeout
   -cassandra-username string
     	username for authentication (default "cassandra")
   -cql-protocol-version int
@@ -544,8 +544,8 @@ global config flags:
     	File containing the needed schemas in case database needs initializing (default "/etc/metrictank/schema-store-cassandra.toml")
   -cassandra-ssl
     	enable SSL connection to cassandra
-  -cassandra-timeout int
-    	cassandra timeout in milliseconds (default 1000)
+  -cassandra-timeout duration (default 1s)
+    	cassandra timeout
   -cassandra-username string
     	username for authentication (default "cassandra")
   -cassandra-window-factor int

metrictank-sample.ini

@@ -73,8 +73,8 @@ consistency = one
 # tokenaware,hostpool-simple         : prefer host that has the needed data, fallback to hostpool-simple.
 # tokenaware,hostpool-epsilon-greedy : prefer host that has the needed data, fallback to hostpool-epsilon-greedy.
 host-selection-policy = tokenaware,hostpool-epsilon-greedy
-# cassandra timeout in milliseconds
-timeout = 1000
+# cassandra timeout
+timeout = 1s
 # max number of concurrent reads to cassandra
 read-concurrency = 20
 # max number of concurrent writes to cassandra

scripts/config/metrictank-docker.ini

@@ -70,8 +70,8 @@ consistency = one
 # tokenaware,hostpool-simple         : prefer host that has the needed data, fallback to hostpool-simple.
 # tokenaware,hostpool-epsilon-greedy : prefer host that has the needed data, fallback to hostpool-epsilon-greedy.
 host-selection-policy = tokenaware,hostpool-epsilon-greedy
-# cassandra timeout in milliseconds
-timeout = 10000
+# cassandra timeout
+timeout = 10s
 # max number of concurrent reads to cassandra
 read-concurrency = 20
 # max number of concurrent writes to cassandra

scripts/config/metrictank-package.ini

@@ -70,8 +70,8 @@ consistency = one
 # tokenaware,hostpool-simple         : prefer host that has the needed data, fallback to hostpool-simple.
 # tokenaware,hostpool-epsilon-greedy : prefer host that has the needed data, fallback to hostpool-epsilon-greedy.
 host-selection-policy = tokenaware,hostpool-epsilon-greedy
-# cassandra timeout in milliseconds
-timeout = 1000
+# cassandra timeout
+timeout = 1s
 # max number of concurrent reads to cassandra
 read-concurrency = 20
 # max number of concurrent writes to cassandra

store/cassandra/cassandra.go

@@ -127,7 +127,7 @@ func NewCassandraStore(config *StoreConfig, ttls []uint32) (*CassandraStore, err
 		}
 	}
 	cluster.Consistency = gocql.ParseConsistency(config.Consistency)
-	cluster.Timeout = time.Duration(config.Timeout) * time.Millisecond
+	cluster.Timeout = config.Timeout
 	cluster.ConnectTimeout = cluster.Timeout
 	cluster.NumConns = config.WriteConcurrency
 	cluster.ProtoVersion = config.CqlProtocolVersion

store/cassandra/config.go

@@ -2,6 +2,7 @@ package cassandra
 
 import (
 	"flag"
+	"time"
 
 	"github.com/rakyll/globalconf"
 )
@@ -11,7 +12,7 @@ type StoreConfig struct {
 	Keyspace                 string
 	Consistency              string
 	HostSelectionPolicy      string
-	Timeout                  int
+	Timeout                  time.Duration
 	ReadConcurrency          int
 	WriteConcurrency         int
 	ReadQueueSize            int
@@ -38,7 +39,7 @@ func NewStoreConfig() *StoreConfig {
 		Keyspace:                 "metrictank",
 		Consistency:              "one",
 		HostSelectionPolicy:      "tokenaware,hostpool-epsilon-greedy",
-		Timeout:                  1000,
+		Timeout:                  time.Second,
 		ReadConcurrency:          20,
 		WriteConcurrency:         10,
 		ReadQueueSize:            200000,
@@ -67,7 +68,7 @@ func ConfigSetup() *flag.FlagSet {
 	cas.StringVar(&CliConfig.Keyspace, "keyspace", CliConfig.Keyspace, "cassandra keyspace to use for storing the metric data table")
 	cas.StringVar(&CliConfig.Consistency, "consistency", CliConfig.Consistency, "write consistency (any|one|two|three|quorum|all|local_quorum|each_quorum|local_one")
 	cas.StringVar(&CliConfig.HostSelectionPolicy, "host-selection-policy", CliConfig.HostSelectionPolicy, "")
-	cas.IntVar(&CliConfig.Timeout, "timeout", CliConfig.Timeout, "cassandra timeout in milliseconds")
+	cas.DurationVar(&CliConfig.Timeout, "timeout", CliConfig.Timeout, "cassandra timeout")
 	cas.IntVar(&CliConfig.ReadConcurrency, "read-concurrency", CliConfig.ReadConcurrency, "max number of concurrent reads to cassandra.")
 	cas.IntVar(&CliConfig.WriteConcurrency, "write-concurrency", CliConfig.WriteConcurrency, "max number of concurrent writes to cassandra.")
 	cas.IntVar(&CliConfig.ReadQueueSize, "read-queue-size", CliConfig.ReadQueueSize, "max number of outstanding reads before reads will be dropped. This is important if you run queries that result in many reads in parallel.")