TCP server connection idle timeout

Implement a idle TCP connection timeout for plain and pickle inputs. Issue: grafana#250
guillaumeautran · May 2, 2018 · d5b8eed · d5b8eed
1 parent b876e54
commit d5b8eed
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 25 deletions.
diff --git a/cfg/cfg.go b/cfg/cfg.go
@@ -5,27 +5,30 @@ import (
 )
 
 type Config struct {
-	Listen_addr             string
-	Pickle_addr             string
-	Admin_addr              string
-	Http_addr               string
-	Spool_dir               string
-	Amqp                    Amqp
-	Max_procs               int
-	First_only              bool
-	Init                    Init
-	Instance                string
-	Log_level               string
-	Instrumentation         instrumentation
-	Bad_metrics_max_age     string
-	Pid_file                string
-	Validation_level_legacy validate.LevelLegacy
-	Validation_level_m20    validate.LevelM20
-	Validate_order          bool
-	BlackList               []string
-	Aggregation             []Aggregation
-	Route                   []Route
-	Rewriter                []Rewriter
+	// Plaintext
+	Listen_addr              string
+	Plaintext_socket_timeout int64
+	Pickle_addr              string
+	Pickle_socket_timeout    int64
+	Admin_addr               string
+	Http_addr                string
+	Spool_dir                string
+	Amqp                     Amqp
+	Max_procs                int
+	First_only               bool
+	Init                     Init
+	Instance                 string
+	Log_level                string
+	Instrumentation          instrumentation
+	Bad_metrics_max_age      string
+	Pid_file                 string
+	Validation_level_legacy  validate.LevelLegacy
+	Validation_level_m20     validate.LevelM20
+	Validate_order           bool
+	BlackList                []string
+	Aggregation              []Aggregation
+	Route                    []Route
+	Rewriter                 []Rewriter
 }
 
 type Aggregation struct {

diff --git a/examples/carbon-relay-ng.ini b/examples/carbon-relay-ng.ini
@@ -50,9 +50,11 @@ blacklist = [
 
 ### plaintext Carbon ###
 listen_addr = "0.0.0.0:2003"
+plaintext_socket_timeout = 3600
 
 ### Pickle Carbon ###
 pickle_addr = "0.0.0.0:2013"
+pickle_socket_timeout = 3600
 
 ### AMQP ###
 [amqp]

diff --git a/input/pickle.go b/input/pickle.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"math/big"
 	"net"
+	"time"
 
 	"github.com/graphite-ng/carbon-relay-ng/badmetrics"
 	"github.com/graphite-ng/carbon-relay-ng/cfg"
@@ -33,11 +34,16 @@ func NewPickle(config cfg.Config, addr string, tbl *table.Table, bad *badmetrics
 
 func (p *Pickle) Handle(c net.Conn) {
 	defer c.Close()
-	// TODO c.SetTimeout(60e9)
+	idle_timeout := time.Duration(p.config.Pickle_socket_timeout) * time.Second
 	r := bufio.NewReaderSize(c, 4096)
 	log.Debug("pickle.go: entering ReadLoop...")
 ReadLoop:
 	for {
+		if idle_timeout > 0 && c.RemoteAddr() != nil {
+			if err := c.SetReadDeadline(time.Now().Add(idle_timeout)); err != nil {
+				log.Error(err.Error())
+			}
+		}
 
 		// Note that everything in this loop should proceed as fast as it can
 		// so we're not blocked and can keep processing
@@ -48,7 +54,9 @@ ReadLoop:
 		var length uint32
 		err := binary.Read(r, binary.BigEndian, &length)
 		if err != nil {
-			if io.EOF != err {
+			if err, ok := err.(net.Error); ok && err.Timeout() {
+				log.Warning("Connection from %s is idle, closing.\n", c.RemoteAddr())
+			} else if io.EOF != err {
 				log.Error("couldn't read payload length: " + err.Error())
 			}
 			log.Debug("pickle.go: detected EOF while detecting payload length with binary.Read, nothing more to read, breaking")

diff --git a/input/plain.go b/input/plain.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"io"
 	"net"
+	"time"
 
 	"github.com/graphite-ng/carbon-relay-ng/badmetrics"
 	"github.com/graphite-ng/carbon-relay-ng/cfg"
@@ -30,9 +31,14 @@ func NewPlain(config cfg.Config, addr string, tbl *table.Table, badMetrics *badm
 
 func (p *Plain) Handle(c net.Conn) {
 	defer c.Close()
-	// TODO c.SetTimeout(60e9)
 	r := bufio.NewReaderSize(c, 4096)
+	idle_timeout := time.Duration(p.config.Plaintext_socket_timeout) * time.Second
 	for {
+		if idle_timeout > 0 && c.RemoteAddr() != nil {
+			if err := c.SetReadDeadline(time.Now().Add(idle_timeout)); err != nil {
+				log.Error(err.Error())
+			}
+		}
 
 		// Note that everything in this loop should proceed as fast as it can
 		// so we're not blocked and can keep processing
@@ -43,7 +49,9 @@ func (p *Plain) Handle(c net.Conn) {
 		buf, _, err := r.ReadLine()
 
 		if err != nil {
-			if io.EOF != err {
+			if err, ok := err.(net.Error); ok && err.Timeout() {
+				log.Warning("Connection from %v is idle, closing.\n", c.RemoteAddr())
+			} else if io.EOF != err {
 				log.Error(err.Error())
 			}
 			break