apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-14 18:02:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use ActorCollection for consumer future

Browse Source
This commit is contained in:
Lukas Joswiak 2021-08-10 12:27:19 -07:00
parent 9f4ea02784
commit a838a47b0b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fdbserver/ConfigBroadcaster.actor.cpp
View File

@ -70,7 +70,6 @@ class ConfigBroadcasterImpl {
Version lastCompactedVersion; Version lastCompactedVersion;
Version mostRecentVersion; Version mostRecentVersion;
std::unique_ptr<IConfigConsumer> consumer; std::unique_ptr<IConfigConsumer> consumer;
Future<Void> consumerFuture;
ActorCollection actors{ false }; ActorCollection actors{ false };
std::vector<BroadcastClientDetails> clients; std::vector<BroadcastClientDetails> clients;
@ -170,11 +169,11 @@ public:
Future<Void> watcher, Future<Void> watcher,
ConfigBroadcastInterface broadcastInterface) { ConfigBroadcastInterface broadcastInterface) {
if (!consumerFuture.isValid()) { if (!consumerFuture.isValid()) {
consumerFuture = consumer->consume(*self); actors.add(consumer->consume(*self));
} }
clients.push_back(BroadcastClientDetails{ clients.push_back(BroadcastClientDetails{
watcher, std::move(configClassSet), lastSeenVersion, std::move(broadcastInterface) }); watcher, std::move(configClassSet), lastSeenVersion, std::move(broadcastInterface) });
this->actors.add(waitForFailure(this, watcher, &clients.back())); actors.add(waitForFailure(this, watcher, &clients.back()));
// Push all dynamic knobs to worker if it isn't up to date. // Push all dynamic knobs to worker if it isn't up to date.
if (clients.back().lastSeenVersion >= mostRecentVersion) { if (clients.back().lastSeenVersion >= mostRecentVersion) {
@ -296,7 +295,7 @@ public:
} }
} }
Future<Void> getError() const { return consumerFuture; } Future<Void> getError() const { return actors.getResult(); }
UID getID() const { return id; } UID getID() const { return id; }