This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
AD opendistro 1.6 support #87
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,9 +16,9 @@ | |
| buildscript { | ||
| ext { | ||
| es_group = "org.elasticsearch" | ||
| es_version = '7.6.1' | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| maven { url "https://plugins.gradle.org/m2/" } | ||
|
|
@@ -31,8 +31,9 @@ buildscript { | |
| } | ||
|
|
||
| plugins { | ||
| id 'nebula.ospackage' version "8.2.0" apply false | ||
| id "com.diffplug.gradle.spotless" version "3.26.1" | ||
| id 'java-library' | ||
| } | ||
|
|
||
| repositories { | ||
|
|
@@ -42,13 +43,8 @@ repositories { | |
| } | ||
|
|
||
| ext { | ||
| opendistroVersion = '1.6.0' | ||
| isSnapshot = "true" == System.getProperty("build.snapshot", "true") | ||
| } | ||
|
|
||
| version = "${opendistroVersion}.0" | ||
|
|
@@ -120,80 +116,6 @@ thirdPartyAudit.enabled = false | |
| // See package README.md for details on using these tasks. | ||
| def _numNodes = findProperty('numNodes') as Integer ?: 1 | ||
|
|
||
|
There was a problem hiding this comment. Why do we remove the following, which is used to start and stop a multi-node cluster? There was a problem hiding this comment. I think this was added to to provide hack to install job scheduler plugin on the test clusters. With ES 7.5 onwards Elasticsearch provided a way to install dependent plugins on test cluster. There was a problem hiding this comment. Good to know. Could you keep runSingleNode and stopMultiNode (line 165~196 in the old version) so that I can start node one by one and kill all nodes? Need them for fault tolerance tests. There was a problem hiding this comment. Created issue to add this back #90 |
||
| def es_tmp_dir = rootProject.file('build/private/es_tmp').absoluteFile | ||
| es_tmp_dir.mkdirs() | ||
|
|
||
|
|
@@ -202,30 +124,57 @@ test { | |
| systemProperty 'tests.security.manager', 'false' | ||
| } | ||
|
|
||
| integTest { | ||
| runner { | ||
| systemProperty 'tests.security.manager', 'false' | ||
| systemProperty 'java.io.tmpdir', es_tmp_dir.absolutePath | ||
| // The 'doFirst' delays till execution time. | ||
| doFirst { | ||
| // Tell the test JVM if the cluster JVM is running under a debugger so that tests can | ||
| // use longer timeouts for requests. | ||
| def isDebuggingCluster = getDebug() || System.getProperty("test.debug") != null | ||
| systemProperty 'cluster.debug', isDebuggingCluster | ||
| // Set number of nodes system property to be used in tests | ||
| systemProperty 'cluster.number_of_nodes', "${_numNodes}" | ||
| // There seems to be an issue when running multi node run or integ tasks with unicast_hosts | ||
| // not being written, the waitForAllConditions ensures it's written | ||
| getClusters().forEach { cluster -> | ||
| cluster.waitForAllConditions() | ||
| } | ||
| } | ||
|
|
||
| // The --debug-jvm command-line option makes the cluster debuggable; this makes the tests debuggable | ||
| if (System.getProperty("test.debug") != null) { | ||
| jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| testClusters.integTest { | ||
| testDistribution = "OSS" | ||
| // Cluster shrink exception thrown if we try to set numberOfNodes to 1, so only apply if > 1 | ||
| if (_numNodes > 1) numberOfNodes = _numNodes | ||
| // When running integration tests it doesn't forward the --debug-jvm to the cluster anymore | ||
| // i.e. we have to use a custom property to flag when we want to debug elasticsearch JVM | ||
| // since we also support multi node integration tests we increase debugPort per node | ||
| if (System.getProperty("es.debug") != null) { | ||
| def debugPort = 5005 | ||
| nodes.forEach { node -> | ||
| node.jvmArgs("-agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=*:${debugPort}") | ||
| debugPort += 1 | ||
| } | ||
| } | ||
| plugin(fileTree("src/test/resources/job-scheduler").getSingleFile()) | ||
| } | ||
|
|
||
| run { | ||
| doFirst { | ||
| // There seems to be an issue when running multi node run or integ tasks with unicast_hosts | ||
| // not being written, the waitForAllConditions ensures it's written | ||
| getClusters().forEach { cluster -> | ||
| cluster.waitForAllConditions() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| evaluationDependsOnChildren() | ||
|
|
@@ -255,23 +204,17 @@ List<String> jacocoExclusions = [ | |
| 'com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException', | ||
| 'com.amazon.opendistroforelasticsearch.ad.util.ClientUtil', | ||
|
|
||
| 'com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorAction', | ||
| 'com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorRequest', | ||
| 'com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorResponse', | ||
| 'com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorTransportAction', | ||
| 'com.amazon.opendistroforelasticsearch.ad.transport.DeleteDetectorAction', | ||
| 'com.amazon.opendistroforelasticsearch.ad.transport.CronTransportAction', | ||
| 'com.amazon.opendistroforelasticsearch.ad.transport.CronRequest', | ||
| 'com.amazon.opendistroforelasticsearch.ad.transport.ADStatsAction', | ||
| 'com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorRunner', | ||
| 'com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices', | ||
| 'com.amazon.opendistroforelasticsearch.ad.util.ParseUtils', | ||
| ] | ||
|
|
||
| jacocoTestCoverageVerification { | ||
|
|
@@ -300,8 +243,9 @@ check.dependsOn jacocoTestCoverageVerification | |
| jacocoTestCoverageVerification.dependsOn jacocoTestReport | ||
|
|
||
| dependencies { | ||
| compile "org.elasticsearch:elasticsearch:${es_version}" | ||
| compileOnly "org.elasticsearch.plugin:elasticsearch-scripting-painless-spi:${versions.elasticsearch}" | ||
| compileOnly "com.amazon.opendistroforelasticsearch:opendistro-job-scheduler-spi:1.6.0.0" | ||
| compile group: 'com.google.guava', name: 'guava', version:'15.0' | ||
| compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' | ||
| compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' | ||
|
|
@@ -331,29 +275,6 @@ apply plugin: 'nebula.ospackage' | |
|
|
||
| // This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name | ||
| afterEvaluate { | ||
| ospackage { | ||
| packageName = "${name}" | ||
| release = isSnapshot ? "0.1" : '1' | ||
|
|
@@ -401,16 +322,6 @@ afterEvaluate { | |
| } | ||
| } | ||
|
|
||
| spotless { | ||
| java { | ||
| eclipse().configFile rootProject.file('.eclipseformat.xml') | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
After removing these lines, can we build on both windows and Linux?
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.
Previously we were installing using
setupCommandwhere we used absolute path for file which was different for windows. Now we just need to passfiletree.Example:-
plugin(fileTree("src/test/resources/job-scheduler").getSingleFile())
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.
great