Merge pull request sorintlab#357 from sgotti/proxy_tcpkeepalive

proxy: enable tcp keepalive and add options for tuning.

cmd/proxy/proxy.go

@@ -56,6 +56,10 @@ type config struct {
 	stopListening      bool
 	logLevel           string
 	debug              bool
+
+	keepAliveIdle     int
+	keepAliveCount    int
+	keepAliveInterval int
 }
 
 var cfg config
@@ -73,6 +77,9 @@ func init() {
 	cmdProxy.PersistentFlags().BoolVar(&cfg.stopListening, "stop-listening", true, "stop listening on store error")
 	cmdProxy.PersistentFlags().StringVar(&cfg.logLevel, "log-level", "info", "debug, info (default), warn or error")
 	cmdProxy.PersistentFlags().BoolVar(&cfg.debug, "debug", false, "enable debug logging")
+	cmdProxy.PersistentFlags().IntVar(&cfg.keepAliveIdle, "tcp-keepalive-idle", 0, "set tcp keepalive idle (seconds)")
+	cmdProxy.PersistentFlags().IntVar(&cfg.keepAliveCount, "tcp-keepalive-count", 0, "set tcp keepalive probe count number")
+	cmdProxy.PersistentFlags().IntVar(&cfg.keepAliveInterval, "tcp-keepalive-interval", 0, "set tcp keepalive interval (seconds)")
 
 	cmdProxy.PersistentFlags().MarkDeprecated("debug", "use --log-level=debug instead")
 }
@@ -155,6 +162,11 @@ func (c *ClusterChecker) startPollonProxy() error {
 	if err != nil {
 		return fmt.Errorf("error creating pollon proxy: %v", err)
 	}
+	pp.SetKeepAlive(true)
+	pp.SetKeepAliveIdle(time.Duration(cfg.keepAliveIdle) * time.Second)
+	pp.SetKeepAliveCount(cfg.keepAliveCount)
+	pp.SetKeepAliveInterval(time.Duration(cfg.keepAliveInterval) * time.Second)
+
 	c.pp = pp
 	c.listener = listener
 
@@ -366,6 +378,15 @@ func proxy(cmd *cobra.Command, args []string) {
 	if cfg.storeBackend == "" {
 		die("store backend type required")
 	}
+	if cfg.keepAliveIdle < 0 {
+		die("tcp keepalive idle value must be greater or equal to 0")
+	}
+	if cfg.keepAliveCount < 0 {
+		die("tcp keepalive idle value must be greater or equal to 0")
+	}
+	if cfg.keepAliveInterval < 0 {
+		die("tcp keepalive idle value must be greater or equal to 0")
+	}
 
 	uid := common.UID()
 	log.Infow("proxy uid", "uid", uid)

glide.yaml

@@ -23,7 +23,7 @@ import:
 - package: github.com/sgotti/gexpect
   version: 0afc6c19f50a08b5f97f8c75f4b417f496d92377
 - package: github.com/sorintlab/pollon
-  version: 279eb94a1432a0656f6da72d36f133dc68c2e064
+  version: 1213dda9f770439e1f0dc2dc30635de368d55619
 - package: github.com/spf13/cobra
   version: 9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744
 - package: github.com/spf13/pflag