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

Testclusters fix bwc #46740

Merged
merged 7 commits into from
Oct 1, 2019
Merged

Testclusters fix bwc #46740

merged 7 commits into from
Oct 1, 2019

Conversation

alpar-t
Copy link
Contributor

@alpar-t alpar-t commented Sep 16, 2019

While trying to back-port #45654 it was discovered that the distribution download and test clusters plugins need some tweaks to make them work with older versions of es.

This PR implements fixes and adds a test to veryfy that testclusters
can start up clusters on old versions.
It also serves as a tool to be able to check changes on master before
backporting to aid in discovering issues earlier.

TODO:
 - check with multi node clusters
 - Add integ test distro
This is required in order to backport changes, so that testclsuters
works with older version of ES.
@alpar-t alpar-t mentioned this pull request Sep 16, 2019
@alpar-t alpar-t added :Delivery/Build Build or test infrastructure v7.5.0 v8.0.0 labels Sep 16, 2019
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

@alpar-t
Copy link
Contributor Author

alpar-t commented Sep 17, 2019

@elasticmachine run elasticsearch-ci/1 and run elasticsearch-ci/2

@alpar-t
Copy link
Contributor Author

alpar-t commented Sep 17, 2019

@elasticmachine run elasticsearch-ci/2

Copy link
Contributor

@mark-vieira mark-vieira left a comment

Choose a reason for hiding this comment

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

Changes look ok to me. @rjernst might have more to say since it involves a lot of distribution handling stuff.

@alpar-t
Copy link
Contributor Author

alpar-t commented Sep 26, 2019

@rjernst please take a look, this is blocking the back-port to 7.x

Copy link
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

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

LGTM

} else {
node.defaultConfig.put("discovery.zen.master_election.wait_for_joins_timeout", "5s");
if (nodes.size() > 1) {
node.defaultConfig.put("discovery.zen.minimum_master_nodes", nodes.size() / 2 + 1 + "");
Copy link
Member

Choose a reason for hiding this comment

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

nit: please just use Integer.toString instead of relying on concatenation to do conversion

@alpar-t alpar-t merged commit 32c848b into elastic:master Oct 1, 2019
@alpar-t alpar-t deleted the testclusters-fix-bwc branch October 1, 2019 07:52
alpar-t added a commit to alpar-t/elasticsearch that referenced this pull request Oct 1, 2019
Additions to make testclsuters work with lather versions of ES
alpar-t added a commit that referenced this pull request Oct 2, 2019
* Add support for bwc for testclusters and convert full cluster restart (#45374)

* Testclusters fix bwc (#46740)

Additions to make testclsuters work with lather versions of ES

* Do common node config on bwc tests

Before this PR we always ever ran `ElasticsearchCluster.start` once, and
the common node config was never done.
This becomes apparent in upgrading from `6.x` to `7.x` as the new config
is missing preventing the cluster from starting.

* Do common node config on bwc tests

Before this PR we always ever ran `ElasticsearchCluster.start` once, and
the common node config was never done.
This becomes apparent in upgrading from `6.x` to `7.x` as the new config
is missing preventing the cluster from starting.

* Fix logic to pick up snapshot from 6.x

* Make sure ports are cleared

* Fix test

* Don't clear all the config as we rely on it

* Fix removal of keys
@mark-vieira mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team v7.5.0 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants