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

Use matras statistics for memtx memory info #8482

Merged
merged 3 commits into from
Mar 23, 2023

Conversation

locker
Copy link
Member

@locker locker commented Mar 22, 2023

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

@github-advanced-security
Copy link

You have successfully added a new CodeQL configuration /language:cpp. As part of the setup process, we have scanned this repository and found 21 existing alerts. Please check the repository Security tab to see all alerts.

@coveralls
Copy link

coveralls commented Mar 22, 2023

Coverage Status

Coverage: 85.638% (-0.01%) from 85.652% when pulling 4f70d47 on locker:matras-stat into f05e683
on tarantool:master
.

@locker locker requested a review from alyapunov March 22, 2023 13:33
@locker locker removed the do not merge Not ready to be merged label Mar 22, 2023
@locker locker assigned locker and unassigned alyapunov Mar 23, 2023
@locker locker added the do not merge Not ready to be merged label 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
@locker locker removed the do not merge Not ready to be merged label Mar 23, 2023
@locker locker force-pushed the matras-stat branch 2 times, most recently from ca475d6 to b5958c1 Compare March 23, 2023 15:01
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
@locker locker added the full-ci Enables all tests for a pull request label Mar 23, 2023
@locker locker merged commit fffdd79 into tarantool:master Mar 23, 2023
@locker locker deleted the matras-stat branch March 23, 2023 15:56
@locker locker linked an issue Mar 27, 2023 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
full-ci Enables all tests for a pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Memtx read view statistics
3 participants