Merge branch 'release-7.2' into wal-fix

xy-54321 · web-flow · commit d3210f7d1467 · 2023-04-04T12:35:47.000-07:00
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
@@ -999,6 +999,9 @@ ACTOR Future<bool> checkExclusion(Database db,
 	state int64_t totalKvStoreFreeBytes = 0;
 	state int64_t totalKvStoreUsedBytes = 0;
 	state int64_t totalKvStoreUsedBytesNonExcluded = 0;
+	// Keep track if we exclude any storage process with the provided adddresses
+	state bool excludedAddressesContainsStorageRole = false;
+
 	try {
 		for (auto proc : processesMap.obj()) {
 			StatusObjectReader process(proc.second);
@@ -1008,8 +1011,8 @@ ACTOR Future<bool> checkExclusion(Database db,
 				return false;
 			}
 			NetworkAddress addr = NetworkAddress::parse(addrStr);
-			bool excluded =
-			    (process.has("excluded") && process.last().get_bool()) || addressExcluded(*exclusions, addr);
+			bool includedInExclusion = addressExcluded(*exclusions, addr);
+			bool excluded = (process.has("excluded") && process.last().get_bool()) || includedInExclusion;
 
 			StatusObjectReader localityObj;
 			std::string disk_id;
@@ -1022,6 +1025,12 @@ ACTOR Future<bool> checkExclusion(Database db,
 				if (role["role"].get_str() == "storage") {
 					ssTotalCount++;
 
+					// Check if we are excluding a process that serves the storage role. We only have to check the free
+					// capacity if we are excluding at least one process that serves the storage role.
+					if (!excludedAddressesContainsStorageRole && includedInExclusion) {
+						excludedAddressesContainsStorageRole = true;
+					}
+
 					int64_t used_bytes;
 					if (!role.get("kvstore_used_bytes", used_bytes)) {
 						*msg = ManagementAPIError::toJsonString(
@@ -1061,6 +1070,12 @@ ACTOR Future<bool> checkExclusion(Database db,
 		return false;
 	}
 
+	// If the exclusion command only contains processes that serve a non storage role we can skip the free capacity
+	// check in order to not block those exclusions.
+	if (!excludedAddressesContainsStorageRole) {
+		return true;
+	}
+
 	double finalFreeRatio = 1 - (totalKvStoreUsedBytes / (totalKvStoreUsedBytesNonExcluded + totalKvStoreFreeBytes));
 	if (ssExcludedCount == ssTotalCount || finalFreeRatio <= 0.1) {
 		std::string temp = "ERROR: This exclude may cause the total free space in the cluster to drop below 10%.\n"
