(SERVER-408) backport jruby borrow timeouts #443
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add :borrow-timeout configuration option, which allows the user to configure the timeout when borrowing instances from the JRuby pool and defaults to 60000 milliseconds. Change all calls to the borrow-from-pool function to calls to borrow-from-pool-with-timeout. Conflicts: test/unit/puppetlabs/services/config/puppet_server_config_service_test.clj
Improve the error handling in the `with-jruby-puppet` macro when borrowing an instance from the pool times out.
This commit simply increases the timeout to 1200000 ms (20 minutes).
| @@ -18,12 +18,17 @@ | |||
| [puppet-server-config-service jruby-puppet-pooled-service jetty9-service | |||
| profiler/puppet-profiler-service]) | |||
|
|
|||
| (def required-config | |||
There was a problem hiding this comment.
Two required-configs now...this one looks like the one to delete
There was a problem hiding this comment.
Man that's the second time I've caused that same problem in the last 3 days. :) nice catch.
|
Added a commit to fix the duplicate |
|
👍 assuming Travis passes. |
|
👍 |
nwolfe
added a commit
that referenced
this pull request
Mar 13, 2015
…rt-jruby-borrow-timeouts (SERVER-408) backport jruby borrow timeouts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR cherry-picks the following three commits from master:
f72c912
14c498e
8ef2383
This should effectively back-port the jruby borrow timeout work to the stable branch.