Skip to content
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

Test: Fix circuit breaker tests for remote clusters and bwc #7062

Merged
merged 1 commit into from Jul 28, 2014

Conversation

Projects
None yet
3 participants
@dakrone
Copy link
Member

dakrone commented Jul 28, 2014

Adds additional version checks in NodeStats for older versions

When using an external cluster (backwards compatibility tests), the act
of checking the request breaker requires a network buffer, which
increments the breaker. This change only checks the request breaker in
InternalTestCluster and uses Guice to retrieve it instead of
a (possible) network request. The fielddata breaker is still checked
every time.

Also removed the now unused InternalCircuitBreakerService class

@s1monw

This comment has been minimized.

Copy link
Contributor

s1monw commented Jul 28, 2014

LGTM

@s1monw

View changes

src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java Outdated
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
out.writeOptionalStreamable(breaker);
} else if (breaker == null) {
out.writeBoolean(false);

This comment has been minimized.

Copy link
@s1monw

s1monw Jul 28, 2014

Contributor

can we maybe just pass null to out.writeOptionalStreamable and leave the impl details to that method

[TESTS] fix circuit breaker tests for remote clusters and bwc
Adds additional version checks in NodeStats for older versions

When using an external cluster (backwards compatibility tests), the act
of checking the request breaker requires a network buffer, which
increments the breaker. This change only checks the request breaker in
InternalTestCluster and uses Guice to retrieve it instead of
a (possible) network request.

Also removed the now unused InternalCircuitBreakerService class

@dakrone dakrone merged commit a93ee59 into elastic:master Jul 28, 2014

@dakrone dakrone added v1.4.0 labels Jul 28, 2014

@clintongormley clintongormley changed the title [TESTS] fix circuit breaker tests for remote clusters and bwc Test: Fix circuit breaker tests for remote clusters and bwc Sep 8, 2014

@clintongormley clintongormley added the >test label Sep 8, 2014

@dakrone dakrone deleted the dakrone:fix-breaker-tests branch Sep 9, 2014

@clintongormley clintongormley added the >bug label Sep 11, 2014

@clintongormley clintongormley removed the >bug label Jun 7, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.