From 564a3d69b715b00a7381c5730fb2cf56a8783abf Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Tue, 10 Aug 2021 11:03:06 -0700
Subject: [PATCH] Rename config broadcast interface messages
---
fdbserver/ConfigBroadcastInterface.h | 6 +++---
fdbserver/ConfigBroadcaster.actor.cpp | 4 ++--
fdbserver/LocalConfiguration.actor.cpp | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fdbserver/ConfigBroadcastInterface.h b/fdbserver/ConfigBroadcastInterface.h
index b4f6e3d18c..a2d7171270 100644
--- a/fdbserver/ConfigBroadcastInterface.h
+++ b/fdbserver/ConfigBroadcastInterface.h
@@ -122,8 +122,8 @@ class ConfigBroadcastInterface {
public:
static constexpr FileIdentifier file_identifier = 1676543;
- RequestStream<ConfigBroadcastSnapshotRequest> getSnapshot;
- RequestStream<ConfigBroadcastChangesRequest> getChanges;
+ RequestStream<ConfigBroadcastSnapshotRequest> snapshot;
+ RequestStream<ConfigBroadcastChangesRequest> changes;
ConfigBroadcastInterface() : _id(deterministicRandom()->randomUniqueID()) {}
@@ -133,6 +133,6 @@ public:
template <class Ar>
void serialize(Ar& ar) {
- serializer(ar, _id, getSnapshot, getChanges);
+ serializer(ar, _id, snapshot, changes);
}
};
diff --git a/fdbserver/ConfigBroadcaster.actor.cpp b/fdbserver/ConfigBroadcaster.actor.cpp
index 14293dde8e..98043fd5ab 100644
--- a/fdbserver/ConfigBroadcaster.actor.cpp
+++ b/fdbserver/ConfigBroadcaster.actor.cpp
@@ -119,7 +119,7 @@ class ConfigBroadcasterImpl {
req.mostRecentVersion = mostRecentVersion;
// TODO: Retry in event of failure
++successfulChangeRequest;
- return success(client.broadcastInterface.getChanges.getReply(req));
+ return success(client.broadcastInterface.changes.getReply(req));
}
ConfigBroadcasterImpl()
@@ -193,7 +193,7 @@ public:
TraceEvent(SevDebug, "ConfigBroadcasterSnapshotRequest", id)
.detail("Size", request.snapshot.size())
.detail("Version", request.version);
- return success(clients.back().broadcastInterface.getSnapshot.getReply(request));
+ return success(clients.back().broadcastInterface.snapshot.getReply(request));
}
void applyChanges(Standalone<VectorRef<VersionedConfigMutationRef>> const& changes,
diff --git a/fdbserver/LocalConfiguration.actor.cpp b/fdbserver/LocalConfiguration.actor.cpp
index 6b41d90160..d7ee0caf30 100644
--- a/fdbserver/LocalConfiguration.actor.cpp
+++ b/fdbserver/LocalConfiguration.actor.cpp
@@ -284,12 +284,12 @@ class LocalConfigurationImpl {
ACTOR static Future<Void> consumeInternal(LocalConfigurationImpl* self, ConfigBroadcastInterface broadcaster) {
loop {
choose {
- when(ConfigBroadcastSnapshotRequest snapshotReq = waitNext(broadcaster.getSnapshot.getFuture())) {
+ when(ConfigBroadcastSnapshotRequest snapshotReq = waitNext(broadcaster.snapshot.getFuture())) {
ASSERT_GT(snapshotReq.version, self->lastSeenVersion);
++self->snapshots;
wait(setSnapshot(self, std::move(snapshotReq.snapshot), snapshotReq.version));
}
- when(state ConfigBroadcastChangesRequest req = waitNext(broadcaster.getChanges.getFuture())) {
+ when(state ConfigBroadcastChangesRequest req = waitNext(broadcaster.changes.getFuture())) {
wait(self->addChanges(req.changes, req.mostRecentVersion));
req.reply.send(ConfigBroadcastChangesReply());
}