Enforce use of timeouts for MongoDB connections #2724

Merged
merged 2 commits into from Jul 8, 2015

Conversation

Projects
None yet
2 participants
Contributor

mjs commented Jul 6, 2015

mongo: use SocketTimeout if not specified in dial options

It doesn't make sense to not set a socket timeout.

Also fixed the incorrect comment for DialOpts.SocketTimeout.


Require that all Juju's connections to MongoDB use a timeout

A possible (but unlikely) fix to LP #1469199 but good to fix anyway. Without this mongo dial attempts could block forever if mongod wasn't there.

(Review request: http://reviews.vapour.ws/r/2102/)

mongo: use SocketTimeout if not specified in dial options
It doesn't make sense to not set a socket timeout.

Also fixed the incorrect comment for DialOpts.SocketTimeout.
Contributor

mjs commented Jul 6, 2015

$$merge$$

Contributor

jujubot commented Jul 6, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

Contributor

jujubot commented Jul 6, 2015

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/3905

Contributor

mjs commented Jul 8, 2015

$$merge$$

Contributor

jujubot commented Jul 8, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

Contributor

jujubot commented Jul 8, 2015

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/3909

Require that all Juju's connections to MongoDB use a timeout
A possible (but unlikely) fix to LP #1469199 but good to fix
anyway. Without this mongo dial attempts could block forever if mongod
wasn't there.
Contributor

mjs commented Jul 8, 2015

$$merge$$

Contributor

jujubot commented Jul 8, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request Jul 8, 2015

Merge pull request #2724 from mjs/mongo-timeouts-1.24
Enforce use of timeouts for MongoDB connections

mongo: use SocketTimeout if not specified in dial options

It doesn't make sense to not set a socket timeout.

Also fixed the incorrect comment for DialOpts.SocketTimeout.

---

Require that all Juju's connections to MongoDB use a timeout

A possible (but unlikely) fix to LP #1469199 but good to fix anyway. Without this mongo dial attempts could block forever if mongod wasn't there.

(Review request: http://reviews.vapour.ws/r/2102/)

@jujubot jujubot merged commit c928983 into juju:1.24 Jul 8, 2015

@mjs mjs deleted the mjs:mongo-timeouts-1.24 branch Jul 8, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment