Browse Source

chore(server/transporter): set RequestTimout reasonable

Yicheng Qin 11 years ago
parent
commit
68afedbd16
1 changed files with 1 additions and 3 deletions
  1. 1 3
      server/transporter.go

+ 1 - 3
server/transporter.go

@@ -20,7 +20,6 @@ const (
 
 
 // Transporter layer for communication between raft nodes
 // Transporter layer for communication between raft nodes
 type transporter struct {
 type transporter struct {
-	requestTimeout time.Duration
 	followersStats *raftFollowersStats
 	followersStats *raftFollowersStats
 	serverStats    *raftServerStats
 	serverStats    *raftServerStats
 	registry       *Registry
 	registry       *Registry
@@ -44,7 +43,7 @@ func NewTransporter(followersStats *raftFollowersStats, serverStats *raftServerS
 		// and would be available in Go1.3
 		// and would be available in Go1.3
 		// More: https://codereview.appspot.com/69280043/
 		// More: https://codereview.appspot.com/69280043/
 		ConnectTimeout:   dialTimeout,
 		ConnectTimeout:   dialTimeout,
-		RequestTimeout:   dialTimeout + responseHeaderTimeout,
+		RequestTimeout:   requestTimeout,
 		ReadWriteTimeout: responseHeaderTimeout,
 		ReadWriteTimeout: responseHeaderTimeout,
 	}
 	}
 
 
@@ -65,7 +64,6 @@ func NewTransporter(followersStats *raftFollowersStats, serverStats *raftServerS
 		transport:         tr,
 		transport:         tr,
 		snapshotClient:    &http.Client{Transport: sTr},
 		snapshotClient:    &http.Client{Transport: sTr},
 		snapshotTransport: sTr,
 		snapshotTransport: sTr,
-		requestTimeout:    requestTimeout,
 		followersStats:    followersStats,
 		followersStats:    followersStats,
 		serverStats:       serverStats,
 		serverStats:       serverStats,
 		registry:          registry,
 		registry:          registry,