Improve the way Wazuh DB cleans open databases #22155
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
…e new database pool
TomasTurina
force-pushed
the
22130-fix-wazuhdb-fd-clean
branch
from
087a802 to
1cce022
Compare
vikman90
requested changes
Feb 27, 2024
There was a problem hiding this comment.
@TomasTurina I've understood where the issue was. Thanks.
The aspect I'd like to tweak is regarding the wdb_pool_size counter. It's equivalent to rbtree_size(wdb_pool.nodes) but less costly. However, it jeopardizes encapsulation by allowing someone to write directly to that variable.
My proposal is to incorporate pool_size within wdb_pool, and have wdb_pool_size() as a function,
vikman90
force-pushed
the
22130-fix-wazuhdb-fd-clean
branch
from
37ac398 to
b5c85cf
Compare
vikman90
approved these changes
Feb 27, 2024
Closed
10 tasks
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.
Description
It was discovered that the
wdb_pool_sizevariable could contain an invalid value, which could cause an excessive number of file descriptors to be opened and thewazuh-dbdaemon to use excessive memory due to an incorrect filter in the database cleaning. This was because thewdb_closefunction (wherewdb_pool_sizewas decremented) is not always called with a valid database pointer, which could lead to decrementing the number ofwdb_pool_sizewhen it was not necessary.This PR replaces the
wdb_open_countvariable withwdb_pool_size. This new variable corresponds to the number of nodes that are stored inwdb_poolwhere all open objects are stored, whether the database is already open or not.This new variable is used as a filter in the
wdb_close_oldfunction instead ofwdb_pool_size. Now, every time a new node is created/deleted, this new variable is modified, so it will always correspond to the current number of databases stored in memory.Tests