Skip to content

Conversation

@gaobinlong
Copy link
Contributor

@gaobinlong gaobinlong commented Mar 28, 2023

Description

Backport 3fec567 from #6434.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

opensearch-project#6434)

* Add wait_for_completion parameter to resize&open&forcemerge APIs (opensearch-project#6228)

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Modify changelog

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* fix test failure

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Fix test failure

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* change header of new file

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* modify changelog

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
(cherry picked from commit 3fec567)

Modify the yaml test file

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=pit/10_basic/Delete all}

@codecov-commenter
Copy link

Codecov Report

Merging #6855 (2083ef3) into 2.x (8356d2b) will decrease coverage by 0.01%.
The diff coverage is 44.04%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x    #6855      +/-   ##
============================================
- Coverage     70.39%   70.39%   -0.01%     
+ Complexity    59459    59455       -4     
============================================
  Files          4808     4808              
  Lines        285371   285437      +66     
  Branches      41490    41497       +7     
============================================
+ Hits         200896   200933      +37     
- Misses        67666    67737      +71     
+ Partials      16809    16767      -42     
Impacted Files Coverage Δ
.../index/reindex/AbstractBaseReindexRestHandler.java 6.66% <ø> (+0.69%) ⬆️
...on/admin/indices/forcemerge/ForceMergeRequest.java 48.71% <0.00%> (-4.06%) ⬇️
...main/java/org/opensearch/rest/BaseRestHandler.java 69.33% <0.00%> (-7.14%) ⬇️
...rest/action/admin/indices/RestOpenIndexAction.java 34.78% <0.00%> (-22.37%) ⬇️
...h/rest/action/admin/indices/RestResizeHandler.java 53.33% <8.33%> (-14.32%) ⬇️
...est/action/admin/indices/RestForceMergeAction.java 64.70% <16.66%> (-26.97%) ⬇️
...rch/action/admin/indices/shrink/ResizeRequest.java 59.43% <57.14%> (+4.13%) ⬆️
...ch/action/admin/indices/open/OpenIndexRequest.java 91.66% <60.00%> (+36.82%) ⬆️
...n/admin/indices/forcemerge/ForceMergeResponse.java 90.47% <100.00%> (+4.76%) ⬆️
...h/action/admin/indices/open/OpenIndexResponse.java 100.00% <100.00%> (ø)
... and 3 more

... and 489 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=pit/10_basic/Delete all}

@gaobinlong
Copy link
Contributor Author

Gradle Check (Jenkins) Run Completed with:

I've fixed this failure by removing an unused package which causes the spotlessJavaCheck task to fail. By the way, I've changed the package name in some files within this PR, because we renamed the package org.opensearch.common to org.opensearch.core.

@gaobinlong
Copy link
Contributor Author

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=pit/10_basic/Delete all}

This unstable test case seems to be a flaky test.

@andrross andrross merged commit 47a95e4 into opensearch-project:2.x Mar 29, 2023
@gaobinlong gaobinlong deleted the backport/backport-6434-to-2.x branch June 19, 2024 15:21
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