mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 23:33:13 +09:00
Limit unacknowledged messages buffered for a connection
Every message sent over a link is kept in the send buffer until the other side acknowledges it with a heartbeat, so it can be resent if the session resumes. Nothing forced a peer to acknowledge, so a client that kept heartbeating without a sequence number while subscribed to a busy event made the controller buffer messages until it ran out of memory. Store buffered messages serialised, track their total size, and close the connection once it goes over maxSendBufferSize. The controller sets this to 64 MiB for the connections it accepts. A client that far behind could not resume in a reasonable time anyway. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
ce6bfe282f
commit
235a15b9cc
3 files changed
+74
-9
No files matched your search
@@ -13,10 +13,11 @@ describe("lib/link/connectors", function() {
|
||||
describe("._dropSendBufferSeq()", function() {
|
||||
beforeEach(function() {
|
||||
testConnector._sendBuffer = [
|
||||
{ seq: 1, type: "test", data: {} },
|
||||
{ seq: 2, type: "test", data: {} },
|
||||
{ seq: 4, type: "test", data: {} },
|
||||
{ seq: 1, text: "a" },
|
||||
{ seq: 2, text: "bb" },
|
||||
{ seq: 4, text: "cccc" },
|
||||
];
|
||||
testConnector._sendBufferSize = 7;
|
||||
});
|
||||
it("should do nothing if passed null", function() {
|
||||
testConnector._dropSendBufferSeq(null);
|
||||
@@ -25,6 +26,7 @@ describe("lib/link/connectors", function() {
|
||||
it("should drop up to sequence", function() {
|
||||
testConnector._dropSendBufferSeq(2);
|
||||
assert.equal(testConnector._sendBuffer.length, 1, "incorrect number of entries dropped");
|
||||
assert.equal(testConnector._sendBufferSize, 4);
|
||||
});
|
||||
it("should ignore holes", function() {
|
||||
testConnector._dropSendBufferSeq(3);
|
||||
@@ -61,6 +63,37 @@ describe("lib/link/connectors", function() {
|
||||
});
|
||||
});
|
||||
|
||||
describe("send buffer limit", function() {
|
||||
afterEach(function() {
|
||||
testConnector.maxSendBufferSize = Infinity;
|
||||
testConnector._closing = false;
|
||||
});
|
||||
it("should keep unacknowledged messages under the limit", function() {
|
||||
testConnector._state = "connected";
|
||||
testConnector._sendBuffer = [];
|
||||
testConnector._sendBufferSize = 0;
|
||||
testConnector._socket.closeCalled = false;
|
||||
testConnector.maxSendBufferSize = 1000;
|
||||
testConnector.send(new lib.MessageHeartbeat(1));
|
||||
assert.equal(testConnector._sendBuffer.length, 1);
|
||||
assert(!testConnector._socket.closeCalled, "Close was called on the socket");
|
||||
});
|
||||
it("should clear the buffer and close when the limit is exceeded", function() {
|
||||
testConnector._state = "connected";
|
||||
testConnector._sendBuffer = [];
|
||||
testConnector._sendBufferSize = 0;
|
||||
testConnector._socket.closeCalled = false;
|
||||
testConnector._socket.sentMessages = [];
|
||||
testConnector.maxSendBufferSize = 30;
|
||||
testConnector.send(new lib.MessageHeartbeat(1));
|
||||
testConnector.send(new lib.MessageHeartbeat(2));
|
||||
assert.equal(testConnector._sendBuffer.length, 0);
|
||||
assert.equal(testConnector._sendBufferSize, 0);
|
||||
assert(testConnector._socket.closeCalled, "Close was not called on the socket");
|
||||
assert.equal(testConnector._socket.sentMessages.length, 1);
|
||||
});
|
||||
});
|
||||
|
||||
describe(".close()", function() {
|
||||
it("should call close", function() {
|
||||
testConnector._socket.closeCalled = false;
|
||||
|
||||
Reference in new issue
Block a user