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

[TaskCancellationMonitoringService] Changing version check to 2.9 #8069

Merged

Conversation

sgup432
Copy link
Contributor

@sgup432 sgup432 commented Jun 14, 2023

Description

Changing version check to 2.9.
Related backport PR - #8046

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

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.

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@msfroh
Copy link
Collaborator

msfroh commented Jun 14, 2023

I hope that we can get this one merged soon, since the version check mismatch is causing BwC test failures on main.

I'm wondering if we could establish a process where we have both PRs for a version check change (on 2.x and main) ready, and the maintainer who merges the 2.x PR commits to merging the main PR immediately after.

I've had a couple of these where I've had a backport PR (that changes a version check to whatever the next 2.x release will be) and associated update in main. I manage to get the backport PR merged, but haven't been able to get the main PR merged until a day later -- after I've annoyed everyone else by breaking their Gradle checks.

I would love a technical solution that doesn't rely on good intentions, but asking the human maintainers to merge both PRs in quick succession is the best I've been able to think of.

I'm going to copy this comment into a dedicated issue. Maybe someone else has a cleverer solution.

@sgup432
Copy link
Contributor Author

sgup432 commented Jun 14, 2023

@dblock @andrross @Bukhtawar Can you please help in merging this? As it is causing problems to others as mentioned by @msfroh.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.backpressure.SearchBackpressureIT.testSearchTaskCancellationWithHighCpu
      1 org.opensearch.action.admin.cluster.node.tasks.ResourceAwareTasksTests.testBasicTaskResourceTracking

@codecov
Copy link

codecov bot commented Jun 14, 2023

Codecov Report

Merging #8069 (26ea426) into main (cc0f344) will decrease coverage by 0.03%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               main    #8069      +/-   ##
============================================
- Coverage     70.98%   70.96%   -0.03%     
+ Complexity    56691    56652      -39     
============================================
  Files          4722     4722              
  Lines        267576   267576              
  Branches      39213    39213              
============================================
- Hits         189950   189876      -74     
- Misses        61646    61657      +11     
- Partials      15980    16043      +63     
Impacted Files Coverage Δ
...rch/action/admin/cluster/node/stats/NodeStats.java 51.44% <0.00%> (ø)

... and 438 files with indirect coverage changes

@andrross andrross merged commit bb1f7e2 into opensearch-project:main Jun 15, 2023
gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 15, 2023
…ensearch-project#8069)

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
imRishN pushed a commit to imRishN/OpenSearch that referenced this pull request Jun 27, 2023
…ensearch-project#8069)

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…ensearch-project#8069)

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants