remove unused variables

This commit is contained in:
Xiaoxi Wang 2021-08-03 10:15:34 -07:00
parent 26e4797d64
commit 2337ec7d4e
1 changed files with 5 additions and 8 deletions

View File

@ -3967,7 +3967,6 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncVar<bool>* stopSignal, ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncVar<bool>* stopSignal,
FutureStream<Void> finishStorageWiggleSignal, FutureStream<Void> finishStorageWiggleSignal,
DDTeamCollection* teamCollection) { DDTeamCollection* teamCollection) {
state int lastFinishTime = now();
loop { loop {
choose { choose {
when(wait(stopSignal->onChange())) {} when(wait(stopSignal->onChange())) {}
@ -4047,8 +4046,7 @@ ACTOR Future<Void> clusterHealthCheckForPerpetualWiggle(DDTeamCollection* self,
// cluster is unhealthy and restarted once the cluster is healthy again. // cluster is unhealthy and restarted once the cluster is healthy again.
ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal, ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
PromiseStream<Void> finishStorageWiggleSignal, PromiseStream<Void> finishStorageWiggleSignal,
DDTeamCollection* self, DDTeamCollection* self) {
const DDEnabledState* ddEnabledState) {
state Future<Void> watchFuture = Never(); state Future<Void> watchFuture = Never();
state Future<Void> moveFinishFuture = Never(); state Future<Void> moveFinishFuture = Never();
state int extraTeamCount = 0; state int extraTeamCount = 0;
@ -4132,8 +4130,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
// This coroutine sets a watch to monitor the value change of `perpetualStorageWiggleKey` which is controlled by command // This coroutine sets a watch to monitor the value change of `perpetualStorageWiggleKey` which is controlled by command
// `configure perpetual_storage_wiggle=$value` if the value is 1, this actor start 2 actors, // `configure perpetual_storage_wiggle=$value` if the value is 1, this actor start 2 actors,
// `perpetualStorageWiggleIterator` and `perpetualStorageWiggler`. Otherwise, it sends stop signal to them. // `perpetualStorageWiggleIterator` and `perpetualStorageWiggler`. Otherwise, it sends stop signal to them.
ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollection, ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollection) {
const DDEnabledState* ddEnabledState) {
state int speed = 0; state int speed = 0;
state AsyncVar<bool> stopWiggleSignal(true); state AsyncVar<bool> stopWiggleSignal(true);
state PromiseStream<Void> finishStorageWiggleSignal; state PromiseStream<Void> finishStorageWiggleSignal;
@ -4158,8 +4155,8 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
stopWiggleSignal.set(false); stopWiggleSignal.set(false);
collection.add(perpetualStorageWiggleIterator( collection.add(perpetualStorageWiggleIterator(
&stopWiggleSignal, finishStorageWiggleSignal.getFuture(), teamCollection)); &stopWiggleSignal, finishStorageWiggleSignal.getFuture(), teamCollection));
collection.add(perpetualStorageWiggler( collection.add(
&stopWiggleSignal, finishStorageWiggleSignal, teamCollection, ddEnabledState)); perpetualStorageWiggler(&stopWiggleSignal, finishStorageWiggleSignal, teamCollection));
TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId).log(); TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId).log();
} else if (speed == 0) { } else if (speed == 0) {
if (!stopWiggleSignal.get()) { if (!stopWiggleSignal.get()) {
@ -5564,7 +5561,7 @@ ACTOR Future<Void> dataDistributionTeamCollection(Reference<DDTeamCollection> te
self->addActor.send(waitHealthyZoneChange(self)); self->addActor.send(waitHealthyZoneChange(self));
if (self->primary) { // the primary dc also handle the satellite dc's perpetual wiggling if (self->primary) { // the primary dc also handle the satellite dc's perpetual wiggling
self->addActor.send(monitorPerpetualStorageWiggle(self, ddEnabledState)); self->addActor.send(monitorPerpetualStorageWiggle(self));
} }
// SOMEDAY: Monitor FF/serverList for (new) servers that aren't in allServers and add or remove them // SOMEDAY: Monitor FF/serverList for (new) servers that aren't in allServers and add or remove them