Merge pull request #26433 from ibuildthecloud/addtimeout

Add remote dialer backup timeout

go.mod

@@ -82,7 +82,7 @@ require (
 	github.com/rancher/machine v0.15.0-rancher25
 	github.com/rancher/norman v0.0.0-20200401184723-a6df1fcaebe0
 	github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a
-	github.com/rancher/remotedialer v0.2.5
+	github.com/rancher/remotedialer v0.2.6-0.20200401224317-04cc22157b83
 	github.com/rancher/rke v1.1.0
 	github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168
 	github.com/rancher/steve v0.0.0-20200401220414-61a905156cd1

go.sum

@@ -905,8 +905,8 @@ github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e h1:j6+HqCET/NLPBtew2m5
 github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e/go.mod h1:XbYHTPaXuw8ZY9bylhYKQh/nJxDaTKk3YhAxPl4Qy/k=
 github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a h1:6xqYlVz4uAXBa/AuNAG0bhMusIXVh74dc1bbYOAe+HY=
 github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a/go.mod h1:YW8wJ/coee2n9ed937uPBWQArBaVlxs+5wkkS9KiyDc=
-github.com/rancher/remotedialer v0.2.5 h1:rNMMcJp5fU7FZ3wGFKSmDrXrSt8MYo5na4CzXddIr2A=
-github.com/rancher/remotedialer v0.2.5/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk=
+github.com/rancher/remotedialer v0.2.6-0.20200401224317-04cc22157b83 h1:0+HVgp5uVy7BvBn1Ee3PrXG4GktYlD/mwCBBKH77RCw=
+github.com/rancher/remotedialer v0.2.6-0.20200401224317-04cc22157b83/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk=
 github.com/rancher/rke v1.1.0-rc11/go.mod h1:QIPsQbZTpCWWBEqkIstqWyTZjb1Yoodaay58pFYDbCE=
 github.com/rancher/rke v1.1.0 h1:A9FydBnODhdyIvSL3UbfE16WBLK/KmnUdrqQ2jBypq8=
 github.com/rancher/rke v1.1.0/go.mod h1:Fw4u45cKMFBTu81jAxN5wtZeMgS4862RxVixhRc5p3E=

vendor/github.com/rancher/remotedialer/connection.go

@@ -5,12 +5,29 @@ import (
 	"errors"
 	"io"
 	"net"
+	"os"
+	"strconv"
 	"sync"
 	"time"
 
 	"github.com/rancher/remotedialer/metrics"
 )
 
+var (
+	backupTimeout = 15 * time.Second
+)
+
+func init() {
+	t := os.Getenv("REMOTEDIALER_BACKUP_TIMEOUT_SECONDS")
+	if t != "" {
+		i, err := strconv.Atoi(t)
+		if err != nil {
+			panic("invalid number " + t + " for REMOTEDIALER_BACKUP_TIMEOUT_SECONDS")
+		}
+		backupTimeout = time.Duration(i) * time.Second
+	}
+}
+
 type connection struct {
 	sync.Mutex
 
@@ -191,7 +208,7 @@ func (c chanWriter) Write(buf []byte) (int, error) {
 		select {
 		case c.C <- buf:
 			return len(buf), nil
-		case <-time.After(15 * time.Second):
+		case <-time.After(backupTimeout):
 			return 0, errors.New("backed up reader")
 		}
 	}

vendor/modules.txt

@@ -410,7 +410,7 @@ github.com/rancher/norman/types/values
 github.com/rancher/norman/urlbuilder
 # github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a
 github.com/rancher/rdns-server/model
-# github.com/rancher/remotedialer v0.2.5
+# github.com/rancher/remotedialer v0.2.6-0.20200401224317-04cc22157b83
 github.com/rancher/remotedialer
 github.com/rancher/remotedialer/metrics
 # github.com/rancher/rke v1.1.0