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.

Sign up for GitHub

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

Update expensify_prod branch #2064

Merged
merged 3 commits into from
Jan 15, 2025
Merged

Update expensify_prod branch #2064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95780b4
Fix fork when COMMIT_TRANSACTION is dropped
tylerkaraszewski Jan 13, 2025
5f74f58
Cleanup
tylerkaraszewski Jan 13, 2025
543adaa
Merge pull request #2060 from Expensify/tyler-fix-fork-dropped-messages
tylerkaraszewski Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions sqlitecluster/SQLiteNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2563,6 +2563,24 @@ STCPManager::Socket* SQLiteNode::_acceptSocket() {
return socket;
}

void SQLiteNode::_processPeerMessages(uint64_t& nextActivity, SQLitePeer* peer, bool unlimited) {
try {
size_t messagesDeqeued = 0;
while (true) {
SData message = peer->popMessage();
_onMESSAGE(peer, message);
messagesDeqeued++;
if (messagesDeqeued >= 100 && !unlimited) {
// We should run again immediately, we have more to do.
nextActivity = STimeNow();
break;
}
}
} catch (const out_of_range& e) {
// Ok, just no messages.
}
}

void SQLiteNode::postPoll(fd_map& fdm, uint64_t& nextActivity) {
unique_lock<decltype(_stateMutex)> uniqueLock(_stateMutex);

Expand Down Expand Up @@ -2638,10 +2656,12 @@ void SQLiteNode::postPoll(fd_map& fdm, uint64_t& nextActivity) {
{
_onConnect(peer);
_sendPING(peer);
_processPeerMessages(nextActivity, peer);
}
break;
case SQLitePeer::PeerPostPollStatus::SOCKET_ERROR:
{
_processPeerMessages(nextActivity, peer, true);
SData reconnect("RECONNECT");
reconnect["Reason"] = "socket error";
_sendToPeer(peer, reconnect);
Expand All @@ -2650,6 +2670,8 @@ void SQLiteNode::postPoll(fd_map& fdm, uint64_t& nextActivity) {
break;
case SQLitePeer::PeerPostPollStatus::SOCKET_CLOSED:
{
_processPeerMessages(nextActivity, peer, true);
peer->reset();
_onDisconnect(peer);
}
break;
Expand All @@ -2666,21 +2688,8 @@ void SQLiteNode::postPoll(fd_map& fdm, uint64_t& nextActivity) {
_sendPING(peer);
}
}
try {
size_t messagesDeqeued = 0;
while (true) {
SData message = peer->popMessage();
_onMESSAGE(peer, message);
messagesDeqeued++;
if (messagesDeqeued >= 100) {
// We should run again immediately, we have more to do.
nextActivity = STimeNow();
break;
}
}
} catch (const out_of_range& e) {
// Ok, just no messages.
}

_processPeerMessages(nextActivity, peer);
}
break;
}
Expand Down
2 changes: 2 additions & 0 deletions sqlitecluster/SQLiteNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ class SQLiteNode : public STCPManager {

void _dieIfForkedFromCluster();

void _processPeerMessages(uint64_t& nextActivity, SQLitePeer* peer, bool unlimited = false);

const string _commandAddress;
const string _name;
const vector<SQLitePeer*> _peerList;
Expand Down
1 change: 0 additions & 1 deletion sqlitecluster/SQLitePeer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ SQLitePeer::PeerPostPollStatus SQLitePeer::postPoll(fd_map& fdm, uint64_t& nextA
} else {
SHMMM("Lost peer connection after " << (STimeNow() - socket->openTime) / 1000 << "ms, reconnecting in " << delay / 1000 << "ms");
}
reset();
nextReconnect = STimeNow() + delay;
nextActivity = min(nextActivity, nextReconnect.load());
return PeerPostPollStatus::SOCKET_CLOSED;
Expand Down
2 changes: 2 additions & 0 deletions sqlitecluster/SQLitePeer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class SQLitePeer {
// If there are no messages, throws `std::out_of_range`.
SData popMessage();

// NOTE: If this returns PeerPostPollStatus::SOCKET_CLOSED then the caller must call `reset` on this peer.
// This is not done internally becuase we need to expose the outstanding data on the socket before deleting it.
PeerPostPollStatus postPoll(fd_map& fdm, uint64_t& nextActivity);

// Send a message to this peer. Thread-safe.
Expand Down