Skip to content

Internal: Remove cyclic dependency between HttpServer and NodeService #19218

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

Merged
merged 2 commits into from
Jul 1, 2016

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Jul 1, 2016

NodeService has an "service attributes" map, which is only
set by HttpServer on start/stop. But the only thing it puts in this map
is already available as part of the HttpServer info which is added to
node info requests. This change removes the attributes map and removes
the dependency in HttpServer on NodeService.

NodeService has an "service attributes" map, which is only
set by HttpServer on start/stop. But the only thing it puts in this map
is already available as part of the HttpServer info which is added to
node info requests. This change removes the attributes map and removes
the dependency in HttpServer on NodeService.
int size = in.readVInt();
for (int i = 0; i < size; i++) {
builder.put(in.readString(), in.readString());
if (version.onOrBefore(Version.V_5_0_0_alpha4)) {
Copy link
Member

Choose a reason for hiding this comment

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

do we need this bw comp layer?

Copy link
Member Author

Choose a reason for hiding this comment

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

You are right, we don't! I will remove.

@rjernst
Copy link
Member Author

rjernst commented Jul 1, 2016

@javanna I pushed a change removing the unnecessary bwc.

@javanna
Copy link
Member

javanna commented Jul 1, 2016

LGTM

@rjernst rjernst merged commit a200292 into elastic:master Jul 1, 2016
@rjernst rjernst deleted the http_server_without_node_service branch July 1, 2016 19:32
Mpdreamz added a commit to elastic/elasticsearch-net that referenced this pull request Sep 27, 2016
Mpdreamz added a commit to elastic/elasticsearch-net that referenced this pull request Sep 27, 2016
deprecate _ttl/_timestamp and remove them from our tests as per elastic/elasticsearch#18980 so that migrated 2.x indices do not have their code altered (just yet)

explicit 5.x spec generation

fix failing nodes test because  is removed as per elastic/elasticsearch#19218

fixed failing integration tests due to lang no longer defaulting to groovy elastic/elasticsearch#19960

fields => stored fields, updated failing cathelp tests due to endpoint changing

suggest response is now generic and gets _source returned in accordance with elastic/elasticsearch#19536

histogram key double not long

source filtering include and exclude are now plural

script fields tests did not explicitly specify groovy

search's StoredFields still sent

get task api tests wreaked havoc on the readonly tests

scripted metric did not specify lang

set script.max_compilations_per_minute on node

fix top hits not setting groovy explicitly

multi search now response 404 properly

multitermvector tests making sure it took more then 0 is no longer reliable beta1 is too fast :)

foreach put pipeline processors is no longer an array as per elastic/elasticsearch#19402

revert field=>stored_fields rename on update request

remove propery name with dot failure assertion integration test, no longer valid since elastic/elasticsearch#19899

use existing elasticsearch node in test framework could still spawn a new java process

revert field=>stored_fields rename on update request

get pipeline api is now dictionary based as per elastic/elasticsearch#19685

xpack beta1 related fixes

reindex tests not setting all waithandles and taking 3 minutes for no good reason

missing fieldsecurity class

fix post integration test failures unit test failures

add back run as tests now that we send the right header in the beta1 world
Mpdreamz added a commit to elastic/elasticsearch-net that referenced this pull request Oct 10, 2016
* removed deleted file from csproj

deprecate _ttl/_timestamp and remove them from our tests as per elastic/elasticsearch#18980 so that migrated 2.x indices do not have their code altered (just yet)

explicit 5.x spec generation

fix failing nodes test because  is removed as per elastic/elasticsearch#19218

fixed failing integration tests due to lang no longer defaulting to groovy elastic/elasticsearch#19960

fields => stored fields, updated failing cathelp tests due to endpoint changing

suggest response is now generic and gets _source returned in accordance with elastic/elasticsearch#19536

histogram key double not long

source filtering include and exclude are now plural

script fields tests did not explicitly specify groovy

search's StoredFields still sent

get task api tests wreaked havoc on the readonly tests

scripted metric did not specify lang

set script.max_compilations_per_minute on node

fix top hits not setting groovy explicitly

multi search now response 404 properly

multitermvector tests making sure it took more then 0 is no longer reliable beta1 is too fast :)

foreach put pipeline processors is no longer an array as per elastic/elasticsearch#19402

revert field=>stored_fields rename on update request

remove propery name with dot failure assertion integration test, no longer valid since elastic/elasticsearch#19899

use existing elasticsearch node in test framework could still spawn a new java process

revert field=>stored_fields rename on update request

get pipeline api is now dictionary based as per elastic/elasticsearch#19685

xpack beta1 related fixes

reindex tests not setting all waithandles and taking 3 minutes for no good reason

missing fieldsecurity class

fix post integration test failures unit test failures

add back run as tests now that we send the right header in the beta1 world

* make sure code is generated of master after mass picking commits of 5.x branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants