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

fix wlm stats output #16278

Merged
merged 3 commits into from
Oct 11, 2024
Merged

Conversation

kaushalmahi12
Copy link
Contributor

@kaushalmahi12 kaushalmahi12 commented Oct 11, 2024

Description

This change is to disambiguate the wlm stats representation and make it more easily comprehendible

Related Issues

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

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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: Kaushal Kumar <[email protected]>
Signed-off-by: Kaushal Kumar <[email protected]>
Copy link
Contributor

❌ Gradle check result for c4566b4: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@jainankitk
Copy link
Collaborator

@kaushalmahi12 - Failing test looks related to the changes:

[Test Result](https://build.ci.opensearch.org/job/gradle-check/49265/testReport/) (1 failure / +1)

    [org.opensearch.action.admin.cluster.wlm.WlmStatsResponseTests.testToString](https://build.ci.opensearch.org/job/gradle-check/49265/testReport/junit/org.opensearch.action.admin.cluster.wlm/WlmStatsResponseTests/testToString/)

Signed-off-by: Kaushal Kumar <[email protected]>
@kaushalmahi12
Copy link
Contributor Author

@kaushalmahi12 - Failing test looks related to the changes:

Missed this since this was in separate package. fixed it now..

@jainankitk jainankitk added the backport 2.x Backport to 2.x branch label Oct 11, 2024
Copy link
Contributor

❌ Gradle check result for 7209d6e: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@jainankitk
Copy link
Collaborator

Unrelated failure:

[Test Result](https://build.ci.opensearch.org/job/gradle-check/49267/testReport/) (1 failure / +1)

    [org.opensearch.index.translog.RemoteFsTimestampAwareTranslogTests.testMetadataFileDeletionWithPinnedTimestamps](https://build.ci.opensearch.org/job/gradle-check/49267/testReport/junit/org.opensearch.index.translog/RemoteFsTimestampAwareTranslogTests/testMetadataFileDeletionWithPinnedTimestamps/)

Copy link
Contributor

❌ Gradle check result for 7209d6e: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@jainankitk
Copy link
Collaborator

Unrelated failures, retrying gradle check:

[Test Result](https://build.ci.opensearch.org/job/gradle-check/49270/testReport/) (5 failures / +4)

    [org.opensearch.cluster.MinimumClusterManagerNodesIT.testThreeNodesNoClusterManagerBlock](https://build.ci.opensearch.org/job/gradle-check/49270/testReport/junit/org.opensearch.cluster/MinimumClusterManagerNodesIT/testThreeNodesNoClusterManagerBlock/)
    [org.opensearch.cluster.MinimumClusterManagerNodesIT.testThreeNodesNoClusterManagerBlock](https://build.ci.opensearch.org/job/gradle-check/49270/testReport/junit/org.opensearch.cluster/MinimumClusterManagerNodesIT/testThreeNodesNoClusterManagerBlock_2/)
    [org.opensearch.cluster.MinimumClusterManagerNodesIT.testThreeNodesNoClusterManagerBlock](https://build.ci.opensearch.org/job/gradle-check/49270/testReport/junit/org.opensearch.cluster/MinimumClusterManagerNodesIT/testThreeNodesNoClusterManagerBlock_3/)
    [org.opensearch.cluster.MinimumClusterManagerNodesIT.testThreeNodesNoClusterManagerBlock](https://build.ci.opensearch.org/job/gradle-check/49270/testReport/junit/org.opensearch.cluster/MinimumClusterManagerNodesIT/testThreeNodesNoClusterManagerBlock_4/)
    [org.opensearch.cluster.SpecificClusterManagerNodesIT.testElectOnlyBetweenClusterManagerNodes](https://build.ci.opensearch.org/job/gradle-check/49270/testReport/junit/org.opensearch.cluster/SpecificClusterManagerNodesIT/testElectOnlyBetweenClusterManagerNodes/)

Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally LGTM. Two questions:

  • we're changing output to an existing API. Is this API/backwards compatible or an acceptable change?
  • Is there an update to the documentation (see PR template for check box) or REST API associated here?

@jainankitk
Copy link
Collaborator

Generally LGTM. Two questions:

* we're changing output to an existing API. Is this API/backwards compatible or an acceptable change?

* Is there an update to the documentation (see PR template for check box) or REST API associated here?

@dbwiddis - Thanks for sharing your thoughts. Backward compatibility should not be an issue as the API was recently added and not part of 2.17 release. Good point regarding the documentation update.

@kaushalmahi12 @ruai0511 - Have we added documentation for wlm stats api already? If no, can we link the documentation issue to this PR? If yes, we should create issue to update the documentation

@jainankitk jainankitk added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels Oct 11, 2024
@kaushalmahi12
Copy link
Contributor Author

opensearch-project/documentation-website#8194 - This is the high level issue here. We will be adding the documentation in coming days.

Copy link
Contributor

✅ Gradle check result for 7209d6e: SUCCESS

Copy link

codecov bot commented Oct 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.01%. Comparing base (691f725) to head (7209d6e).
Report is 3 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #16278      +/-   ##
============================================
- Coverage     72.06%   72.01%   -0.05%     
+ Complexity    64822    64813       -9     
============================================
  Files          5308     5308              
  Lines        302574   302555      -19     
  Branches      43710    43709       -1     
============================================
- Hits         218048   217899     -149     
- Misses        66648    66823     +175     
+ Partials      17878    17833      -45     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jainankitk jainankitk merged commit 34b794b into opensearch-project:main Oct 11, 2024
49 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-16278-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 34b794b93b94d0329fcd6eb8ec2f70fa782729ad
# Push it to GitHub
git push --set-upstream origin backport/backport-16278-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-16278-to-2.x.

dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 16, 2024
* fix wlm stats output

Signed-off-by: Kaushal Kumar <[email protected]>

* rename wlm stats vars

Signed-off-by: Kaushal Kumar <[email protected]>

* fix ut failure

Signed-off-by: Kaushal Kumar <[email protected]>

---------

Signed-off-by: Kaushal Kumar <[email protected]>
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 17, 2024
* fix wlm stats output

Signed-off-by: Kaushal Kumar <[email protected]>

* rename wlm stats vars

Signed-off-by: Kaushal Kumar <[email protected]>

* fix ut failure

Signed-off-by: Kaushal Kumar <[email protected]>

---------

Signed-off-by: Kaushal Kumar <[email protected]>
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