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] Adding task cancellation timestamp in task API #7711

Merged

Conversation

sgup432
Copy link
Contributor

@sgup432 sgup432 commented May 23, 2023

Description

Backports - #7445

Related Issues

#7445

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 bot and others added 2 commits May 23, 2023 19:22
* Adding task cancellation time in task API

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Fixing unit tests and addressing comments

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Adding change log for unreleased 2.x

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Removing running time cancel info from task API

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Replacing long primitive with Long object

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Making cancelledAt field human readable

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Fixing failing test

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Removing the feature from unreleased 3.x

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Fixing ListTasksResponseTests failure

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Test failure fix

Signed-off-by: Sagar Upadhyaya <[email protected]>

* Changing naming convention to cancellationStartTime

Signed-off-by: Sagar Upadhyaya <[email protected]>

---------

Signed-off-by: Sagar Upadhyaya <[email protected]>
Signed-off-by: Sagar <[email protected]>
Co-authored-by: Andrew Ross <[email protected]>
(cherry picked from commit 8d7a544)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Sagar Upadhyaya <[email protected]>
@sgup432
Copy link
Contributor Author

sgup432 commented May 23, 2023

@andrross Can you review this? And cancel the duplicate/stale one - #7704?

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      3 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString

@codecov
Copy link

codecov bot commented May 23, 2023

Codecov Report

Merging #7711 (59914fd) into 2.x (4bd47e1) will increase coverage by 0.06%.
The diff coverage is 80.00%.

@@             Coverage Diff              @@
##                2.x    #7711      +/-   ##
============================================
+ Coverage     70.33%   70.40%   +0.06%     
- Complexity    60120    60214      +94     
============================================
  Files          4899     4899              
  Lines        289129   289152      +23     
  Branches      41991    41994       +3     
============================================
+ Hits         203359   203567     +208     
+ Misses        68743    68530     -213     
- Partials      17027    17055      +28     
Impacted Files Coverage Δ
...r/src/main/java/org/opensearch/tasks/TaskInfo.java 90.00% <73.33%> (+0.27%) ⬆️
...ain/java/org/opensearch/tasks/CancellableTask.java 82.60% <83.33%> (+0.25%) ⬆️
...erver/src/main/java/org/opensearch/tasks/Task.java 80.90% <100.00%> (+0.53%) ⬆️

... and 512 files with indirect coverage changes

@sgup432
Copy link
Contributor Author

sgup432 commented May 23, 2023

@dblock Can you review this backport PR?

@andrross andrross merged commit 8c18ac4 into opensearch-project:2.x May 24, 2023
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.

2 participants