-
Notifications
You must be signed in to change notification settings - Fork 24.9k
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
Testclusters fix bwc #46740
Conversation
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.
Pinging @elastic/es-core-infra |
@elasticmachine run elasticsearch-ci/1 and run elasticsearch-ci/2 |
@elasticmachine run elasticsearch-ci/2 |
There was a problem hiding this 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.
buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java
Show resolved
Hide resolved
@rjernst please take a look, this is blocking the back-port to |
There was a problem hiding this 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 + ""); |
There was a problem hiding this comment.
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
Additions to make testclsuters work with lather versions of ES
* 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
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.