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

fix merge conflicts

This commit is contained in:
Richard Chen 2020-10-19 16:58:55 +00:00
parent a4ccf8c5b6 8c96763ea9
commit f2a8687c7c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbrpc/FlowTransport.actor.cpp
View File

@ -177,8 +177,8 @@ struct EndpointNotFoundReceiver final : NetworkMessageReceiver {
EndpointNotFoundReceiver(EndpointMap& endpoints) {
endpoints.insertWellKnown(this, WLTOKEN_ENDPOINT_NOT_FOUND, TaskPriority::DefaultEndpoint);
}
void receive(ArenaObjectReader& reader) override {
// Remote machine tells us it doesn't have endpoint e
Endpoint e;
reader.deserialize(e);
IFailureMonitor::failureMonitor().endpointNotFound(e);

8
fdbserver/SimulatedCluster.actor.cpp
View File

@ -1352,7 +1352,11 @@ void setupSimulatedSystem(vector<Future<Void>>* systemActors, std::string baseFo
}
void checkTestConf(const char* testFile, int& extraDB, int& minimumReplication, int& minimumRegions,
<<<<<<< HEAD
int& configureLocked, int& logAntiQuorum, bool& startIncompatibleProcess) {
=======
int& configureLocked, bool& startIncompatibleProcess) {
>>>>>>> 8c96763ea96f39c55a881b391d95a717207a5683
std::ifstream ifs;
ifs.open(testFile, std::ifstream::in);
if (!ifs.good())
@ -1441,7 +1445,11 @@ ACTOR void setupAndRun(std::string dataFolder, const char *testFile, bool reboot
else {
g_expect_full_pointermap = 1;
setupSimulatedSystem(&systemActors, dataFolder, &testerCount, &connFile, &startingConfiguration, extraDB,
<<<<<<< HEAD
minimumReplication, minimumRegions, whitelistBinPaths, configureLocked, logAntiQuorum, protocolVersion);
=======
minimumReplication, minimumRegions, whitelistBinPaths, configureLocked, protocolVersion);
>>>>>>> 8c96763ea96f39c55a881b391d95a717207a5683
wait( delay(1.0) ); // FIXME: WHY!!! //wait for machines to boot
}
std::string clusterFileDir = joinPath( dataFolder, deterministicRandom()->randomUniqueID().toString() );