From 3f0fd2a20cc1d1cb8eefed0c73ecf905b0f5c330 Mon Sep 17 00:00:00 2001 From: mpilman Date: Sun, 17 Feb 2019 19:13:26 -0800 Subject: [PATCH] Use fwd decls in WorkerInterface Also WorkerInterface.h -> WorkerInterface.actor.h --- fdbserver/CMakeLists.txt | 2 +- fdbserver/ClusterController.actor.cpp | 2 +- fdbserver/ClusterRecruitmentInterface.h | 2 +- fdbserver/LogRouter.actor.cpp | 2 +- fdbserver/LogSystem.h | 2 +- fdbserver/MasterProxyServer.actor.cpp | 2 +- fdbserver/OldTLogServer.actor.cpp | 2 +- fdbserver/QuietDatabase.actor.cpp | 2 +- fdbserver/QuietDatabase.h | 2 +- fdbserver/Resolver.actor.cpp | 2 +- fdbserver/SimulatedCluster.actor.cpp | 2 +- fdbserver/Status.actor.cpp | 2 +- fdbserver/Status.h | 2 +- fdbserver/TLogServer.actor.cpp | 2 +- ...kerInterface.h => WorkerInterface.actor.h} | 67 +++++++++++-------- fdbserver/fdbserver.actor.cpp | 2 +- fdbserver/masterserver.actor.cpp | 2 +- fdbserver/storageserver.actor.cpp | 2 +- fdbserver/tester.actor.cpp | 2 +- fdbserver/worker.actor.cpp | 2 +- fdbserver/workloads/KillRegion.actor.cpp | 2 +- fdbserver/workloads/LogMetrics.actor.cpp | 2 +- .../workloads/MachineAttrition.actor.cpp | 2 +- fdbserver/workloads/Ping.actor.cpp | 2 +- fdbserver/workloads/ReadWrite.actor.cpp | 2 +- .../workloads/RemoveServersSafely.actor.cpp | 2 +- fdbserver/workloads/TargetedKill.actor.cpp | 2 +- fdbserver/workloads/Throughput.actor.cpp | 2 +- fdbserver/workloads/WorkerErrors.actor.cpp | 2 +- fdbserver/workloads/WriteBandwidth.actor.cpp | 2 +- 30 files changed, 69 insertions(+), 56 deletions(-) rename fdbserver/{WorkerInterface.h => WorkerInterface.actor.h} (73%) diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt index 1894ca1a65..82aa0c1d35 100644 --- a/fdbserver/CMakeLists.txt +++ b/fdbserver/CMakeLists.txt @@ -88,7 +88,7 @@ set(FDBSERVER_SRCS WaitFailure.actor.cpp WaitFailure.h worker.actor.cpp - WorkerInterface.h + WorkerInterface.actor.h workloads/ApiCorrectness.actor.cpp workloads/ApiWorkload.actor.cpp workloads/ApiWorkload.h diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp index 3c0fd7f39d..4fd8812a31 100644 --- a/fdbserver/ClusterController.actor.cpp +++ b/fdbserver/ClusterController.actor.cpp @@ -25,7 +25,7 @@ #include "fdbserver/DataDistributorInterface.h" #include "fdbserver/Knobs.h" #include "fdbserver/MoveKeys.actor.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/LeaderElection.h" #include "fdbserver/LogSystemConfig.h" #include "fdbserver/WaitFailure.h" diff --git a/fdbserver/ClusterRecruitmentInterface.h b/fdbserver/ClusterRecruitmentInterface.h index 56dfde330d..aefbe167c8 100644 --- a/fdbserver/ClusterRecruitmentInterface.h +++ b/fdbserver/ClusterRecruitmentInterface.h @@ -30,7 +30,7 @@ #include "fdbserver/MasterInterface.h" #include "fdbserver/RecoveryState.h" #include "fdbserver/TLogInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/Knobs.h" // This interface and its serialization depend on slicing, since the client will deserialize only the first part of this structure diff --git a/fdbserver/LogRouter.actor.cpp b/fdbserver/LogRouter.actor.cpp index c11b336c75..39f6874480 100644 --- a/fdbserver/LogRouter.actor.cpp +++ b/fdbserver/LogRouter.actor.cpp @@ -20,7 +20,7 @@ #include "flow/ActorCollection.h" #include "fdbclient/NativeAPI.actor.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/WaitFailure.h" #include "fdbserver/Knobs.h" #include "fdbserver/ServerDBInfo.h" diff --git a/fdbserver/LogSystem.h b/fdbserver/LogSystem.h index 4abcd3fa63..c086dacfd5 100644 --- a/fdbserver/LogSystem.h +++ b/fdbserver/LogSystem.h @@ -23,7 +23,7 @@ #pragma once #include "fdbserver/TLogInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbclient/DatabaseConfiguration.h" #include "flow/IndexedSet.h" #include "fdbrpc/ReplicationPolicy.h" diff --git a/fdbserver/MasterProxyServer.actor.cpp b/fdbserver/MasterProxyServer.actor.cpp index 547c8ac5b1..8735fbb8d7 100644 --- a/fdbserver/MasterProxyServer.actor.cpp +++ b/fdbserver/MasterProxyServer.actor.cpp @@ -22,7 +22,7 @@ #include "fdbclient/MasterProxyInterface.h" #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/MasterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/WaitFailure.h" #include "fdbserver/Knobs.h" #include "fdbserver/ServerDBInfo.h" diff --git a/fdbserver/OldTLogServer.actor.cpp b/fdbserver/OldTLogServer.actor.cpp index 14c1ea37a8..3285df7159 100644 --- a/fdbserver/OldTLogServer.actor.cpp +++ b/fdbserver/OldTLogServer.actor.cpp @@ -25,7 +25,7 @@ #include "fdbclient/Notified.h" #include "fdbclient/KeyRangeMap.h" #include "fdbclient/SystemData.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/TLogInterface.h" #include "fdbserver/Knobs.h" #include "fdbserver/IKeyValueStore.h" diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp index e54df38b4b..b6d704d2b3 100644 --- a/fdbserver/QuietDatabase.actor.cpp +++ b/fdbserver/QuietDatabase.actor.cpp @@ -24,7 +24,7 @@ #include "fdbclient/NativeAPI.actor.h" #include "fdbclient/DatabaseContext.h" #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/ServerDBInfo.h" #include "fdbserver/Status.h" #include "fdbclient/ManagementAPI.actor.h" diff --git a/fdbserver/QuietDatabase.h b/fdbserver/QuietDatabase.h index 316efd4864..e9b60d1d8b 100644 --- a/fdbserver/QuietDatabase.h +++ b/fdbserver/QuietDatabase.h @@ -25,7 +25,7 @@ #include "fdbclient/NativeAPI.actor.h" #include "fdbclient/DatabaseContext.h" // for clone() #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "flow/actorcompiler.h" Future getDataInFlight( Database const& cx, Reference> const& ); diff --git a/fdbserver/Resolver.actor.cpp b/fdbserver/Resolver.actor.cpp index 5e40d86ed0..98b98964f9 100644 --- a/fdbserver/Resolver.actor.cpp +++ b/fdbserver/Resolver.actor.cpp @@ -22,7 +22,7 @@ #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/ResolverInterface.h" #include "fdbserver/MasterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/WaitFailure.h" #include "fdbserver/Knobs.h" #include "fdbserver/ServerDBInfo.h" diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp index 573afc4d2d..f1862a0ddf 100644 --- a/fdbserver/SimulatedCluster.actor.cpp +++ b/fdbserver/SimulatedCluster.actor.cpp @@ -23,7 +23,7 @@ #include "fdbclient/FailureMonitorClient.h" #include "fdbclient/DatabaseContext.h" #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbclient/ClusterInterface.h" #include "fdbserver/Knobs.h" #include "fdbserver/ClusterRecruitmentInterface.h" diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp index c6e18b89f9..e6ac1d04bc 100644 --- a/fdbserver/Status.actor.cpp +++ b/fdbserver/Status.actor.cpp @@ -23,7 +23,7 @@ #include "fdbclient/NativeAPI.actor.h" #include "fdbclient/SystemData.h" #include "fdbclient/ReadYourWrites.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/ClusterRecruitmentInterface.h" #include #include "fdbserver/CoordinationInterface.h" diff --git a/fdbserver/Status.h b/fdbserver/Status.h index 0df2dded2f..9697d3d77d 100644 --- a/fdbserver/Status.h +++ b/fdbserver/Status.h @@ -23,7 +23,7 @@ #pragma once #include "fdbrpc/fdbrpc.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/MasterInterface.h" #include "fdbclient/ClusterInterface.h" diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp index 0a7bf0667d..1fc54108bc 100644 --- a/fdbserver/TLogServer.actor.cpp +++ b/fdbserver/TLogServer.actor.cpp @@ -25,7 +25,7 @@ #include "fdbclient/Notified.h" #include "fdbclient/KeyRangeMap.h" #include "fdbclient/SystemData.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/TLogInterface.h" #include "fdbserver/Knobs.h" #include "fdbserver/IKeyValueStore.h" diff --git a/fdbserver/WorkerInterface.h b/fdbserver/WorkerInterface.actor.h similarity index 73% rename from fdbserver/WorkerInterface.h rename to fdbserver/WorkerInterface.actor.h index 97b7c0f515..04b882c02b 100644 --- a/fdbserver/WorkerInterface.h +++ b/fdbserver/WorkerInterface.actor.h @@ -1,5 +1,5 @@ /* - * WorkerInterface.h + * WorkerInterface.actor.h * * This source file is part of the FoundationDB open source project * @@ -18,9 +18,12 @@ * limitations under the License. */ -#ifndef FDBSERVER_WORKERINTERFACE_H -#define FDBSERVER_WORKERINTERFACE_H #pragma once +#if defined(NO_INTELLISENSE) && !defined(FDBSERVER_WORKERINTERFACE_ACTOR_G_H) + #define FDBSERVER_WORKERINTERFACE_ACTOR_G_H + #include "fdbserver/WorkerInterface.actor.g.h" +#elif !defined(FDBSERVER_WORKERINTERFACE_ACTOR_H) + #define FDBSERVER_WORKERINTERFACE_ACTOR_H #include "fdbserver/DataDistributorInterface.h" #include "fdbserver/MasterInterface.h" @@ -32,6 +35,7 @@ #include "fdbserver/LogSystemConfig.h" #include "fdbrpc/MultiInterface.h" #include "fdbclient/ClientWorkerInterface.h" +#include "flow/actorcompiler.h" #define DUMPTOKEN( name ) TraceEvent("DumpToken", recruited.id()).detail("Name", #name).detail("Token", name.getEndpoint().token) @@ -318,38 +322,47 @@ void endRole(const Role &role, UID id, std::string reason, bool ok = true, Error struct ServerDBInfo; class Database openDBOnServer( Reference> const& db, int taskID = TaskDefaultEndpoint, bool enableLocalityLoadBalance = true, bool lockAware = false ); -Future extractClusterInterface( Reference>> const& a, Reference>> const& b ); +ACTOR Future extractClusterInterface(Reference>> a, + Reference>> b); -Future fdbd( Reference const&, LocalityData const& localities, ProcessClass const& processClass, std::string const& dataFolder, std::string const& coordFolder, int64_t const& memoryLimit, std::string const& metricsConnFile, std::string const& metricsPrefix ); -Future clusterController( Reference const&, Reference>> const& currentCC, Reference> const& asyncPriorityInfo, Future const& recoveredDiskFiles, LocalityData const& locality ); +ACTOR Future fdbd(Reference, LocalityData localities, ProcessClass processClass, + std::string dataFolder, std::string coordFolder, int64_t memoryLimit, + std::string metricsConnFile, std::string metricsPrefix); +ACTOR Future clusterController(Reference, + Reference>> currentCC, + Reference> asyncPriorityInfo, + Future recoveredDiskFiles, LocalityData locality); // These servers are started by workerServer -Future storageServer( - class IKeyValueStore* const& persistentData, - StorageServerInterface const& ssi, - Tag const& seedTag, - ReplyPromise const& recruitReply, - Reference> const& db, - std::string const& folder ); -Future storageServer( - class IKeyValueStore* const& persistentData, - StorageServerInterface const& ssi, - Reference> const& db, - std::string const& folder, - Promise const& recovered); // changes pssi->id() to be the recovered ID -Future masterServer( MasterInterface const& mi, Reference> const& db, class ServerCoordinators const&, LifetimeToken const& lifetime, bool const& forceRecovery ); -Future masterProxyServer(MasterProxyInterface const& proxy, InitializeMasterProxyRequest const& req, Reference> const& db); -Future tLog( class IKeyValueStore* const& persistentData, class IDiskQueue* const& persistentQueue, Reference> const& db, LocalityData const& locality, PromiseStream const& tlogRequests, UID const& tlogId, bool const& restoreFromDisk, Promise const& oldLog, Promise const& recovered ); // changes tli->id() to be the recovered ID -Future monitorServerDBInfo( Reference>> const& ccInterface, Reference const&, LocalityData const&, Reference> const& dbInfo ); -Future resolver( ResolverInterface const& proxy, InitializeResolverRequest const&, Reference> const& db ); -Future logRouter( TLogInterface const& interf, InitializeLogRouterRequest const& req, Reference> const& db ); -Future dataDistributor( DataDistributorInterface const& ddi, Reference> const& db ); +ACTOR Future storageServer(class IKeyValueStore* persistentData, StorageServerInterface ssi, Tag seedTag, + ReplyPromise recruitReply, + Reference> db, std::string folder); +ACTOR Future storageServer(class IKeyValueStore* persistentData, StorageServerInterface ssi, + Reference> db, std::string folder, + Promise recovered); // changes pssi->id() to be the recovered ID +ACTOR Future masterServer(MasterInterface mi, Reference> db, class ServerCoordinators, + LifetimeToken lifetime, bool forceRecovery); +ACTOR Future masterProxyServer(MasterProxyInterface proxy, InitializeMasterProxyRequest req, + Reference> db); +ACTOR Future tLog(class IKeyValueStore* persistentData, class IDiskQueue* persistentQueue, + Reference> db, LocalityData locality, + PromiseStream tlogRequests, UID tlogId, bool restoreFromDisk, + Promise oldLog, Promise recovered); // changes tli->id() to be the recovered ID +ACTOR Future monitorServerDBInfo(Reference>> ccInterface, + Reference, LocalityData, + Reference> dbInfo); +ACTOR Future resolver(ResolverInterface proxy, InitializeResolverRequest, Reference> db); +ACTOR Future logRouter(TLogInterface interf, InitializeLogRouterRequest req, + Reference> db); +ACTOR Future dataDistributor(DataDistributorInterface ddi, Reference> db); void registerThreadForProfiling(); void updateCpuProfiler(ProfilerRequest req); namespace oldTLog { - Future tLog( IKeyValueStore* const& persistentData, IDiskQueue* const& persistentQueue, Reference> const& db, LocalityData const& locality, UID const& tlogId ); +ACTOR Future tLog(IKeyValueStore* persistentData, IDiskQueue* persistentQueue, + Reference> db, LocalityData locality, UID tlogId); } +#include "flow/unactorcompiler.h" #endif diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp index e4e62d0c02..91a1c9e0b7 100644 --- a/fdbserver/fdbserver.actor.cpp +++ b/fdbserver/fdbserver.actor.cpp @@ -32,7 +32,7 @@ #include "fdbclient/SystemData.h" #include "fdbclient/FailureMonitorClient.h" #include "fdbserver/CoordinationInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/RestoreInterface.h" #include "fdbserver/ClusterRecruitmentInterface.h" #include "fdbserver/ServerDBInfo.h" diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp index 854a2f4576..9bff8a5633 100644 --- a/fdbserver/masterserver.actor.cpp +++ b/fdbserver/masterserver.actor.cpp @@ -30,7 +30,7 @@ #include "fdbserver/Knobs.h" #include #include "fdbserver/WaitFailure.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/Ratekeeper.h" #include "fdbserver/ClusterRecruitmentInterface.h" #include "fdbserver/ServerDBInfo.h" diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp index c594fd9069..5d6ac57d57 100644 --- a/fdbserver/storageserver.actor.cpp +++ b/fdbserver/storageserver.actor.cpp @@ -32,7 +32,7 @@ #include "fdbclient/Notified.h" #include "fdbclient/MasterProxyInterface.h" #include "fdbclient/DatabaseContext.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/TLogInterface.h" #include "fdbserver/MoveKeys.actor.h" #include "fdbserver/Knobs.h" diff --git a/fdbserver/tester.actor.cpp b/fdbserver/tester.actor.cpp index 2ba0f212b4..32a17dc533 100644 --- a/fdbserver/tester.actor.cpp +++ b/fdbserver/tester.actor.cpp @@ -26,7 +26,7 @@ #include "fdbclient/NativeAPI.actor.h" #include "fdbclient/SystemData.h" #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/ClusterRecruitmentInterface.h" #include "fdbserver/workloads/workloads.h" #include "fdbserver/Status.h" diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp index 0f45509ce9..f002c9ad1f 100644 --- a/fdbserver/worker.actor.cpp +++ b/fdbserver/worker.actor.cpp @@ -24,7 +24,7 @@ #include "fdbrpc/simulator.h" #include "fdbclient/NativeAPI.actor.h" #include "fdbclient/MetricLogger.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/IKeyValueStore.h" #include "fdbserver/WaitFailure.h" #include "fdbserver/TesterInterface.h" // for poisson() diff --git a/fdbserver/workloads/KillRegion.actor.cpp b/fdbserver/workloads/KillRegion.actor.cpp index 5761546ce2..492629d1d0 100644 --- a/fdbserver/workloads/KillRegion.actor.cpp +++ b/fdbserver/workloads/KillRegion.actor.cpp @@ -21,7 +21,7 @@ #include "flow/actorcompiler.h" #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/workloads/workloads.h" #include "fdbrpc/simulator.h" #include "fdbclient/ManagementAPI.actor.h" diff --git a/fdbserver/workloads/LogMetrics.actor.cpp b/fdbserver/workloads/LogMetrics.actor.cpp index 388181e466..f81e2c0acb 100644 --- a/fdbserver/workloads/LogMetrics.actor.cpp +++ b/fdbserver/workloads/LogMetrics.actor.cpp @@ -25,7 +25,7 @@ #include "fdbrpc/simulator.h" #include "fdbserver/MasterInterface.h" #include "fdbclient/SystemData.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/QuietDatabase.h" #include "fdbserver/ServerDBInfo.h" #include "flow/actorcompiler.h" // This must be the last #include. diff --git a/fdbserver/workloads/MachineAttrition.actor.cpp b/fdbserver/workloads/MachineAttrition.actor.cpp index 99302f4e4a..5365c21ce7 100644 --- a/fdbserver/workloads/MachineAttrition.actor.cpp +++ b/fdbserver/workloads/MachineAttrition.actor.cpp @@ -20,7 +20,7 @@ #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/workloads/workloads.h" #include "fdbrpc/simulator.h" #include "flow/actorcompiler.h" // This must be the last #include. diff --git a/fdbserver/workloads/Ping.actor.cpp b/fdbserver/workloads/Ping.actor.cpp index 9217b46d56..6d34439135 100644 --- a/fdbserver/workloads/Ping.actor.cpp +++ b/fdbserver/workloads/Ping.actor.cpp @@ -22,7 +22,7 @@ #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/TesterInterface.h" #include "fdbserver/workloads/workloads.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/QuietDatabase.h" #include "fdbserver/ServerDBInfo.h" #include "flow/actorcompiler.h" // This must be the last #include. diff --git a/fdbserver/workloads/ReadWrite.actor.cpp b/fdbserver/workloads/ReadWrite.actor.cpp index f7e74742fb..d3bce23d77 100644 --- a/fdbserver/workloads/ReadWrite.actor.cpp +++ b/fdbserver/workloads/ReadWrite.actor.cpp @@ -23,7 +23,7 @@ #include "fdbrpc/ContinuousSample.h" #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/workloads/workloads.h" #include "fdbserver/workloads/BulkSetup.actor.h" #include "fdbserver/ClusterRecruitmentInterface.h" diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp index 0d2948f7e1..96438d417f 100644 --- a/fdbserver/workloads/RemoveServersSafely.actor.cpp +++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp @@ -20,7 +20,7 @@ #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/workloads/workloads.h" #include "fdbrpc/simulator.h" #include "fdbclient/ManagementAPI.actor.h" diff --git a/fdbserver/workloads/TargetedKill.actor.cpp b/fdbserver/workloads/TargetedKill.actor.cpp index 4bfc5a3dbe..8cadbfe938 100644 --- a/fdbserver/workloads/TargetedKill.actor.cpp +++ b/fdbserver/workloads/TargetedKill.actor.cpp @@ -24,7 +24,7 @@ #include "fdbrpc/simulator.h" #include "fdbserver/MasterInterface.h" #include "fdbclient/SystemData.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/ServerDBInfo.h" #include "fdbserver/QuietDatabase.h" #include "flow/actorcompiler.h" // This must be the last #include. diff --git a/fdbserver/workloads/Throughput.actor.cpp b/fdbserver/workloads/Throughput.actor.cpp index 21fd1b1548..87d0146f10 100644 --- a/fdbserver/workloads/Throughput.actor.cpp +++ b/fdbserver/workloads/Throughput.actor.cpp @@ -21,7 +21,7 @@ #include "fdbrpc/ContinuousSample.h" #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/workloads/workloads.h" #include "flow/ActorCollection.h" #include "fdbrpc/Smoother.h" diff --git a/fdbserver/workloads/WorkerErrors.actor.cpp b/fdbserver/workloads/WorkerErrors.actor.cpp index 7b2f978443..111655e3da 100644 --- a/fdbserver/workloads/WorkerErrors.actor.cpp +++ b/fdbserver/workloads/WorkerErrors.actor.cpp @@ -22,7 +22,7 @@ #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/TesterInterface.h" #include "fdbserver/workloads/workloads.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/QuietDatabase.h" #include "fdbserver/ServerDBInfo.h" #include "flow/actorcompiler.h" // This must be the last #include. diff --git a/fdbserver/workloads/WriteBandwidth.actor.cpp b/fdbserver/workloads/WriteBandwidth.actor.cpp index ea99370bc5..7c90193450 100644 --- a/fdbserver/workloads/WriteBandwidth.actor.cpp +++ b/fdbserver/workloads/WriteBandwidth.actor.cpp @@ -23,7 +23,7 @@ #include "fdbrpc/ContinuousSample.h" #include "fdbclient/NativeAPI.actor.h" #include "fdbserver/TesterInterface.h" -#include "fdbserver/WorkerInterface.h" +#include "fdbserver/WorkerInterface.actor.h" #include "fdbserver/workloads/workloads.h" #include "fdbserver/workloads/BulkSetup.actor.h" #include "flow/actorcompiler.h" // This must be the last #include.