diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp index 29f52af11c..b32b65f64d 100644 --- a/fdbserver/DataDistribution.actor.cpp +++ b/fdbserver/DataDistribution.actor.cpp @@ -754,7 +754,7 @@ ACTOR Future dataDistribution(Reference self, shardsAffectedByTeamFailure, lock, getAverageShardBytes, - getUnhealthyRelocationCount, + getUnhealthyRelocationCount.getFuture(), getMinReplicasRemaining, self->ddId, storageTeamSize, diff --git a/fdbserver/DataDistribution.actor.h b/fdbserver/DataDistribution.actor.h index f271d336d3..7be59943a7 100644 --- a/fdbserver/DataDistribution.actor.h +++ b/fdbserver/DataDistribution.actor.h @@ -267,7 +267,7 @@ ACTOR Future dataDistributionQueue(Database cx, Reference shardsAffectedByTeamFailure, MoveKeysLock lock, PromiseStream> getAverageShardBytes, - PromiseStream> getUnhealthyRelocationCount, + FutureStream> getUnhealthyRelocationCount, FutureStream>> getMinRemainingReplicas, UID distributorId, int teamSize, diff --git a/fdbserver/DataDistributionQueue.actor.cpp b/fdbserver/DataDistributionQueue.actor.cpp index b5e88a93e5..755e096a52 100644 --- a/fdbserver/DataDistributionQueue.actor.cpp +++ b/fdbserver/DataDistributionQueue.actor.cpp @@ -1722,7 +1722,7 @@ ACTOR Future dataDistributionQueue(Database cx, Reference shardsAffectedByTeamFailure, MoveKeysLock lock, PromiseStream> getAverageShardBytes, - PromiseStream> getUnhealthyRelocationCount, + FutureStream> getUnhealthyRelocationCount, FutureStream>> getMinReplicasRemaining, UID distributorId, int teamSize, @@ -1854,9 +1854,7 @@ ACTOR Future dataDistributionQueue(Database cx, when(Promise> r = waitNext(getMinReplicasRemaining)) { r.send(self.getMinReplicasRemaining()); } - when(Promise r = waitNext(getUnhealthyRelocationCount.getFuture())) { - r.send(self.unhealthyRelocations); - } + when(Promise r = waitNext(getUnhealthyRelocationCount)) { r.send(self.unhealthyRelocations); } when(wait(self.error.getFuture())) {} // Propagate errors from dataDistributionRelocator when(wait(waitForAll(balancingFutures))) {} }