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] split base settings in ClusterDiscoveryConfiguration between node and transport client #8653

Merged

Conversation

javanna
Copy link
Member

@javanna javanna commented Nov 25, 2014

The default settings that are currently applied to the transport client are about discovery and gateway, modules that are not even loaded on the transport client. We can now remove the local gateway as it's the default one anyway. Also, let's make sure that the discovery setting is only applied to the node, as it is not relevant for transport client.

@javanna javanna added >test Issues or PRs that are addressing/adding tests review v1.5.0 v2.0.0-beta1 labels Nov 25, 2014
@@ -33,14 +33,9 @@

public class ClusterDiscoveryConfiguration extends SettingsSource {

public static Settings DEFAULT_SETTINGS = ImmutableSettings.settingsBuilder()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally like the fact that those settings were extracted from the code. The name (default) also indicate that these are defaults can be overridden. Don't feel strongly about it though - up to you whether to keep as is.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, I can put the discovery one back as constant but the name default is too generic cause they should get applied only to nodes and not used as base settings for transport client too.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DEFAULT_NODE_SETTINGS?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea :)

@bleskes
Copy link
Contributor

bleskes commented Nov 26, 2014

LGTM. Left two minor comments.

@bleskes bleskes removed the review label Nov 26, 2014
@javanna
Copy link
Member Author

javanna commented Nov 26, 2014

Updated @bleskes thanks for the review

@javanna javanna added the review label Nov 26, 2014
@bleskes
Copy link
Contributor

bleskes commented Nov 26, 2014

LGTM

@javanna javanna removed the review label Nov 26, 2014
…ode and transport client

The default settings that are currently applied to the transport client are about discovery and gateway, modules that are not even loaded on the transport client. We can now remove the local gateway as it's not the default one anyway. Also, make sure that the discovery setting is only applied to the node, as it is not relevant for transport client.

Closes elastic#8653
@javanna javanna force-pushed the test/discovery_conf_default_settings branch from 57a700f to c2f1175 Compare November 27, 2014 07:00
javanna added a commit to javanna/elasticsearch that referenced this pull request Nov 27, 2014
…ode and transport client

The default settings that are currently applied to the transport client are about discovery and gateway, modules that are not even loaded on the transport client. We can now remove the local gateway as it's not the default one anyway. Also, make sure that the discovery setting is only applied to the node, as it is not relevant for transport client.

Closes elastic#8653
@javanna javanna merged commit c2f1175 into elastic:master Nov 27, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>test Issues or PRs that are addressing/adding tests v1.5.0 v2.0.0-beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants