From e43fde16ec203dc9df3a69cbe00a6c8ee9bc1dac Mon Sep 17 00:00:00 2001 From: Dan Lambright Date: Fri, 8 Apr 2022 17:28:16 -0400 Subject: [PATCH] formatting --- fdbclient/NativeAPI.actor.cpp | 52 ++++++++--------------------- fdbserver/BackupWorker.actor.cpp | 8 ++--- fdbserver/ClusterRecovery.actor.cpp | 20 +++-------- fdbserver/Resolver.actor.cpp | 8 ++--- fdbserver/TLogServer.actor.cpp | 24 ++++--------- fdbserver/WorkerInterface.actor.h | 12 ++----- fdbserver/storageserver.actor.cpp | 8 ++--- 7 files changed, 33 insertions(+), 99 deletions(-) diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp index 6302c49f60..96fd7bed78 100644 --- a/fdbclient/NativeAPI.actor.cpp +++ b/fdbclient/NativeAPI.actor.cpp @@ -904,9 +904,7 @@ ACTOR static Future monitorClientDBInfoChange(DatabaseContext* cx, proxiesChangeTrigger->trigger(); } } - when(wait(actors.getResult())) { - UNSTOPPABLE_ASSERT(false); - } + when(wait(actors.getResult())) { UNSTOPPABLE_ASSERT(false); } } } } @@ -3258,9 +3256,7 @@ ACTOR Future> getValue(Reference trState, std::vector{ transaction_too_old(), future_version() }); } choose { - when(wait(trState->cx->connectionFileChanged())) { - throw transaction_too_old(); - } + when(wait(trState->cx->connectionFileChanged())) { throw transaction_too_old(); } when(GetValueReply _reply = wait(loadBalance( trState->cx.getPtr(), locationInfo.locations, @@ -3402,9 +3398,7 @@ ACTOR Future getKey(Reference trState, state GetKeyReply reply; try { choose { - when(wait(trState->cx->connectionFileChanged())) { - throw transaction_too_old(); - } + when(wait(trState->cx->connectionFileChanged())) { throw transaction_too_old(); } when(GetKeyReply _reply = wait(loadBalance( trState->cx.getPtr(), locationInfo.locations, @@ -3556,9 +3550,7 @@ ACTOR Future watchValue(Database cx, Reference p TaskPriority::DefaultPromiseEndpoint))) { resp = r; } - when(wait(cx->connectionRecord ? cx->connectionRecord->onChange() : Never())) { - wait(Never()); - } + when(wait(cx->connectionRecord ? cx->connectionRecord->onChange() : Never())) { wait(Never()); } } if (watchValueID.present()) { g_traceBatch.addEvent("WatchValueDebug", watchValueID.get().first(), "NativeAPI.watchValue.After"); @@ -3858,9 +3850,7 @@ Future getExactRange(Reference trState, state GetKeyValuesFamilyReply rep; try { choose { - when(wait(trState->cx->connectionFileChanged())) { - throw transaction_too_old(); - } + when(wait(trState->cx->connectionFileChanged())) { throw transaction_too_old(); } when(GetKeyValuesFamilyReply _rep = wait(loadBalance( trState->cx.getPtr(), locations[shard].locations, @@ -4750,9 +4740,7 @@ ACTOR Future getRangeStreamFragment(Reference trState, return Void(); } - when(GetKeyValuesStreamReply _rep = waitNext(replyStream.getFuture())) { - rep = _rep; - } + when(GetKeyValuesStreamReply _rep = waitNext(replyStream.getFuture())) { rep = _rep; } } ++trState->cx->transactionPhysicalReadsCompleted; } catch (Error& e) { @@ -5206,9 +5194,7 @@ ACTOR Future watch(Reference watch, loop { choose { // NativeAPI watchValue future finishes or errors - when(wait(watch->watchFuture)) { - break; - } + when(wait(watch->watchFuture)) { break; } when(wait(cx->connectionFileChanged())) { TEST(true); // Recreated a watch after switch @@ -6603,9 +6589,7 @@ ACTOR Future getConsistentReadVersion(SpanID parentSpan, state Future onProxiesChanged = cx->onProxiesChanged(); choose { - when(wait(onProxiesChanged)) { - onProxiesChanged = cx->onProxiesChanged(); - } + when(wait(onProxiesChanged)) { onProxiesChanged = cx->onProxiesChanged(); } when(GetReadVersionReply v = wait(basicLoadBalance(cx->getGrvProxies(UseProvisionalProxies( flags & GetReadVersionRequest::FLAG_USE_PROVISIONAL_PROXIES)), @@ -7010,9 +6994,7 @@ ACTOR Future getClusterProtocolImpl( needToConnect = false; } choose { - when(wait(coordinator->onChange())) { - needToConnect = true; - } + when(wait(coordinator->onChange())) { needToConnect = true; } when(ProtocolVersion pv = wait(protocolVersion)) { if (!expectedVersion.present() || expectedVersion.get() != pv) { @@ -8143,12 +8125,8 @@ ACTOR Future> getCheckpointMetaData(Database cx, } choose { - when(wait(cx->connectionFileChanged())) { - cx->invalidateCache(KeyRef(), keys); - } - when(wait(waitForAll(futures))) { - break; - } + when(wait(cx->connectionFileChanged())) { cx->invalidateCache(KeyRef(), keys); } + when(wait(waitForAll(futures))) { break; } when(wait(delay(timeout))) { TraceEvent("GetCheckpointTimeout").detail("Range", keys).detail("Version", version); } @@ -8475,12 +8453,8 @@ ACTOR Future changeFeedWhenAtLatest(Reference self, Versio // only allowed to use empty versions if you're caught up Future waitEmptyVersion = (self->notAtLatest.get() == 0) ? changeFeedWaitLatest(self, version) : Never(); choose { - when(wait(waitEmptyVersion)) { - break; - } - when(wait(lastReturned)) { - break; - } + when(wait(waitEmptyVersion)) { break; } + when(wait(lastReturned)) { break; } when(wait(self->refresh.getFuture())) {} when(wait(self->notAtLatest.onChange())) {} } diff --git a/fdbserver/BackupWorker.actor.cpp b/fdbserver/BackupWorker.actor.cpp index 8e9d541330..0ac5b56a7d 100644 --- a/fdbserver/BackupWorker.actor.cpp +++ b/fdbserver/BackupWorker.actor.cpp @@ -899,9 +899,7 @@ ACTOR Future pullAsyncData(BackupData* self) { } loop choose { - when(wait(r ? r->getMore(TaskPriority::TLogCommit) : Never())) { - break; - } + when(wait(r ? r->getMore(TaskPriority::TLogCommit) : Never())) { break; } when(wait(logSystemChange)) { if (self->logSystem.get()) { r = self->logSystem.get()->peekLogRouter(self->myId, tagAt, self->tag); @@ -971,9 +969,7 @@ ACTOR Future monitorBackupKeyOrPullData(BackupData* self, bool keyPresent) state Future committedVersion = self->getMinKnownCommittedVersion(); loop choose { - when(wait(success(present))) { - break; - } + when(wait(success(present))) { break; } when(wait(success(committedVersion) || delay(SERVER_KNOBS->BACKUP_NOOP_POP_DELAY, self->cx->taskID))) { if (committedVersion.isReady()) { self->popVersion = diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp index 2b2def456b..af564b377d 100644 --- a/fdbserver/ClusterRecovery.actor.cpp +++ b/fdbserver/ClusterRecovery.actor.cpp @@ -62,9 +62,7 @@ ACTOR Future recoveryTerminateOnConflict(UID dbgid, } return Void(); } - when(wait(switchedState)) { - return Void(); - } + when(wait(switchedState)) { return Void(); } } } @@ -891,12 +889,8 @@ ACTOR Future> provisionalMaster(ReferenceprovisionalCommitProxies[0].getKeyServersLocations.getFuture())) { req.reply.send(Never()); } - when(wait(waitCommitProxyFailure)) { - throw worker_removed(); - } - when(wait(waitGrvProxyFailure)) { - throw worker_removed(); - } + when(wait(waitCommitProxyFailure)) { throw worker_removed(); } + when(wait(waitGrvProxyFailure)) { throw worker_removed(); } } } @@ -1503,12 +1497,8 @@ ACTOR Future clusterRecoveryCore(Reference self) { break; } when(wait(oldLogSystems->onChange())) {} - when(wait(reg)) { - throw internal_error(); - } - when(wait(recoverAndEndEpoch)) { - throw internal_error(); - } + when(wait(reg)) { throw internal_error(); } + when(wait(recoverAndEndEpoch)) { throw internal_error(); } } } diff --git a/fdbserver/Resolver.actor.cpp b/fdbserver/Resolver.actor.cpp index bdc042f56a..d24a0401b5 100644 --- a/fdbserver/Resolver.actor.cpp +++ b/fdbserver/Resolver.actor.cpp @@ -236,9 +236,7 @@ ACTOR Future resolveBatch(Reference self, ResolveTransactionBatc } choose { - when(wait(self->version.whenAtLeast(req.prevVersion))) { - break; - } + when(wait(self->version.whenAtLeast(req.prevVersion))) { break; } when(wait(self->checkNeededVersion.onTrigger())) {} } } @@ -716,9 +714,7 @@ ACTOR Future resolver(ResolverInterface resolver, try { state Future core = resolverCore(resolver, initReq, db); loop choose { - when(wait(core)) { - return Void(); - } + when(wait(core)) { return Void(); } when(wait(checkRemoved(db, initReq.recoveryCount, resolver))) {} } } catch (Error& e) { diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp index 2a7d4878a9..7184da95cd 100644 --- a/fdbserver/TLogServer.actor.cpp +++ b/fdbserver/TLogServer.actor.cpp @@ -1425,9 +1425,7 @@ ACTOR Future updateStorage(TLogData* self) { ACTOR Future updateStorageLoop(TLogData* self) { wait(delay(0, TaskPriority::UpdateStorage)); - loop { - wait(updateStorage(self)); - } + loop { wait(updateStorage(self)); } } void commitMessages(TLogData* self, @@ -1588,9 +1586,7 @@ ACTOR Future waitForMessagesForTag(Reference self, Tag reqTag, Ve // we want the caller to finish first, otherwise the data structure it is building might not be complete wait(delay(0.0)); } - when(wait(delay(timeout))) { - self->blockingPeekTimeouts += 1; - } + when(wait(delay(timeout))) { self->blockingPeekTimeouts += 1; } } return Void(); } @@ -2757,9 +2753,7 @@ ACTOR Future pullAsyncData(TLogData* self, while (!endVersion.present() || logData->version.get() < endVersion.get()) { loop { choose { - when(wait(r ? r->getMore(TaskPriority::TLogCommit) : Never())) { - break; - } + when(wait(r ? r->getMore(TaskPriority::TLogCommit) : Never())) { break; } when(wait(dbInfoChange)) { if (logData->logSystem->get()) { r = logData->logSystem->get()->peek(logData->logId, tagAt, endVersion, tags, true); @@ -3229,9 +3223,7 @@ ACTOR Future restorePersistentState(TLogData* self, choose { when(wait(updateStorage(self))) {} - when(wait(allRemoved)) { - throw worker_removed(); - } + when(wait(allRemoved)) { throw worker_removed(); } } } } else { @@ -3242,9 +3234,7 @@ ACTOR Future restorePersistentState(TLogData* self, } } } - when(wait(allRemoved)) { - throw worker_removed(); - } + when(wait(allRemoved)) { throw worker_removed(); } } } } catch (Error& e) { @@ -3593,9 +3583,7 @@ ACTOR Future tLog(IKeyValueStore* persistentData, forwardPromise(req.reply, self.tlogCache.get(req.recruitmentID)); } } - when(wait(error)) { - throw internal_error(); - } + when(wait(error)) { throw internal_error(); } when(wait(activeSharedChange)) { if (activeSharedTLog->get() == tlogId) { TraceEvent("SharedTLogNowActive", self.dbgid).detail("NowActive", activeSharedTLog->get()); diff --git a/fdbserver/WorkerInterface.actor.h b/fdbserver/WorkerInterface.actor.h index 212babc1b6..0fb294b3a6 100644 --- a/fdbserver/WorkerInterface.actor.h +++ b/fdbserver/WorkerInterface.actor.h @@ -1206,9 +1206,7 @@ Future ioTimeoutError(Future what, double time) { } Future end = lowPriorityDelay(time); choose { - when(T t = wait(what)) { - return t; - } + when(T t = wait(what)) { return t; } when(wait(end)) { Error err = io_timeout(); if (g_network->isSimulated() && !g_simulator.getCurrentProcess()->isReliable()) { @@ -1236,9 +1234,7 @@ Future ioDegradedOrTimeoutError(Future what, if (degradedTime < errTime) { Future degradedEnd = lowPriorityDelay(degradedTime); choose { - when(T t = wait(what)) { - return t; - } + when(T t = wait(what)) { return t; } when(wait(degradedEnd)) { TEST(true); // TLog degraded TraceEvent(SevWarnAlways, "IoDegraded").log(); @@ -1249,9 +1245,7 @@ Future ioDegradedOrTimeoutError(Future what, Future end = lowPriorityDelay(errTime - degradedTime); choose { - when(T t = wait(what)) { - return t; - } + when(T t = wait(what)) { return t; } when(wait(end)) { Error err = io_timeout(); if (g_network->isSimulated() && !g_simulator.getCurrentProcess()->isReliable()) { diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp index 0591738d4f..0ecd70adc7 100644 --- a/fdbserver/storageserver.actor.cpp +++ b/fdbserver/storageserver.actor.cpp @@ -1492,9 +1492,7 @@ ACTOR Future waitForVersionNoTooOld(StorageServer* data, Version versio if (version <= data->version.get()) return version; choose { - when(wait(data->version.whenAtLeast(version))) { - return version; - } + when(wait(data->version.whenAtLeast(version))) { return version; } when(wait(delay(SERVER_KNOBS->FUTURE_VERSION_DELAY))) { if (deterministicRandom()->random01() < 0.001) TraceEvent(SevWarn, "ShardServerFutureVersion1000x", data->thisServerID) @@ -8160,9 +8158,7 @@ ACTOR Future waitMetrics(StorageServerMetrics* self, WaitMetricsRequest re }*/ } - when(wait(timeout)) { - timedout = true; - } + when(wait(timeout)) { timedout = true; } } } catch (Error& e) { if (e.code() == error_code_actor_cancelled)