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] Concurrent Search Tasks Response Updates #7856

Merged
merged 1 commit into from
Jun 2, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport e3740f7 from #7673.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 1, 2023

Gradle Check (Jenkins) Run Completed with:

@jed326
Copy link
Collaborator

jed326 commented Jun 1, 2023

Build failure due to V_3_0_0. 2.9 branch isn't created yet so going to leave this open for now.

@reta reta force-pushed the backport/backport-7673-to-2.x branch from b15e9f3 to ab35d5d Compare June 1, 2023 20:20
@github-actions
Copy link
Contributor

github-actions bot commented Jun 1, 2023

Gradle Check (Jenkins) Run Completed with:

@jed326
Copy link
Collaborator

jed326 commented Jun 1, 2023

I can take a look at this test failure shortly.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 1, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.indices.replication.SegmentReplicationRelocationIT.testPrimaryRelocation
      1 org.opensearch.indices.replication.SegmentReplicationIT.testScrollCreatedOnReplica

@codecov
Copy link

codecov bot commented Jun 1, 2023

Codecov Report

Merging #7856 (1195448) into 2.x (35ba672) will decrease coverage by 0.07%.
The diff coverage is 85.86%.

❗ Current head 1195448 differs from pull request most recent head f840f53. Consider uploading reports for the commit f840f53 to get more accurate results

@@             Coverage Diff              @@
##                2.x    #7856      +/-   ##
============================================
- Coverage     70.58%   70.52%   -0.07%     
+ Complexity    56460    56433      -27     
============================================
  Files          4665     4666       +1     
  Lines        267675   267763      +88     
  Branches      39634    39651      +17     
============================================
- Hits         188944   188844     -100     
- Misses        62496    62617     +121     
- Partials      16235    16302      +67     
Impacted Files Coverage Δ
...n/java/org/opensearch/tasks/TaskResourceStats.java 75.51% <76.47%> (-5.05%) ⬇️
...ain/java/org/opensearch/tasks/TaskThreadUsage.java 77.77% <77.77%> (ø)
...erver/src/main/java/org/opensearch/tasks/Task.java 84.81% <93.75%> (+3.90%) ⬆️

... and 451 files with indirect coverage changes

@jed326
Copy link
Collaborator

jed326 commented Jun 1, 2023

org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT > test {p0=tasks.list/10_basic/tasks_list test} FAILED
    java.lang.AssertionError: Failure at [tasks.list/10_basic:25]: field [tasks.$task_id.resource_stats] doesn't have a true value
    Expected: not null
         but: was null

Looks like this is a mixed cluster with 1.3 and the problem is that resource_stats does not exist in 1.3. The problem is with the test and not the underlying code.

@jed326
Copy link
Collaborator

jed326 commented Jun 1, 2023

@reta should we just merge this PR as is and then I will open a new one with the test fix or is there a better way to handle this?

@reta
Copy link
Collaborator

reta commented Jun 1, 2023

@reta should we just merge this PR as is and then I will open a new one with the test fix or is there a better way to handle this?

@jed326 I will push the fix for tests tomorrow (sorry far from laptop), we should fix the tests right away before merging, moreover you find out the problem already, thank you.

* Add average,min,max and thread info to tasks response

Signed-off-by: Jay Deng <jayd0104@gmail.com>

* Update server/src/main/java/org/opensearch/tasks/TaskResourceStats.java

Signed-off-by: Jay Deng <jayd0104@gmail.com>

---------

Signed-off-by: Jay Deng <jayd0104@gmail.com>
(cherry picked from commit e3740f7)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@github-actions
Copy link
Contributor

github-actions bot commented Jun 2, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testShardRoutingWithNetworkDisruption_FailOpenEnabled

@reta reta force-pushed the backport/backport-7673-to-2.x branch from 1195448 to f840f53 Compare June 2, 2023 13:19
@reta
Copy link
Collaborator

reta commented Jun 2, 2023

@jed326 looks good? we will bring version + tests changes to main

@github-actions
Copy link
Contributor

github-actions bot commented Jun 2, 2023

Gradle Check (Jenkins) Run Completed with:

@jed326
Copy link
Collaborator

jed326 commented Jun 2, 2023

@reta looks good to me. Thanks!

@reta
Copy link
Collaborator

reta commented Jun 2, 2023

@kotwanikunal may I ask you please to approve this backport? thank you

@reta reta merged commit 22c4a8f into 2.x Jun 2, 2023
@github-actions github-actions bot deleted the backport/backport-7673-to-2.x branch June 2, 2023 16:00
gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 26, 2023
…pensearch-project#7856)

* Add average,min,max and thread info to tasks response



* Update server/src/main/java/org/opensearch/tasks/TaskResourceStats.java



---------


(cherry picked from commit e3740f7)

Signed-off-by: Jay Deng <jayd0104@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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