- Do not add fdbserver processes to the client list.

sbodagala · sbodagala · commit ebe0e3ca4347 · 2023-01-24T22:28:23.000Z
Note: Server processes started getting reported as clients since 7.1.0
(not sure if this change in behavior was intentional or not), and this
breaks the operator upgrade logic.
diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
@@ -844,7 +844,8 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
     Reference<AsyncVar<Optional<ClientLeaderRegInterface>>> coordinator,
     MonitorLeaderInfo info,
     Reference<ReferencedObject<Standalone<VectorRef<ClientVersionRef>>>> supportedVersions,
-    Key traceLogGroup) {
+    Key traceLogGroup,
+    IsInternal internal) {
 	state ClusterConnectionString cs = info.intermediateConnRecord->getConnectionString();
 	state int coordinatorsSize = cs.hostnames.size() + cs.coords.size();
 	state int index = 0;
@@ -878,6 +879,7 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
 		req.knownClientInfoID = clientInfo->get().id;
 		req.supportedVersions = supportedVersions->get();
 		req.traceLogGroup = traceLogGroup;
+		req.internal = internal;
 
 		state ClusterConnectionString storedConnectionString;
 		if (connRecord) {
@@ -985,13 +987,14 @@ ACTOR Future<Void> monitorProxies(
     Reference<AsyncVar<ClientDBInfo>> clientInfo,
     Reference<AsyncVar<Optional<ClientLeaderRegInterface>>> coordinator,
     Reference<ReferencedObject<Standalone<VectorRef<ClientVersionRef>>>> supportedVersions,
-    Key traceLogGroup) {
+    Key traceLogGroup,
+    IsInternal internal) {
 	state MonitorLeaderInfo info(connRecord->get());
 	loop {
 		ASSERT(connRecord->get().isValid());
 		choose {
 			when(MonitorLeaderInfo _info = wait(monitorProxiesOneGeneration(
-			         connRecord->get(), clientInfo, coordinator, info, supportedVersions, traceLogGroup))) {
+			         connRecord->get(), clientInfo, coordinator, info, supportedVersions, traceLogGroup, internal))) {
 				info = _info;
 			}
 			when(wait(connRecord->onChange())) {
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
@@ -2281,7 +2281,8 @@ Database Database::createDatabase(Reference<IClusterConnectionRecord> connRecord
 	                                                clientInfo,
 	                                                coordinator,
 	                                                networkOptions.supportedVersions,
-	                                                StringRef(networkOptions.traceLogGroup));
+	                                                StringRef(networkOptions.traceLogGroup),
+	                                                internal);
 
 	DatabaseContext* db;
 	if (preallocatedDb) {
diff --git a/fdbclient/include/fdbclient/CoordinationInterface.h b/fdbclient/include/fdbclient/CoordinationInterface.h
@@ -265,6 +265,7 @@ struct OpenDatabaseCoordRequest {
 	std::vector<Hostname> hostnames;
 	std::vector<NetworkAddress> coordinators;
 	ReplyPromise<CachedSerialization<struct ClientDBInfo>> reply;
+	bool internal{ true };
 
 	bool verify() const { return true; }
 
@@ -278,7 +279,8 @@ struct OpenDatabaseCoordRequest {
 		           clusterKey,
 		           coordinators,
 		           reply,
-		           hostnames);
+		           hostnames,
+		           internal);
 	}
 };
 
diff --git a/fdbclient/include/fdbclient/MonitorLeader.h b/fdbclient/include/fdbclient/MonitorLeader.h
@@ -85,7 +85,8 @@ Future<Void> monitorProxies(
     Reference<AsyncVar<ClientDBInfo>> const& clientInfo,
     Reference<AsyncVar<Optional<ClientLeaderRegInterface>>> const& coordinator,
     Reference<ReferencedObject<Standalone<VectorRef<ClientVersionRef>>>> const& supportedVersions,
-    Key const& traceLogGroup);
+    Key const& traceLogGroup,
+    IsInternal const& internal);
 
 void shrinkProxyList(ClientDBInfo& ni,
                      std::vector<UID>& lastCommitProxyUIDs,
diff --git a/fdbserver/Coordination.actor.cpp b/fdbserver/Coordination.actor.cpp
@@ -226,7 +226,7 @@ ACTOR Future<Void> openDatabase(ClientData* db,
 	++(*clientCount);
 	hasConnectedClients->set(true);
 
-	if (req.supportedVersions.size() > 0) {
+	if (req.supportedVersions.size() > 0 && !req.internal) {
 		db->clientStatusInfoMap[req.reply.getEndpoint().getPrimaryAddress()] =
 		    ClientStatusInfo(req.traceLogGroup, req.supportedVersions, req.issues);
 	}
@@ -252,7 +252,7 @@ ACTOR Future<Void> openDatabase(ClientData* db,
 		}
 	}
 
-	if (req.supportedVersions.size() > 0) {
+	if (req.supportedVersions.size() > 0 && !req.internal) {
 		db->clientStatusInfoMap.erase(req.reply.getEndpoint().getPrimaryAddress());
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ ACTOR Future<Void> openDatabase(ClientData* db,`
`226`	`226`	`++(*clientCount);`
`227`	`227`	`hasConnectedClients->set(true);`
`228`	`228`
`229`		`- if (req.supportedVersions.size() > 0) {`
	`229`	`+ if (req.supportedVersions.size() > 0 && !req.internal) {`
`230`	`230`	`db->clientStatusInfoMap[req.reply.getEndpoint().getPrimaryAddress()] =`
`231`	`231`	`ClientStatusInfo(req.traceLogGroup, req.supportedVersions, req.issues);`
`232`	`232`	`}`
`@@ -252,7 +252,7 @@ ACTOR Future<Void> openDatabase(ClientData* db,`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`255`		`- if (req.supportedVersions.size() > 0) {`
	`255`	`+ if (req.supportedVersions.size() > 0 && !req.internal) {`
`256`	`256`	`db->clientStatusInfoMap.erase(req.reply.getEndpoint().getPrimaryAddress());`
`257`	`257`	`}`
`258`	`258`