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

Gradle 7 and Opensearch 2.0 upgrade #464

Merged
merged 1 commit into from
Mar 24, 2022
Merged

Gradle 7 and Opensearch 2.0 upgrade #464

merged 1 commit into from
Mar 24, 2022

Conversation

aksingh-es
Copy link
Contributor

@aksingh-es aksingh-es commented Mar 23, 2022

Signed-off-by: Amit Singh [email protected]

This PR support major campagins for Opensearch 2.0 release :
1.Using OS 2.0 snapshot
2.Remove mapping types ,transport deprecation support
3.Gradle 7 upgrade

Issues Resolved
#326
opensearch-project/opensearch-plugins#130

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Amit Singh <[email protected]>
@aksingh-es aksingh-es requested a review from a team March 23, 2022 19:48
@opensearch-trigger-bot opensearch-trigger-bot bot added backport 1.x infra Changes to infrastructure, testing, CI/CD, pipelines, etc. labels Mar 23, 2022
@aksingh-es aksingh-es requested a review from ylwu-amzn March 23, 2022 19:55
compile ("org.jacoco:org.jacoco.ant:0.8.5") {
implementation group: 'io.protostuff', name: 'protostuff-core', version: '1.8.0'
implementation group: 'io.protostuff', name: 'protostuff-runtime', version: '1.8.0'
implementation group: 'io.protostuff', name: 'protostuff-api', version: '1.8.0'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why add these new dependencies: protostuff-api and protostuff-collectionschema?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

These required to be explicitly added as the compilation errors for Linkedbuffer and Schema were coming from these.
Compile failures : https://paste.amazon.com/show/snghes/1647551203

@codecov-commenter
Copy link

codecov-commenter commented Mar 23, 2022

Codecov Report

Merging #464 (00086b1) into main (3bdb4f6) will decrease coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##               main     #464      +/-   ##
============================================
- Coverage     78.33%   78.31%   -0.03%     
+ Complexity     4172     4169       -3     
============================================
  Files           296      296              
  Lines         17657    17655       -2     
  Branches       1879     1879              
============================================
- Hits          13832    13826       -6     
+ Misses         2945     2940       -5     
- Partials        880      889       +9     
Flag Coverage Δ
plugin 78.31% <100.00%> (-0.03%) ⬇️

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

Impacted Files Coverage Δ
...opensearch/ad/indices/AnomalyDetectionIndices.java 71.99% <100.00%> (-0.30%) ⬇️
.../opensearch/ad/transport/StopDetectorResponse.java 19.04% <0.00%> (-23.81%) ⬇️
...rg/opensearch/ad/transport/ADResultBulkAction.java 80.00% <0.00%> (-20.00%) ⬇️
...search/ad/transport/AnomalyDetectorJobRequest.java 86.48% <0.00%> (-13.52%) ⬇️
...opensearch/ad/transport/AnomalyResultResponse.java 71.96% <0.00%> (-12.13%) ⬇️
...earch/ad/transport/GetAnomalyDetectorResponse.java 86.86% <0.00%> (-5.06%) ⬇️
...port/SearchAnomalyDetectorInfoTransportAction.java 64.44% <0.00%> (-4.45%) ⬇️
...va/org/opensearch/ad/transport/ProfileRequest.java 96.00% <0.00%> (-4.00%) ⬇️
...in/java/org/opensearch/ad/model/ADTaskProfile.java 84.38% <0.00%> (-2.11%) ⬇️
... and 4 more

testCompileOnly 'org.apiguardian:apiguardian-api:1.1.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
Copy link
Collaborator

Choose a reason for hiding this comment

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

minor: extra space

gradlew Show resolved Hide resolved
@@ -919,10 +919,7 @@ private void updateMappingIfNecessary(GroupedActionListener<Void> delegateListen
adminClient
.indices()
.putMapping(
new PutMappingRequest()
.indices(adIndex.getIndexName())
.type(CommonName.MAPPING_TYPE)
Copy link
Member

Choose a reason for hiding this comment

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

if all uses of CommonName.Mapping_TYPE were removed we can maybe delete that constant and comment referring elastic above it in CommonName class

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good call out.would do that in separate PR.This is already many files

Copy link
Member

Choose a reason for hiding this comment

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

Sounds good

Copy link
Member

@amitgalitz amitgalitz 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 all the changes, lets keep an eye out for any updates on job-scheduler and other 2.0 dependency to enable some parts of CI again

@aksingh-es aksingh-es merged commit fa00555 into opensearch-project:main Mar 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infra Changes to infrastructure, testing, CI/CD, pipelines, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants