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

Merged
merged 2 commits into from
May 13, 2024
Merged

Update expensify_prod branch #1721

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01b43de
Increase db pool limit from 25k to 100k
iwiznia May 13, 2024
ff649ea
Merge pull request #1720 from Expensify/ionatan_increasepooloimit
iwiznia May 13, 2024
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 BedrockServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void BedrockServer::sync()
int64_t mmapSizeGB = args.isSet("-mmapSizeGB") ? stoll(args["-mmapSizeGB"]) : 0;

// We use fewer FDs on test machines that have other resource restrictions in place.
int fdLimit = args.isSet("-live") ? 25'000 : 250;
int fdLimit = args.isSet("-live") ? 100'000 : 250;
SINFO("Setting dbPool size to: " << fdLimit);
_dbPool = make_shared<SQLitePool>(fdLimit, args["-db"], args.calc("-cacheSize"), args.calc("-maxJournalSize"), workerThreads, args["-synchronous"], mmapSizeGB, args.isSet("-hctree"));
SQLite& db = _dbPool->getBase();
Expand Down Expand Up @@ -703,7 +703,7 @@ void BedrockServer::runCommand(unique_ptr<BedrockCommand>&& _command, bool isBlo
}

// If we're following, we will automatically escalate any command that's:
// 1. Not already complete (complete commands are likely already returned from leader with legacy escalation)
// 1. Not already complete (complete commands are likely already returned from leader with legacy escalation)
// and is marked as `escalateImmediately` (which lets them skip the queue, which is particularly useful if they're waiting
// for a previous commit to be delivered to this follower);
// 2. Any commands if the current version of the code is not the same one as leader is executing.
Expand Down Expand Up @@ -1915,7 +1915,7 @@ void BedrockServer::_beginShutdown(const string& reason, bool detach) {
_portPluginMap.clear();
_shutdownState.store(START_SHUTDOWN);
}
SQLiteNodeState currentState = SQLiteNodeState::UNKNOWN;
SQLiteNodeState currentState = SQLiteNodeState::UNKNOWN;
auto syncNodeCopy = atomic_load(&_syncNode);
if (syncNodeCopy) {
currentState = syncNodeCopy->getState();
Expand Down