Skip to content

Move client.conn.pCaller init in newConn #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2018
Merged

Move client.conn.pCaller init in newConn #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions client/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@ func newConn(cfg *Config) (c *conn, err error) {
queries: make([]wt.Query, 0),
}

var peers *proto.Peers
// get peers from BP
if _, err = cacheGetPeers(c.dbID, c.privKey); err != nil {
if peers, err = cacheGetPeers(c.dbID, c.privKey); err != nil {
log.WithError(err).Error("cacheGetPeers failed")
c = nil
return
}
c.pCaller = rpc.NewPersistentCaller(peers.Leader)

err = c.startAckWorkers(2)
if err != nil {
Expand Down Expand Up @@ -346,7 +348,6 @@ func (c *conn) sendQuery(queryType wt.QueryType, queries []wt.Query) (affectedRo
return
}

c.pCaller = rpc.NewPersistentCaller(peers.Leader)
var response wt.Response
if err = c.pCaller.Call(route.DBSQuery.String(), req, &response); err != nil {
return
Expand Down