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

forgot to fix merge conflicts

This commit is contained in:
Evan Tschannen 2019-02-18 17:09:55 -08:00
parent 065a45e05f
commit ed9e20ce17
3 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbclient/ManagementAPI.actor.cpp
View File

@ -1550,12 +1550,6 @@ ACTOR Future<Void> forceRecovery( Reference<ClusterConnectionFile> clusterFile,
when ( wait( clusterInterface->onChange() )) {}
}
}
<<<<<<< HEAD
=======
wait(success(clusterInterface->get().get().forceRecovery.tryGetReply( ForceRecoveryRequest() )));
return Void();
>>>>>>> master
}
ACTOR Future<Void> waitForPrimaryDC( Database cx, StringRef dcId ) {

25
fdbserver/ClusterController.actor.cpp
View File

@ -2262,7 +2262,6 @@ ACTOR Future<Void> updateDatacenterVersionDifference( ClusterControllerData *sel
}
}
<<<<<<< HEAD
ACTOR Future<Void> doEmptyCommit(Database cx) {
state Transaction tr(cx);
loop {
@ -2303,7 +2302,9 @@ ACTOR Future<Void> handleForcedRecoveries( ClusterControllerData *self, ClusterC
TraceEvent("ForcedRecoveryFinish", self->id);
self->db.forceRecovery = false;
req.reply.send(Void());
=======
}
}
ACTOR Future<DataDistributorInterface> startDataDistributor( ClusterControllerData *self ) {
state Optional<Key> dcId = self->clusterControllerDcId;
while ( !self->clusterControllerProcessId.present() || !self->masterProcessId.present() ) {
@ -2363,7 +2364,6 @@ ACTOR Future<Void> waitDDRejoinOrStartDD( ClusterControllerData *self, ClusterCo
DataDistributorInterface distributorInterf = wait( startDataDistributor(self) );
self->db.setDistributor( distributorInterf );
}
>>>>>>> master
}
}
@ -2371,23 +2371,6 @@ ACTOR Future<Void> clusterControllerCore( ClusterControllerFullInterface interf,
state ClusterControllerData self( interf, locality );
state Future<Void> coordinationPingDelay = delay( SERVER_KNOBS->WORKER_COORDINATION_PING_DELAY );
state uint64_t step = 0;
<<<<<<< HEAD
state PromiseStream<Future<Void>> addActor;
state Future<ErrorOr<Void>> error = errorOr( actorCollection( addActor.getFuture() ) );
auto pSelf = &self;
addActor.send( failureDetectionServer( self.id, &self.db, interf.clientInterface.failureMonitoring.getFuture() ) );
addActor.send( clusterWatchDatabase( &self, &self.db ) ); // Start the master database
addActor.send( self.updateWorkerList.init( self.db.db ) );
addActor.send( statusServer( interf.clientInterface.databaseStatus.getFuture(), &self, coordinators));
addActor.send( timeKeeper(&self) );
addActor.send( monitorProcessClasses(&self) );
addActor.send( monitorClientTxnInfoConfigs(&self.db) );
addActor.send( updatedChangingDatacenters(&self) );
addActor.send( updatedChangedDatacenters(&self) );
addActor.send( updateDatacenterVersionDifference(&self) );
addActor.send( handleForcedRecoveries(&self, interf) );
=======
state Future<ErrorOr<Void>> error = errorOr( actorCollection( self.addActor.getFuture() ) );
self.addActor.send( failureDetectionServer( self.id, &self.db, interf.clientInterface.failureMonitoring.getFuture() ) );
@ -2401,7 +2384,7 @@ ACTOR Future<Void> clusterControllerCore( ClusterControllerFullInterface interf,
self.addActor.send( updatedChangedDatacenters(&self) );
self.addActor.send( updateDatacenterVersionDifference(&self) );
self.addActor.send( waitDDRejoinOrStartDD(&self, &interf) );
>>>>>>> master
self.addActor.send( handleForcedRecoveries(&self, interf) );
//printf("%s: I am the cluster controller\n", g_network->getLocalAddress().toString().c_str());
loop choose {

10
fdbserver/workloads/KillRegion.actor.cpp
View File

@ -68,7 +68,6 @@ struct KillRegionWorkload : TestWorkload {
ACTOR static Future<Void> killRegion( KillRegionWorkload *self, Database cx ) {
ASSERT( g_network->isSimulated() );
<<<<<<< HEAD
if(g_random->random01() < 0.5) {
TraceEvent("ForceRecovery_DisableRemoteBegin");
ConfigurationResult::Type _ = wait( changeConfig( cx, g_simulator.disableRemote, true ) );
@ -78,15 +77,6 @@ struct KillRegionWorkload : TestWorkload {
ConfigurationResult::Type _ = wait( changeConfig( cx, g_simulator.originalRegions, true ) );
}
TraceEvent("ForceRecovery_Wait");
=======
TraceEvent("ForceRecovery_DisableRemoteBegin");
wait(success( changeConfig( cx, g_simulator.disableRemote, true ) ));
TraceEvent("ForceRecovery_WaitForPrimary");
wait( waitForPrimaryDC(cx, LiteralStringRef("0")) );
TraceEvent("ForceRecovery_DisableRemoteComplete");
wait(success( changeConfig( cx, g_simulator.originalRegions, true ) ));
TraceEvent("ForceRecovery_RestoreOriginalComplete");
>>>>>>> master
wait( delay( g_random->random01() * self->testDuration ) );
g_simulator.killDataCenter( LiteralStringRef("0"), g_random->random01() < 0.5 ? ISimulator::KillInstantly : ISimulator::RebootAndDelete, true );