From 0bc8e2cea6d201cd488227b4bd211a896f47d29c Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Wed, 25 May 2022 17:08:02 +0100
Subject: [PATCH] Check if all specific processes are excluded

---
 fdbcli/ExcludeCommand.actor.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/fdbcli/ExcludeCommand.actor.cpp b/fdbcli/ExcludeCommand.actor.cpp
index 9cdeab276e..205ad62eff 100644
--- a/fdbcli/ExcludeCommand.actor.cpp
+++ b/fdbcli/ExcludeCommand.actor.cpp
@@ -160,6 +160,28 @@ ACTOR Future<std::set<NetworkAddress>> checkForExcludingServers(Reference<IDatab
 			for (const auto& addr : exclusionInProgress)
 				inProgressExclusion.insert(NetworkAddress::parse(
 				    addr.key.removePrefix(fdb_cli::exclusionInProgressSpecialKeyRange.begin).toString()));
+
+			// Check if all of the specified exclusions are done.
+			bool allExcluded = true;
+			for (const auto& inProgressAddr : exclusionInProgress) {
+				if (!allExcluded) {
+					break;
+				}
+
+				for (const auto& exclusion : exclusions) {
+					// We found an exclusion that is still in progress
+					if (exclusion.excludes(inProgressAddr)) {
+						allExcluded = false;
+						break;
+					}
+				}
+			}
+
+			if (allExcluded) {
+				inProgressExclusion.clear();
+				return inProgressExclusion;
+			}
+
 			if (!waitForAllExcluded)
 				break;