Reorder registerWorker to prevent potential conflict

fdbserver/ConfigBroadcaster.actor.cpp

@@ -114,7 +114,6 @@ class ConfigBroadcasterImpl {
 
 		client.lastSeenVersion = mostRecentVersion;
 		req.mostRecentVersion = mostRecentVersion;
-		// TODO: Retry in event of failure
 		++successfulChangeRequest;
 		return success(client.broadcastInterface.changes.getReply(req));
 	}
@@ -144,7 +143,7 @@ class ConfigBroadcasterImpl {
 		}
 
 		for (auto& client : clients) {
-			actors.add(pushChanges(client, changes));
+			actors.add(brokenPromiseToNever(pushChanges(client, changes)));
 		}
 	}
 
@@ -172,27 +171,28 @@ public:
 		if (!consumerFuture.isValid()) {
 			consumerFuture = consumer->consume(*self);
 		}
+
+		Future<Void> result = Void();
+		// Push all dynamic knobs to worker if it isn't up to date.
+		if (lastSeenVersion < mostRecentVersion) {
+			++snapshotRequest;
+			ConfigBroadcastSnapshotRequest request;
+			for (const auto& [key, value] : snapshot) {
+				if (matchesConfigClass(configClassSet, key.configClass)) {
+					request.snapshot[key] = value;
+				}
+			}
+			request.version = mostRecentVersion;
+			TraceEvent(SevDebug, "ConfigBroadcasterSnapshotRequest", id)
+			    .detail("Size", request.snapshot.size())
+			    .detail("Version", request.version);
+			result = success(broadcastInterface.snapshot.getReply(request));
+		}
+
 		clients.push_back(BroadcastClientDetails{
 		    watcher, std::move(configClassSet), lastSeenVersion, std::move(broadcastInterface) });
 		actors.add(waitForFailure(this, watcher, &clients.back()));
-
+		return result;
-		// Push all dynamic knobs to worker if it isn't up to date.
-		if (clients.back().lastSeenVersion >= mostRecentVersion) {
-			return Void();
-		}
-
-		++snapshotRequest;
-		ConfigBroadcastSnapshotRequest request;
-		for (const auto& [key, value] : snapshot) {
-			if (matchesConfigClass(clients.back().configClassSet, key.configClass)) {
-				request.snapshot[key] = value;
-			}
-		}
-		request.version = mostRecentVersion;
-		TraceEvent(SevDebug, "ConfigBroadcasterSnapshotRequest", id)
-		    .detail("Size", request.snapshot.size())
-		    .detail("Version", request.version);
-		return success(clients.back().broadcastInterface.snapshot.getReply(request));
 	}
 
 	void applyChanges(Standalone<VectorRef<VersionedConfigMutationRef>> const& changes,