-
Notifications
You must be signed in to change notification settings - Fork 2
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
bf: S3UTILS-180 unbounded number of sproxyd keys in Map #325
bf: S3UTILS-180 unbounded number of sproxyd keys in Map #325
Conversation
Hello jonathan-gramain,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the |
ping |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
|
- Fix missing transmission of the environment variable that limits the number of keys kept in the in-memory maps (`OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE`) - Add `Number.parseInt()` calls to environment variables where needed - Sanitize a little bit the `env.js`: - reorder lexicographically - set default value of `OBJECT_REPAIR_RAFT_LOG_BEGIN_CSEQ` to `null` to make ObjectRepair use the computed default when fetched (instead of having it declared separately from `env.js`) Manually tested with a mocked oplog server returning entries with sproxyd keys: - without the fix: memory usage grows quickly (multiple GB after a few minutes) - with the fix: memory stabilizes at a level proportional to the value of `OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE` - not specifying `OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE` in the environment: stabilizes memory usage around the default value of 100000 entries.
497d185
to
15c504c
Compare
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( git fetch && \
git checkout origin/bugfix/S3UTILS-180-sproxydKeysMapGrowsUnbounded && \
git merge origin/development/1.15 Resolve merge conflicts and commit git push origin HEAD:bugfix/S3UTILS-180-sproxydKeysMapGrowsUnbounded |
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the |
/create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/1.15/bugfix/S3UTILS-180-sproxydKeysMapGrowsUnbounded origin/development/1.15
$ git merge origin/bugfix/S3UTILS-180-sproxydKeysMapGrowsUnbounded
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/1.15/bugfix/S3UTILS-180-sproxydKeysMapGrowsUnbounded The following options are set: create_integration_branches |
/approve |
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue S3UTILS-180. Goodbye jonathan-gramain. The following options are set: approve, create_integration_branches |
Fix missing transmission of the environment variable that limits the number of keys kept in the in-memory maps
(
OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE
)Add
Number.parseInt()
calls to environment variables where neededSanitize a little bit the
env.js
:reorder lexicographically
set default value of
OBJECT_REPAIR_RAFT_LOG_BEGIN_CSEQ
tonull
to make ObjectRepair use the computed default when fetched (instead of having it declared separately fromenv.js
)Manually tested with a mocked oplog server returning entries with sproxyd keys:
without the fix: memory usage grows quickly (multiple GB after a few minutes)
with the fix: memory stabilizes at a level proportional to the value of
OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE
not specifying
OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE
in the environment: stabilizes memory usage around the default value of 100000 entries.