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

[Backport 2.x] ImmutableOpenMap to j.u.Map #838

Merged
merged 4 commits into from
Jul 2, 2023

Conversation

Hailong-am
Copy link
Collaborator

@Hailong-am Hailong-am commented Jun 30, 2023

Backport 9fbc083 from #830

Backport 990db5b from #825

Backport 354d20c from #771

Description of changes:

[Refactor] Metadata members from ImmutableOpenMap to j.u.Map was backported to 2.x
opensearch-project/OpenSearch#8241

cherry pick changes from #771

CheckList:

  • 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.

@Hailong-am
Copy link
Collaborator Author

include #836 and #834 in this PR also

@Hailong-am Hailong-am changed the title Change for refactor Metadata members from ImmutableOpenMap to j.u.Map [Backport 2.x] ImmutableOpenMap to j.u.Map Jun 30, 2023
@codecov
Copy link

codecov bot commented Jun 30, 2023

Codecov Report

Merging #838 (5979df0) into 2.x (c48129e) will increase coverage by 0.03%.
The diff coverage is 40.74%.

@@             Coverage Diff              @@
##                2.x     #838      +/-   ##
============================================
+ Coverage     75.92%   75.96%   +0.03%     
- Complexity     2900     2903       +3     
============================================
  Files           366      366              
  Lines         16554    16556       +2     
  Branches       2387     2395       +8     
============================================
+ Hits          12569    12576       +7     
+ Misses         2603     2600       -3     
+ Partials       1382     1380       -2     
Impacted Files Coverage Δ
...atemanagement/step/shrink/AttemptMoveShardsStep.kt 57.70% <0.00%> (-0.70%) ⬇️
...atemanagement/step/shrink/WaitForMoveShardsStep.kt 45.45% <0.00%> (-5.32%) ⬇️
...exstatemanagement/step/shrink/WaitForShrinkStep.kt 40.00% <0.00%> (-2.00%) ⬇️
.../rollup/util/RollupFieldValueExpressionResolver.kt 61.53% <0.00%> (ø)
.../org/opensearch/indexmanagement/util/IndexUtils.kt 67.01% <0.00%> (-1.04%) ⬇️
...arch/indexmanagement/rollup/RollupMapperService.kt 58.58% <50.00%> (ø)
...management/indexstatemanagement/MetadataService.kt 63.70% <60.00%> (-0.48%) ⬇️
...ndexstatemanagement/IndexStateManagementHistory.kt 79.45% <66.66%> (+1.52%) ⬆️
...agement/indexstatemanagement/ManagedIndexRunner.kt 48.67% <100.00%> (+1.10%) ⬆️
...temanagement/opensearchapi/OpenSearchExtensions.kt 70.88% <100.00%> (-0.72%) ⬇️
... and 2 more

... and 8 files with indirect coverage changes

@Hailong-am
Copy link
Collaborator Author

Hailong-am commented Jun 30, 2023

docker security test failed due to docker image is not up to date.

docker image for 2.9.0 is created at "Created": "2023-06-21T02:19:02.649938963Z",

java.lang.NoSuchMethodError: 'java.util.Map org.opensearch.cluster.metadata.Metadata.getIndices()'
	at org.opensearch.indexmanagement.indexstatemanagement.DefaultIndexMetadataService.getMetadata(DefaultIndexMetadataService.kt:40) ~[opensearch-index-management-2.9.0.0-SNAPSHOT.jar:2.9.0.0-SNAPSHOT]

@Hailong-am
Copy link
Collaborator Author

@bowenlan-amzn can you help to review, as most this changes are from #771

Copy link
Member

@bowenlan-amzn bowenlan-amzn left a comment

Choose a reason for hiding this comment

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

Thank you!

@bowenlan-amzn bowenlan-amzn merged commit 930157b into opensearch-project:2.x Jul 2, 2023
12 of 14 checks passed
ronnaksaxena pushed a commit to ronnaksaxena/index-management that referenced this pull request Jul 19, 2023
* Metadata members from ImmutableOpenMap to j.u.Map

Signed-off-by: Hailong Cui <[email protected]>

* add field remoteStoreIndexShallowCopy in SM TestUtils (opensearch-project#825)

Signed-off-by: zhichao-aws <[email protected]>

* fix NPE for transform aggregations (opensearch-project#830)

Signed-off-by: Hailong Cui <[email protected]>

* Fix detekt

Signed-off-by: Hailong Cui <[email protected]>

---------

Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: zhichao-aws <[email protected]>
Co-authored-by: zhichao-aws <[email protected]>
Signed-off-by: Ronnak Saxena <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants