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

Merge branch 'release-5.0'

This commit is contained in:
Stephen Atherton 2017-06-01 16:03:02 -07:00
parent 6eeb453892 2d0dbd57e8
commit ac8c289296
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/fdbserver.actor.cpp
View File

@ -649,8 +649,8 @@ static void printUsage( const char *name, bool devhelp ) {
printf(" -k KEY, --key KEY Target key for search role.\n");
printf(" -m SIZE, --memory SIZE\n"
" Memory limit. The default value is 8GiB. When specified\n"
printf(" --kvfile FILE Input file (SQLite database file) for use by the 'kvfilegeneratesums' and 'kvfileintegritycheck' roles.\n");
" without a unit, MiB is assumed.\n");
printf(" --kvfile FILE Input file (SQLite database file) for use by the 'kvfilegeneratesums' and 'kvfileintegritycheck' roles.\n");
printf(" -M SIZE, --storage_memory SIZE\n"
" Maximum amount of memory used for storage. The default\n"
" value is 1GiB. When specified without a unit, MB is\n"

17
fdbserver/workloads/AtomicSwitchover.actor.cpp
View File

@ -26,16 +26,16 @@
//A workload which test the correctness of backup and restore process
struct AtomicSwitchoverWorkload : TestWorkload {
double switch1After, switch2After, stopAfter;
double switch1delay, switch2delay, stopDelay;
Standalone<VectorRef<KeyRangeRef>> backupRanges;
Database extraDB;
AtomicSwitchoverWorkload(WorkloadContext const& wcx)
: TestWorkload(wcx) {
switch1After = getOption(options, LiteralStringRef("switch1After"), 20.0);
switch2After = getOption(options, LiteralStringRef("switch2After"), 30.0);
stopAfter = getOption(options, LiteralStringRef("stopAfter"), 40.0);
switch1delay = getOption(options, LiteralStringRef("switch1delay"), 50.0);
switch2delay = getOption(options, LiteralStringRef("switch2delay"), 50.0);
stopDelay = getOption(options, LiteralStringRef("stopDelay"), 50.0);
backupRanges.push_back_deep(backupRanges.arena(), normalKeys);
@ -153,27 +153,24 @@ struct AtomicSwitchoverWorkload : TestWorkload {
ACTOR static Future<Void> _start(Database cx, AtomicSwitchoverWorkload* self) {
state DatabaseBackupAgent backupAgent(cx);
state DatabaseBackupAgent restoreAgent(self->extraDB);
state Future<Void> switch1After = delay(self->switch1After);
state Future<Void> switch2After = delay(self->switch2After);
state Future<Void> stopAfter = delay(self->stopAfter);
state Future<Void> disabler = disableConnectionFailuresAfter(300, "atomicSwitchover");
TraceEvent("AS_Wait1");
int _ = wait( backupAgent.waitBackup(self->extraDB, BackupAgentBase::getDefaultTag(), false) );
TraceEvent("AS_Ready1");
Void _ = wait( switch1After );
Void _ = wait( delay(g_random->random01()*self->switch1delay) );
TraceEvent("AS_Switch1");
Void _ = wait( backupAgent.atomicSwitchover(self->extraDB, BackupAgentBase::getDefaultTag(), self->backupRanges, StringRef(), StringRef()) );
TraceEvent("AS_Wait2");
int _ = wait( restoreAgent.waitBackup(cx, BackupAgentBase::getDefaultTag(), false) );
TraceEvent("AS_Ready2");
Void _ = wait( switch2After );
Void _ = wait( delay(g_random->random01()*self->switch2delay) );
TraceEvent("AS_Switch2");
Void _ = wait( restoreAgent.atomicSwitchover(cx, BackupAgentBase::getDefaultTag(), self->backupRanges, StringRef(), StringRef()) );
TraceEvent("AS_Wait3");
int _ = wait( backupAgent.waitBackup(self->extraDB, BackupAgentBase::getDefaultTag(), false) );
TraceEvent("AS_Ready3");
Void _ = wait( stopAfter );
Void _ = wait( delay(g_random->random01()*self->stopDelay) );
TraceEvent("AS_Abort");
Void _ = wait( backupAgent.abortBackup(self->extraDB, BackupAgentBase::getDefaultTag()) );
TraceEvent("AS_Done");

3
tests/slow/ApiCorrectnessSwitchover.txt
View File

@ -22,9 +22,6 @@ randomTestDuration=60
timeout=2100
testName=AtomicSwitchover
switch1After=10.0
switch2After=20.0
stopAfter=130.0
clearAfterTest=false
simBackupAgents=BackupToDB
extraDB=2

3
tests/slow/WriteDuringReadSwitchover.txt
View File

@ -6,9 +6,6 @@ testTitle=WriteDuringReadTest
minNode=1
testName=AtomicSwitchover
switch1After=50.0
switch2After=90.0
stopAfter=130.0
clearAfterTest=false
simBackupAgents=BackupToDB
extraDB=2