Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(peer_server): set client transporter separately

Browse Source 
It also moves the hack on timeout from raft transporter to
client transporter.
This commit is contained in:
Yicheng Qin
2014-05-07 12:18:32 -07:00
parent 001b1fcd46
commit c9ce14c857
2 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/peer_server.go
View File

@@ -80,9 +80,10 @@ type snapshotConf struct {
snapshotThr uint64
}
func NewPeerServer(psConfig PeerServerConfig, registry *Registry, store store.Store, mb *metrics.Bucket, followersStats *raftFollowersStats, serverStats *raftServerStats) *PeerServer {
func NewPeerServer(psConfig PeerServerConfig, client *Client, registry *Registry, store store.Store, mb *metrics.Bucket, followersStats *raftFollowersStats, serverStats *raftServerStats) *PeerServer {
s := &PeerServer{
Config: psConfig,
client: client,
clusterConfig: NewClusterConfig(),
registry: registry,
store: store,
@@ -247,11 +248,6 @@ func (s *PeerServer) Start(snapshot bool, discoverURL string, peers []string) er
}
}
// TODO(yichengq): client for HTTP API usage could use transport other
// than the raft one. The transport should have longer timeout because
// it doesn't have fault tolerance of raft protocol.
s.client = NewClient(s.raftServer.Transporter().(*transporter).transport)
s.raftServer.Init()
// Set NOCOW for data directory in btrfs