-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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
Re-create connection manager on "zuul.host.*" property change #3407
Conversation
@@ -137,6 +138,9 @@ public void onPropertyChange(EnvironmentChangeEvent event) { | |||
catch (IOException ex) { | |||
log.error("error closing client", ex); | |||
} | |||
// Re-create connection manager (may be shut down on HTTP client close) | |||
SimpleHostRoutingFilter.this.connectionManager.shutdown(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should move in the above try catch or in its own.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
connectionManager.shutdown()
doesn't throw IOException
, but httpClient.close()
does.
Is there need to catch RuntimeException
for connectionManager.shutdown()
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you're correct.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wrapped it in e4f3f60
Codecov Report
@@ Coverage Diff @@
## master #3407 +/- ##
============================================
+ Coverage 65.42% 65.42% +<.01%
- Complexity 1516 1517 +1
============================================
Files 189 189
Lines 7247 7249 +2
Branches 863 862 -1
============================================
+ Hits 4741 4743 +2
+ Misses 2189 2188 -1
- Partials 317 318 +1
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #3407 +/- ##
============================================
+ Coverage 65.42% 65.47% +0.05%
- Complexity 1516 1518 +2
============================================
Files 189 189
Lines 7247 7252 +5
Branches 863 862 -1
============================================
+ Hits 4741 4748 +7
+ Misses 2189 2187 -2
Partials 317 317
Continue to review full report at Codecov.
|
@ryanjbaxter Is there any plans to backport this PR to |
@denysivano sorry about that I applied it to the 2.1.x branch it will be in Greenwich.SR4 |
* Added symbolic link of index.adoc * Added symbolic link of index.adoc * set replication client filters in RefreshablePeerEurekaNodes (spring-cloud#3610) fixes spring-cloudgh-3554 * Update SNAPSHOT to 2.2.0.M2 * Going back to snapshots * Adding spring cloud circuitbreaker hystrix implementation * Separated circuitbreaker auto config to its own file * Initialize remoteRegionAppWhitelist with default value (spring-cloud#3634) * Moves non-netflix dependencies out of bom into root pom. fixes spring-cloudgh-3639 * Removes dependency management for okhttp3 * Moves okhttp3 dep mgmt back to bom * Re-create connection manager on "zuul.host.*" property change (spring-cloud#3407) * Re-create connection manager on "zuul.host.*" property change Fixes spring-cloud#3406 * Wrap connectionManager.shutdown() in try/catch block. Polishing * Removes okhttp3 again after added back in older branch. * Updating readme with note about building spring-cloud-netflix-hystrix-contract. Fixes spring-cloud#3497 * Fromatting * Upgrades eureka to 1.9.13 and excludes compactmap. fixes spring-cloudgh-3636 * Update SNAPSHOT to 2.1.3.RELEASE * Going back to snapshots * Bumping versions to 2.1.4.BUILD-SNAPSHOT after release * Add Spring Cloud LoadBalancer starter to Eureka starters. Fixes spring-cloudgh-3646. (spring-cloud#3647) * Update docs. (spring-cloud#3650) * ConditionalOnMissingBean on formBodyWrapperFilter, debugFilter… (spring-cloud#3609) * Bumping versions * Remove spring.provides. * removes useless comments * Fix RestTemplateEurekaHttpClient status update endpoint. Fixes spring-cloud#3571 (spring-cloud#3657) * polish * Updates health check handler to use new StatusAggregator * Gh 3409 turbine stream test (spring-cloud#3665) * Add stream-test-support. * Fix condition. * Remove outdated workaround. * Bumping versions * Optimize code of eureka (spring-cloud#3660) * Optimize code of eureka * Merge newest code * fix checkstyle bug * Gh 3464 upgrade scc new (spring-cloud#3667) * Upgrade Spring Cloud Contract version to 2.1.3.RELEASE. * Gh 3409 turbine stream test (spring-cloud#3665) * Add stream-test-support. * Fix condition. * Remove outdated workaround. (cherry picked from commit 24f5e0b) * Updates to use "components" rather than "details" See spring-projects/spring-boot#17929 * Applying spring-cloud#3407 to the 2.1.x branch * Added support for reactive service discovery * Update SNAPSHOT to 2.2.0.M3 * Going back to snapshots * Update SNAPSHOT to 2.2.0.RC1 * Going back to snapshots * removing resource class from circle config * Add property to disable spring cloud circuit breaker for hystrix * Fix command key configuration. Use id as command key and class as group key. * Adding configuration metadata for spring cloud circuitbreaker * Bumping versions * Fix some dependencies that show up in the wrong scope Apparently you can build on the command line but Eclipse is fussy now and wouldn't compile these projects without explicit dependencies. * Also add build helper config for contract tests * Added maven flatten plugin * Bumping versions * Update SNAPSHOT to 2.2.0.RC2 * Going back to snapshots * Update configuration to use proxyBeanMethods=false. Fixes spring-cloud#3677 * Create security.md * Update issue templates * Bumping versions * Bumping versions * Update SNAPSHOT to 2.2.0.RELEASE * Going back to snapshots * Bumping versions to 2.2.1.BUILD-SNAPSHOT after release * Bumping versions * Fix typo: clas -> class (spring-cloud#3710) * removes .flattened-pom.xml * ignores .flattened-pom.xml * Gh 3718 add zoned loadbalancer instrumentation (spring-cloud#3720) * Add instrumentation for zoned LoadBalancer. * Add documentation. * Fix after review. * Fix after review. * Update SNAPSHOT to 2.2.1.RELEASE * Going back to snapshots * Bumping versions to 2.2.2.BUILD-SNAPSHOT after release Co-authored-by: Marcin Grzejszczak <marcin@grzejszczak.pl> Co-authored-by: Yuxin Bai <LittleBaiBai@users.noreply.github.com> Co-authored-by: Spencer Gibb <spencer@gibb.tech> Co-authored-by: Spring Buildmaster <buildmaster@springframework.org> Co-authored-by: Ryan Baxter <rbaxter@pivotal.io> Co-authored-by: emilnkrastev <emilnkrastev@gmail.com> Co-authored-by: Denys Ivano <denys.ivano@gmail.com> Co-authored-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com> Co-authored-by: Rafał Żukowski <rzukow@gmail.com> Co-authored-by: OLPMO <OLPMO@users.noreply.github.com> Co-authored-by: Tim Ysewyn <Tim.Ysewyn@me.com> Co-authored-by: Dave Syer <david_syer@hotmail.com> Co-authored-by: Deepika Mohan <deepikadevidm@gmail.com>
When changing
zuul.host.*
properties, it makes a sense to re-createHttpClientConnectionManager
along withHttpClient
to makemaxTotalConnections
andmaxConnectionsPerRoute
properties dynamically configurable.It also prevents the use of shut down connection pool (fixes gh-3406).