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 #1600

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Update expensify_prod branch #1600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1addc05
Demote warnings
tylerkaraszewski Oct 30, 2023
2d9259b
Merge pull request #1599 from Expensify/tyler-demote-some-warnings
tylerkaraszewski Oct 30, 2023
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
6 changes: 3 additions & 3 deletions sqlitecluster/SQLiteNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,17 +1276,17 @@ void SQLiteNode::_onMESSAGE(SQLitePeer* peer, const SData& message) {

if (quorumUpToDate && _commitsBlocked) {
_commitsBlocked = false;
SWARN("[clustersync] Cluster is no longer behind by over " << MAX_PEER_FALL_BEHIND << " commits. Unblocking new commits.");
SINFO("[clustersync] Cluster is no longer behind by over " << MAX_PEER_FALL_BEHIND << " commits. Unblocking new commits.");
_db.exclusiveUnlockDB();
} else if (!quorumUpToDate && !_commitsBlocked && !_db.insideTransaction()) {
_commitsBlocked = true;
uint64_t myCommitCount = getCommitCount();
SWARN("[clustersync] Cluster is behind by over " << MAX_PEER_FALL_BEHIND << " commits. New commits blocked until the cluster catches up.");
uint64_t start = STimeNow();
_db.exclusiveLockDB();
SWARN("[clustersync] Took " << (STimeNow() - start) << "us to block commits. Dumping cluster commit state. I have commit: " << myCommitCount);
SINFO("[clustersync] Took " << (STimeNow() - start) << "us to block commits. Dumping cluster commit state. I have commit: " << myCommitCount);
for (const auto& p : _peerList) {
SWARN("[clustersync] Peer " << p->name << " has commit " << p->commitCount << ", behind by: " << (myCommitCount - p->commitCount));
SINFO("[clustersync] Peer " << p->name << " has commit " << p->commitCount << ", behind by: " << (myCommitCount - p->commitCount));
}
}
}
Expand Down