wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix OOM

This commit is contained in:
Lukas Joswiak 2021-05-07 16:28:39 -07:00
parent 71ba6f4501
commit 3f6ef14384
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fdbclient/GlobalConfig.actor.cpp
View File

@ -145,7 +145,6 @@ ACTOR Future<Void> GlobalConfig::migrate(GlobalConfig* self) {
state Optional<Value> sampleRate = wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_sample_rate/"_sr))); state Optional<Value> sampleRate = wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_sample_rate/"_sr)));
state Optional<Value> sizeLimit = wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_size_limit/"_sr))); state Optional<Value> sizeLimit = wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_size_limit/"_sr)));
loop {
try { try {
tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES); tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
// The value doesn't matter too much, as long as the key is set. // The value doesn't matter too much, as long as the key is set.
@ -166,15 +165,12 @@ ACTOR Future<Void> GlobalConfig::migrate(GlobalConfig* self) {
wait(tr->commit()); wait(tr->commit());
return Void(); return Void();
} catch (Error& e) { } catch (Error& e) {
// If multiple fdbserver processes are started at once, they will all
// attempt this migration at the same time, sometimes resulting in
// aborts due to conflicts. Purposefully avoid retrying, making this
// migration best-effort.
TraceEvent(SevInfo, "GlobalConfigMigrationError").detail("What", e.what()); TraceEvent(SevInfo, "GlobalConfigMigrationError").detail("What", e.what());
if (e.code() == error_code_not_committed) { throw;
// If multiple fdbserver processes are started at once, they
// will all attempt this migration at the same time, sometimes
// resulting in aborts due to conflicts. To avoid continuous
// contention, just return if a conflict error occurs.
return Void();
}
}
} }
} }