-
Notifications
You must be signed in to change notification settings - Fork 376
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
Use matras statistics for memtx memory info #8482
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
You have successfully added a new CodeQL configuration |
alyapunov
approved these changes
Mar 23, 2023
This commit pulls matras statistics. Needed for tarantool/tarantool-ee#143 NO_DOC=refactoring NO_TEST=refactoring NO_CHANGELOG=refactoring
Simply forward the new matras_stats argument to matras_create(). Currently, it's only used in tests. While we are at it: - Drop custom alloc/free func types in favor of matras types since now container constructors depend on matras_stats anyway. - Rearrange arguments order to group allocator-related arguments together. - Drop rtree_init return value (it's always 0). Needed for tarantool/tarantool-ee#143 NO_DOC=refactoring NO_CHANGELOG=refactoring
ca475d6
to
b5958c1
Compare
We need matras statistics for reporting read view memory usage, see tarantool/tarantool-ee#143. Let's also use them for reporting index memory usage in box.info.memory() for consistency and add a test. While we are at it, drop unused memtx_index_extent_pool declaration, which is a leftover from commit 3d13888 ("memtx: move all global variables to engine"). NO_DOC=refactoring NO_CHANGELOG=refactoring
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR bumps the small submodule to pull matras statistics and makes memtx use the new statistics for
box.info.memory()
.Needed for https://github.com/tarantool/tarantool-ee/issues/143
Related PRs: tarantool/small#60 tarantool/small#61 https://github.com/tarantool/tarantool-ee/pull/424