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

Merge pull request #10379 from jzhou77/main 

Fix a simulation DR stuck issue
This commit is contained in:
Jingyu Zhou 2023-05-30 14:13:51 -07:00 committed by GitHub
parent f94eada7c0 43d67d6f98
commit f69d59aacd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdbclient/DatabaseBackupAgent.actor.cpp
View File

@ -26,7 +26,9 @@
#include "fdbclient/NativeAPI.actor.h"
#include <ctime>
#include <climits>
#include "fdbrpc/simulator.h"
#include "flow/IAsyncFile.h"
#include "flow/flow.h"
#include "flow/genericactors.actor.h"
#include "flow/Hash3.h"
#include <numeric>
@ -361,8 +363,10 @@ struct BackupRangeTaskFunc : TaskFuncBase {
if ((!prevAdjacent || !nextAdjacent) &&
rangeCount > ((prevAdjacent || nextAdjacent) ? CLIENT_KNOBS->BACKUP_MAP_KEY_UPPER_LIMIT
: CLIENT_KNOBS->BACKUP_MAP_KEY_LOWER_LIMIT)) {
CODE_PROBE(true, "range insert delayed because too versionMap is too large");
: CLIENT_KNOBS->BACKUP_MAP_KEY_LOWER_LIMIT) &&
(!g_network->isSimulated() ||
(isBuggifyEnabled(BuggifyType::General) && !g_simulator->speedUpSimulation))) {
CODE_PROBE(true, "range insert delayed because versionMap is too large");
if (rangeCount > CLIENT_KNOBS->BACKUP_MAP_KEY_UPPER_LIMIT)
TraceEvent(SevWarnAlways, "DBA_KeyRangeMapTooLarge").log();