diff options
| author | Chris Lu <chris.lu@gmail.com> | 2017-01-10 01:30:00 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2017-01-10 01:30:00 -0800 |
| commit | e767c3ea4fd04a9cb01ec6698b4582663bd98bb6 (patch) | |
| tree | bf92ed8bc20941bea0f0fef051b40844f86f82c3 /weed/util/net_timeout.go | |
| parent | e46c3415f752e2e0c252c420adb882c4bcb7416b (diff) | |
| download | seaweedfs-e767c3ea4fd04a9cb01ec6698b4582663bd98bb6.tar.xz seaweedfs-e767c3ea4fd04a9cb01ec6698b4582663bd98bb6.zip | |
disable master connection timeout
temporarily disable master connection timeout due to heartbeat
connection timeout
Diffstat (limited to 'weed/util/net_timeout.go')
| -rw-r--r-- | weed/util/net_timeout.go | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/weed/util/net_timeout.go b/weed/util/net_timeout.go index f46776992..8acd50d42 100644 --- a/weed/util/net_timeout.go +++ b/weed/util/net_timeout.go @@ -38,9 +38,11 @@ type Conn struct { } func (c *Conn) Read(b []byte) (count int, e error) { - err := c.Conn.SetReadDeadline(time.Now().Add(c.ReadTimeout)) - if err != nil { - return 0, err + if c.ReadTimeout != 0 { + err := c.Conn.SetReadDeadline(time.Now().Add(c.ReadTimeout)) + if err != nil { + return 0, err + } } count, e = c.Conn.Read(b) if e == nil { @@ -50,9 +52,11 @@ func (c *Conn) Read(b []byte) (count int, e error) { } func (c *Conn) Write(b []byte) (count int, e error) { - err := c.Conn.SetWriteDeadline(time.Now().Add(c.WriteTimeout)) - if err != nil { - return 0, err + if c.WriteTimeout != 0 { + err := c.Conn.SetWriteDeadline(time.Now().Add(c.WriteTimeout)) + if err != nil { + return 0, err + } } count, e = c.Conn.Write(b) if e == nil { |