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

Make file cache stats consistent with other APIs #7169

Merged

Conversation

andrross
Copy link
Member

Some cosmetic changes here to make the stat names consistent with RequestCacheStats and QueryCacheStats that already exist in the API.

I've also removed the 'replaced' and 'removed' stats. These are internal cache details that I don't think will be useful to a user. We can always add them back later if needed.

Note this is backward incompatible, but this is okay as this will get in ahead of the next release which removes the feature flag from searchable snapshots.

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
Contributor

Gradle Check (Jenkins) Run Completed with:

Some cosmetic changes here to make the stat names consistent with
[RequestCacheStats][1] and [QueryCacheStats][2] that already exist in
the API.

I've also removed the 'replaced' and 'removed' stats. These are internal
cache details that I don't think will be useful to a user. We can always
add them back later if needed.

Note this is backward incompatible, but this is okay as this will get in
ahead of the next release which removes the feature flag from searchable
snapshots.

[1]: https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/index/cache/request/RequestCacheStats.java
[2]: https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/index/cache/query/QueryCacheStats.java

Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross force-pushed the file-cache-stats-api-update branch from 4f1fcd7 to e395c4a Compare April 15, 2023 04:05
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@andrross
Copy link
Member Author

Known test failure: #6287

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.indices.replication.SegmentReplicationIT.testScrollWithOngoingSegmentReplication

@codecov-commenter
Copy link

Codecov Report

Merging #7169 (e395c4a) into main (3cb2565) will decrease coverage by 0.02%.
The diff coverage is 65.07%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main    #7169      +/-   ##
============================================
- Coverage     70.67%   70.65%   -0.02%     
- Complexity    59457    59479      +22     
============================================
  Files          4852     4848       -4     
  Lines        285189   285146      -43     
  Branches      41118    41111       -7     
============================================
- Hits         201564   201483      -81     
- Misses        67042    67106      +64     
+ Partials      16583    16557      -26     
Impacted Files Coverage Δ
...ark/store/remote/filecache/FileCacheBenchmark.java 0.00% <0.00%> (ø)
...ch/index/codec/customcodecs/CustomCodecPlugin.java 0.00% <ø> (ø)
...customcodecs/Lucene95CustomStoredFieldsFormat.java 25.00% <ø> (ø)
...opensearch/index/codec/customcodecs/ZstdCodec.java 80.00% <ø> (ø)
.../index/codec/customcodecs/ZstdCompressionMode.java 84.09% <ø> (ø)
...arch/index/codec/customcodecs/ZstdNoDictCodec.java 80.00% <ø> (ø)
.../codec/customcodecs/ZstdNoDictCompressionMode.java 76.71% <ø> (ø)
...rch/action/admin/cluster/node/stats/NodeStats.java 52.43% <0.00%> (+0.60%) ⬆️
...org/opensearch/cluster/routing/RecoverySource.java 71.11% <0.00%> (-1.49%) ⬇️
...rg/opensearch/common/settings/ClusterSettings.java 92.85% <ø> (-0.33%) ⬇️
... and 16 more

... and 516 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@kotwanikunal kotwanikunal merged commit 621b27f into opensearch-project:main Apr 16, 2023
@kotwanikunal kotwanikunal added the backport 2.x Backport to 2.x branch label Apr 16, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 16, 2023
Some cosmetic changes here to make the stat names consistent with
[RequestCacheStats][1] and [QueryCacheStats][2] that already exist in
the API.

I've also removed the 'replaced' and 'removed' stats. These are internal
cache details that I don't think will be useful to a user. We can always
add them back later if needed.

Note this is backward incompatible, but this is okay as this will get in
ahead of the next release which removes the feature flag from searchable
snapshots.

[1]: https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/index/cache/request/RequestCacheStats.java
[2]: https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/index/cache/query/QueryCacheStats.java

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 621b27f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
andrross pushed a commit that referenced this pull request Apr 17, 2023
Some cosmetic changes here to make the stat names consistent with
[RequestCacheStats][1] and [QueryCacheStats][2] that already exist in
the API.

I've also removed the 'replaced' and 'removed' stats. These are internal
cache details that I don't think will be useful to a user. We can always
add them back later if needed.

Note this is backward incompatible, but this is okay as this will get in
ahead of the next release which removes the feature flag from searchable
snapshots.

[1]: https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/index/cache/request/RequestCacheStats.java
[2]: https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/index/cache/query/QueryCacheStats.java


(cherry picked from commit 621b27f)

Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@andrross andrross deleted the file-cache-stats-api-update branch April 17, 2023 17:09
austintlee pushed a commit to austintlee/OpenSearch that referenced this pull request Apr 28, 2023
…7169)

Some cosmetic changes here to make the stat names consistent with
[RequestCacheStats][1] and [QueryCacheStats][2] that already exist in
the API.

I've also removed the 'replaced' and 'removed' stats. These are internal
cache details that I don't think will be useful to a user. We can always
add them back later if needed.

Note this is backward incompatible, but this is okay as this will get in
ahead of the next release which removes the feature flag from searchable
snapshots.

[1]: https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/index/cache/request/RequestCacheStats.java
[2]: https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/index/cache/query/QueryCacheStats.java

Signed-off-by: Andrew Ross <andrross@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants