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] create client nodes using node.client: true #7911

Closed
wants to merge 1 commit into from

Conversation

javanna
Copy link
Member

@javanna javanna commented Sep 29, 2014

Create client nodes using node.client: true instead of node.data: false and node.master: false.

We should create client nodes in our test infra using the node.client:true settings as that is the one that users use, and the one that we use as well in ClientNodePredicate thus we end up not finding client nodes otherwise as they weren't created with the proper setting.

Updated also the DataNodePredicate so that client: true is enough, no need for data: false as well.

@javanna javanna added >test Issues or PRs that are addressing/adding tests review labels Sep 29, 2014
@javanna javanna self-assigned this Sep 29, 2014
@@ -1458,7 +1458,7 @@ private void removeDisruptionSchemeFromNode(NodeAndClient nodeAndClient) {
private static final class DataNodePredicate implements Predicate<NodeAndClient> {
@Override
public boolean apply(NodeAndClient nodeAndClient) {
return nodeAndClient.node.settings().getAsBoolean("node.data", true);
return nodeAndClient.node.settings().getAsBoolean("node.data", true) && !nodeAndClient.node.settings().getAsBoolean("node.client", false);
Copy link
Contributor

Choose a reason for hiding this comment

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

can we use == false?

Copy link
Member Author

Choose a reason for hiding this comment

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

ok, will change

javanna added a commit to javanna/elasticsearch that referenced this pull request Sep 29, 2014
… false and node.master: false

Create client nodes using `node.client: true` instead of `node.data: false` and `node.master: false`.

We should create client nodes in our test infra using the `node.client:true` settings as that is the one that users use, and the one that we use as well in `ClientNodePredicate` thus we end up not finding client nodes otherwise as they weren't created with the proper setting.

Updated also the `DataNodePredicate` so that `client: true` is enough, no need for `data: false` as well.

Closes elastic#7911
javanna added a commit to javanna/elasticsearch that referenced this pull request Sep 29, 2014
… false and node.master: false

Create client nodes using `node.client: true` instead of `node.data: false` and `node.master: false`.

We should create client nodes in our test infra using the `node.client:true` settings as that is the one that users use, and the one that we use as well in `ClientNodePredicate` thus we end up not finding client nodes otherwise as they weren't created with the proper setting.

Updated also the `DataNodePredicate` so that `client: true` is enough, no need for `data: false` as well.

Closes elastic#7911
@javanna javanna closed this in 43a1e1c Sep 29, 2014
@javanna javanna removed the review label Sep 29, 2014
mute pushed a commit to mute/elasticsearch that referenced this pull request Jul 29, 2015
… false and node.master: false

Create client nodes using `node.client: true` instead of `node.data: false` and `node.master: false`.

We should create client nodes in our test infra using the `node.client:true` settings as that is the one that users use, and the one that we use as well in `ClientNodePredicate` thus we end up not finding client nodes otherwise as they weren't created with the proper setting.

Updated also the `DataNodePredicate` so that `client: true` is enough, no need for `data: false` as well.

Closes elastic#7911
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.4.0.Beta1 v1.5.0 v2.0.0-beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants