more compile fixes

This commit is contained in:
Evan Tschannen 2020-07-09 22:57:43 -07:00
parent f6163d0a79
commit 33c9b1374a

View File

@ -146,7 +146,7 @@ ACTOR Future<Void> resetChecker( ILogSystem::ServerPeekCursor* self, NetworkAddr
return Void(); return Void();
} }
ACTOR Future<TLogPeekReply> recordRequestMetrics( ILogSystem::ServerPeekCursor* self, Future<TLogPeekReply> in, NetworkAddress addr ) { ACTOR Future<TLogPeekReply> recordRequestMetrics( ILogSystem::ServerPeekCursor* self, NetworkAddress addr, Future<TLogPeekReply> in ) {
try { try {
state double startTime = now(); state double startTime = now();
TLogPeekReply t = wait(in); TLogPeekReply t = wait(in);
@ -190,7 +190,7 @@ ACTOR Future<Void> serverPeekParallelGetMore( ILogSystem::ServerPeekCursor* self
try { try {
if (self->parallelGetMore || self->onlySpilled) { if (self->parallelGetMore || self->onlySpilled) {
while(self->futureResults.size() < SERVER_KNOBS->PARALLEL_GET_MORE_REQUESTS && self->interf->get().present()) { while(self->futureResults.size() < SERVER_KNOBS->PARALLEL_GET_MORE_REQUESTS && self->interf->get().present()) {
self->futureResults.push_back( recordRequestMetrics( self, self->interf->get().interf().peekMessages.getReply(TLogPeekRequest(self->messageVersion.version,self->tag,self->returnIfBlocked, self->onlySpilled, std::make_pair(self->randomID, self->sequence++)), taskID) ) ); self->futureResults.push_back( recordRequestMetrics( self, self->interf->get().interf().peekMessages.getEndpoint().getPrimaryAddress(), self->interf->get().interf().peekMessages.getReply(TLogPeekRequest(self->messageVersion.version,self->tag,self->returnIfBlocked, self->onlySpilled, std::make_pair(self->randomID, self->sequence++)), taskID) ) );
} }
if (self->sequence == std::numeric_limits<decltype(self->sequence)>::max()) { if (self->sequence == std::numeric_limits<decltype(self->sequence)>::max()) {
throw timed_out(); throw timed_out();