Skip to content

try to fix socket i/o error for session #506

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

Open
zensh wants to merge 2 commits into
base: v2
Choose a base branch
from
Open

try to fix socket i/o error for session #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9f7927
try to fix socket error for session
zensh Oct 17, 2017
34e64c8
Merge branch 'issue/fix-socket-error'
zensh Oct 26, 2017
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
12 changes: 10 additions & 2 deletions session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4408,13 +4408,13 @@ func (s *Session) acquireSocket(slaveOk bool) (*mongoSocket, error) {
s.m.RLock()
// If there is a slave socket reserved and its use is acceptable, take it as long
// as there isn't a master socket which would be preferred by the read preference mode.
if s.slaveSocket != nil && s.slaveOk && slaveOk && (s.masterSocket == nil || s.consistency != PrimaryPreferred && s.consistency != Monotonic) {
if s.slaveSocket != nil && s.slaveSocket.dead == nil && s.slaveOk && slaveOk && (s.masterSocket == nil || s.consistency != PrimaryPreferred && s.consistency != Monotonic) {
socket := s.slaveSocket
socket.Acquire()
s.m.RUnlock()
return socket, nil
}
if s.masterSocket != nil {
if s.masterSocket != nil && s.masterSocket.dead == nil {
socket := s.masterSocket
socket.Acquire()
s.m.RUnlock()
Expand All @@ -4427,6 +4427,14 @@ func (s *Session) acquireSocket(slaveOk bool) (*mongoSocket, error) {
s.m.Lock()
defer s.m.Unlock()

// if socket was killed
if s.masterSocket != nil && s.masterSocket.dead != nil {
s.masterSocket = nil
}
if s.slaveSocket != nil && s.slaveSocket.dead != nil {
s.slaveSocket = nil
}

if s.slaveSocket != nil && s.slaveOk && slaveOk && (s.masterSocket == nil || s.consistency != PrimaryPreferred && s.consistency != Monotonic) {
s.slaveSocket.Acquire()
return s.slaveSocket, nil
Expand Down
5 changes: 5 additions & 0 deletions socket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,11 @@ func (socket *mongoSocket) Query(ops ...interface{}) (err error) {

socket.updateDeadline(writeDeadline)
_, err = socket.conn.Write(buf)
if err != nil {
socket.Unlock()
socket.kill(err, true)
return
}
if !wasWaiting && requestCount > 0 {
socket.updateDeadline(readDeadline)
}
Expand Down