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

Decrement commitBatchesMemBytesCount when rejecting commit batch release-6.3 #4526

Merged
merged 6 commits into from Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -7,6 +7,7 @@ Release Notes
6.3.12
======
* Change the default for --knob_tls_server_handshake_threads to 64. The previous was 1000. This avoids starting 1000 threads by default, but may adversely affect recovery time for large clusters using tls. Users with large tls clusters should consider explicitly setting this knob in their foundationdb.conf file. `(PR #4421) <https://github.com/apple/foundationdb/pull/4421>`_
* Bug fix, MasterProxyServer did not decrement latestLocalCommitBatchResolving for a commit batch which was rejected, resulting in commit faliures. `(PR #4526) <https://github.com/apple/foundationdb/pull/4526>`_
sfc-gh-nwijetunga marked this conversation as resolved.
Show resolved Hide resolved

6.3.11
======
Expand Down
1 change: 1 addition & 0 deletions fdbserver/MasterProxyServer.actor.cpp
Expand Up @@ -1025,6 +1025,7 @@ ACTOR Future<Void> commitBatch(ProxyCommitData* self,
++self->stats.commitBatchOut;
self->stats.txnCommitOut += trs.size();
self->stats.txnRejectedForQueuedTooLong += trs.size();
self->commitBatchesMemBytesCount -= currentBatchMemBytesCount;
return Void();
}

Expand Down