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

Merge branch 'release-4.6' into release-5.0

This commit is contained in:
Alec Grieser 2017-10-30 08:31:01 -07:00
parent cc37288933
commit 87321f5017
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdbserver/SimulatedCluster.actor.cpp
View File

@ -238,7 +238,7 @@ ACTOR Future<ISimulator::KillType> simulatedFDBDRebooter(
//SOMEDAY: test lower memory limits, without making them too small and causing the database to stop making progress
FlowTransport::createInstance(1);
Sim2FileSystem::newFileSystem();
//simInitTLS();
simInitTLS();
NetworkAddress n(ip, port, true, useSSL);
Future<Void> listen = FlowTransport::transport().bind( n, n );
Future<Void> fd = fdbd( connFile, localities, processClass, *dataFolder, *coordFolder, 500e6, "", "");
@ -739,11 +739,10 @@ void setupSimulatedSystem( vector<Future<Void>> *systemActors, std::string baseF
bool assignClasses = machineCount - dataCenters > 4 && g_random->random01() < 0.5;
int processesPerMachine = g_random->randomInt(1, (extraDB ? 14 : 28)/machineCount + 2 );
// Use SSL half the time
//bool sslEnabled = g_random->random01() < 0.05;
//TEST( sslEnabled ); // SSL enabled
//TEST( !sslEnabled ); // SSL disabled
bool sslEnabled = false; // FIXME: Until we have a good solution for the TLS plugin, don't test SSL connections.
// Use SSL 5% of the time
bool sslEnabled = g_random->random01() < 0.05;
TEST( sslEnabled ); // SSL enabled
TEST( !sslEnabled ); // SSL disabled
// Pick coordination processes.
int coordinatorCount = BUGGIFY ? g_random->randomInt(1, machineCount+1) : std::min( machineCount, startingConfig.maxMachineFailuresTolerated()*2 + 1 );
@ -946,7 +945,7 @@ ACTOR void setupAndRun(std::string dataFolder, const char *testFile, bool reboot
"TestSystem", 0x01010101, 1, LocalityData(Optional<Standalone<StringRef>>(), Standalone<StringRef>(g_random->randomUniqueID().toString()), Optional<Standalone<StringRef>>(), Optional<Standalone<StringRef>>()), ProcessClass(ProcessClass::TesterClass, ProcessClass::CommandLineSource), "", "" ), TaskDefaultYield ) );
Sim2FileSystem::newFileSystem();
FlowTransport::createInstance(1);
//simInitTLS();
simInitTLS();
TEST(true); // Simulation start