Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Support ES 7.10.0 #313

Merged

Conversation

weicongs-amazon
Copy link
Contributor

@weicongs-amazon weicongs-amazon commented Nov 17, 2020

Issue #, if available:

Description of changes:
Support ES 7.10.0

  • update the version of ES, common-utils, JobScheduler SPI
  • fix the breaking changes caused by XContentParserUtils.ensureExpectedToken interface
  • fix the github workflow issues caused by the set-env deprecation
  • fix the UT issue caused by the new warning exception
  • update the integTest
  • add new release notes for odfe 1.12.0 release
  • Fix the IT issue caused by recent security changes

Testing:

  • UT with ./gradlew build
  • Integration Test
    • Local Run with ./gradlew integTest and /gradlew build
    • Passed with Remote security disabled cluster with ./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="elasticsearch"
    • Passed with Remote security enabled cluster with ./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="elasticsearch" -Dhttps=true -Duser=admin -Dpassword=admin

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@codecov
Copy link

codecov bot commented Nov 18, 2020

Codecov Report

Merging #313 (db9d9cd) into master (28410da) will increase coverage by 0.05%.
The diff coverage is 61.90%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #313      +/-   ##
============================================
+ Coverage     72.14%   72.19%   +0.05%     
  Complexity     1990     1990              
============================================
  Files           201      201              
  Lines          9567     9570       +3     
  Branches        849      850       +1     
============================================
+ Hits           6902     6909       +7     
+ Misses         2252     2248       -4     
  Partials        413      413              
Flag Coverage Δ Complexity Δ
cli 79.27% <ø> (ø) 0.00 <ø> (ø)
plugin 71.61% <61.90%> (+0.05%) 0.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
...stroforelasticsearch/ad/AnomalyDetectorPlugin.java 94.82% <0.00%> (ø) 11.00 <0.00> (ø)
...relasticsearch/ad/cluster/MasterEventListener.java 94.59% <ø> (ø) 8.00 <0.00> (ø)
...oforelasticsearch/ad/feature/SearchFeatureDao.java 80.50% <0.00%> (-0.26%) 81.00 <0.00> (ø)
...sticsearch/ad/indices/AnomalyDetectionIndices.java 49.01% <ø> (-0.33%) 39.00 <0.00> (-1.00)
...istroforelasticsearch/ad/ml/EntityColdStarter.java 88.64% <ø> (ø) 34.00 <0.00> (ø)
...on/opendistroforelasticsearch/ad/model/Entity.java 50.00% <0.00%> (ø) 4.00 <0.00> (ø)
...forelasticsearch/ad/rest/AbstractSearchAction.java 25.00% <0.00%> (ø) 2.00 <0.00> (ø)
...arch/ad/rest/RestExecuteAnomalyDetectorAction.java 11.81% <0.00%> (ø) 3.00 <0.00> (ø)
...search/ad/rest/RestIndexAnomalyDetectorAction.java 46.93% <0.00%> (ø) 3.00 <0.00> (ø)
.../ad/rest/handler/AnomalyDetectorActionHandler.java 13.33% <0.00%> (ø) 2.00 <0.00> (ø)
... and 21 more

@weicongs-amazon weicongs-amazon changed the title Support ES 7.10.0 - [WIP] Support ES 7.10.0 Nov 18, 2020
@weicongs-amazon weicongs-amazon added odfe-release version upgrade upgrade version like ES, java labels Nov 18, 2020
@ylwu-amzn
Copy link
Contributor

Have you tried installing the built artifact to ES 7.10 cluster ? I think it should work, but better to test.

@weicongs-amazon
Copy link
Contributor Author

weicongs-amazon commented Nov 19, 2020

Have you tried installing the built artifact to ES 7.10 cluster ? I think it should work, but better to test.

Yes, already tested. it works well

build.gradle Show resolved Hide resolved
else
echo "Security plugin is NOT available"
./gradlew :integTestRunner --tests "com.amazon.opendistroforelasticsearch.ad.rest.*IT" --tests "com.amazon.opendistroforelasticsearch.ad.e2e.*IT" -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster" -PnumNodes=2
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster"
Copy link
Contributor

Choose a reason for hiding this comment

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

ES7.10 doesn't support PnumNodes ? How to test cluster with multiple nodes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

PnumNodes is used for local test, not for remote cluster.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need add new task for local testing with multi nodes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually it never worked. I commented in the issue: #194. Let's use that to track the multi node testing changes

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it, let's fix in a separate PR

Copy link
Contributor

@ylwu-amzn ylwu-amzn left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the change!

@weicongs-amazon weicongs-amazon merged commit b270d7e into opendistro-for-elasticsearch:master Nov 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
odfe-release version upgrade upgrade version like ES, java
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants