Merge pull request #318 from graphite-ng/tcp-timeouts

TCP input timeouts

cfg/cfg.go

@@ -1,12 +1,17 @@
 package cfg
 
 import (
+	"time"
+
 	"github.com/graphite-ng/carbon-relay-ng/validate"
+	m20 "github.com/metrics20/go-metrics20/carbon20"
 )
 
 type Config struct {
 	Listen_addr             string
+	Plain_read_timeout      Duration
 	Pickle_addr             string
+	Pickle_read_timeout     Duration
 	Admin_addr              string
 	Http_addr               string
 	Spool_dir               string
@@ -28,6 +33,29 @@ type Config struct {
 	Rewriter                []Rewriter
 }
 
+func NewConfig() Config {
+	return Config{
+		Plain_read_timeout: Duration{
+			2 * time.Minute,
+		},
+		Pickle_read_timeout: Duration{
+			2 * time.Minute,
+		},
+		Validation_level_legacy: validate.LevelLegacy{m20.MediumLegacy},
+		Validation_level_m20:    validate.LevelM20{m20.MediumM20},
+	}
+}
+
+type Duration struct {
+	time.Duration
+}
+
+func (d *Duration) UnmarshalText(text []byte) error {
+	var err error
+	d.Duration, err = time.ParseDuration(string(text))
+	return err
+}
+
 type Aggregation struct {
 	Function string
 	Regex    string

cmd/carbon-relay-ng/carbon-relay-ng.go

@@ -26,7 +26,6 @@ import (
 	tbl "github.com/graphite-ng/carbon-relay-ng/table"
 	"github.com/graphite-ng/carbon-relay-ng/ui/telnet"
 	"github.com/graphite-ng/carbon-relay-ng/ui/web"
-	m20 "github.com/metrics20/go-metrics20/carbon20"
 	log "github.com/sirupsen/logrus"
 
 	"strconv"
@@ -36,7 +35,7 @@ import (
 
 var (
 	config_file      string
-	config           cfg.Config
+	config           = cfg.NewConfig()
 	to_dispatch      = make(chan []byte)
 	inputs           []input.Plugin
 	shutdownTimeout  = time.Second * 30 // how long to wait for shutdown
@@ -63,10 +62,6 @@ func main() {
 	runtime.SetBlockProfileRate(*blockProfileRate)
 	runtime.MemProfileRate = *memProfileRate
 
-	// validation defaults
-	config.Validation_level_legacy.Level = m20.MediumLegacy
-	config.Validation_level_m20.Level = m20.MediumM20
-
 	config_file = "/etc/carbon-relay-ng.ini"
 	if 1 == flag.NArg() {
 		val := flag.Arg(0)
@@ -168,11 +163,11 @@ func main() {
 	}
 
 	if config.Listen_addr != "" {
-		inputs = append(inputs, input.NewPlain(config.Listen_addr, table))
+		inputs = append(inputs, input.NewPlain(config.Listen_addr, config.Plain_read_timeout.Duration, table))
 	}
 
 	if config.Pickle_addr != "" {
-		inputs = append(inputs, input.NewPickle(config.Pickle_addr, table))
+		inputs = append(inputs, input.NewPickle(config.Pickle_addr, config.Pickle_read_timeout.Duration, table))
 	}
 
 	if config.Amqp.Amqp_enabled == true {

docs/logging.md

@@ -1,8 +1,8 @@
 # log level description
 
 * trace: for tracing messages from start to finish, including unroutable/discards [1]
-* debug: state changes that we only need to know when debugging [1]
-* info:  harmless, but interesting not-so-common events. e.g. connection changes, manually triggered flushes, etc. (this used to be `notice`)
+* debug: state changes that we only need to know when debugging, client conns opening and closing [1]
+* info:  harmless, but interesting not-so-common events. e.g. outbound connection changes, manually triggered flushes, etc. (this used to be `notice`)
 * warn:  minor issues (network timeouts etc)
 * error: recoverable errors
 * fatal: errors and problems that result in shutdown

examples/carbon-relay-ng.ini

@@ -50,9 +50,13 @@ blacklist = [
 
 ### plaintext Carbon ###
 listen_addr = "0.0.0.0:2003"
+# close inbound plaintext connections if they've been idle for this long ("0s" to disable)
+plain_read_timeout = "2m"
 
 ### Pickle Carbon ###
 pickle_addr = "0.0.0.0:2013"
+# close inbound pickle connections if they've been idle for this long ("0s" to disable)
+pickle_read_timeout = "2m"
 
 ### AMQP ###
 [amqp]