Skip to content

Revert changes to tasks_list test rest api spec test#7875

Closed
jed326 wants to merge 1 commit intoopensearch-project:mainfrom
jed326:tasks-lists-test-fix
Closed

Revert changes to tasks_list test rest api spec test#7875
jed326 wants to merge 1 commit intoopensearch-project:mainfrom
jed326:tasks-lists-test-fix

Conversation

@jed326
Copy link
Copy Markdown
Contributor

@jed326 jed326 commented Jun 1, 2023

Description

DIscovered a problem with one of the test updates in #7673 as a part of the backport #7856.
resource_stats does not exist in OS < 2.X so I am reverting the update to the test.

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.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jun 1, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.backpressure.SearchBackpressureIT.testSearchShardTaskCancellationWithHighCpu
      1 org.opensearch.remotestore.RemoteStoreRefreshListenerIT.testRemoteRefreshRetryOnFailure
      1 org.opensearch.indices.replication.SegmentReplicationRelocationIT.testPrimaryRelocation

@andrross
Copy link
Copy Markdown
Member

andrross commented Jun 1, 2023

Can you pull the resource_stats test into its own case with the version skip to prevent it from running on versions below 2.x?

Signed-off-by: Jay Deng <jayd0104@gmail.com>
@jed326 jed326 force-pushed the tasks-lists-test-fix branch from 16fdfff to c13c956 Compare June 2, 2023 02:31
@codecov
Copy link
Copy Markdown

codecov bot commented Jun 2, 2023

Codecov Report

Merging #7875 (c13c956) into main (57c4a80) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #7875      +/-   ##
============================================
- Coverage     70.88%   70.88%   -0.01%     
- Complexity    56272    56293      +21     
============================================
  Files          4687     4687              
  Lines        266232   266232              
  Branches      39095    39095              
============================================
- Hits         188714   188711       -3     
- Misses        61519    61523       +4     
+ Partials      15999    15998       -1     

see 467 files with indirect coverage changes

@jed326
Copy link
Copy Markdown
Contributor Author

jed326 commented Jun 2, 2023

resource_stats is not present on 2.0 -- https://github.com/opensearch-project/OpenSearch/blob/2.0/server/src/main/java/org/opensearch/tasks/Task.java

Moved it into it's own test case that skips below 2.1

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jun 2, 2023

Gradle Check (Jenkins) Run Completed with:

@reta
Copy link
Copy Markdown
Contributor

reta commented Jun 2, 2023

@jed326 I don't think we need to revert the changes, we just need to add version condition, I will push the change here #7856

@jed326
Copy link
Copy Markdown
Contributor Author

jed326 commented Jun 2, 2023

Closing this PR then since it's merged in #7889

@jed326 jed326 closed this Jun 2, 2023
@jed326 jed326 deleted the tasks-lists-test-fix branch June 5, 2023 20:25
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.

3 participants