From 620467a91b3aad464463df5e61e98364b4372cdf Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Thu, 28 Jul 2022 13:42:34 -0700
Subject: [PATCH] Fix some formatting issues

---
 fdbclient/include/fdbclient/TenantSpecialKeys.actor.h       | 6 +++---
 fdbserver/ClusterController.actor.cpp                       | 3 +--
 .../workloads/TenantManagementConcurrencyWorkload.actor.cpp | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/fdbclient/include/fdbclient/TenantSpecialKeys.actor.h b/fdbclient/include/fdbclient/TenantSpecialKeys.actor.h
index 227bb8faff..2a6cba323d 100644
--- a/fdbclient/include/fdbclient/TenantSpecialKeys.actor.h
+++ b/fdbclient/include/fdbclient/TenantSpecialKeys.actor.h
@@ -207,10 +207,10 @@ private:
 	                                            TenantName beginTenant,
 	                                            TenantName endTenant,
 	                                            std::map<TenantGroupName, int>* tenantGroupNetTenantDelta) {
-		state std::vector<std::pair<TenantName, TenantMapEntry>> tenants = wait(TenantAPI::listTenantsTransaction(
-		    &ryw->getTransaction(), beginTenant, endTenant, CLIENT_KNOBS->TOO_MANY));
+		state std::vector<std::pair<TenantName, TenantMapEntry>> tenants = wait(
+		    TenantAPI::listTenantsTransaction(&ryw->getTransaction(), beginTenant, endTenant, CLIENT_KNOBS->TOO_MANY));
 
-		if (tenants.size() > CLIENT_KNOBS->MAX_TENANTS_PER_CLUSTER) {
+		if (tenants.size() == CLIENT_KNOBS->TOO_MANY) {
 			TraceEvent(SevWarn, "DeleteTenantRangeTooLange")
 			    .detail("BeginTenant", beginTenant)
 			    .detail("EndTenant", endTenant);
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 205175ed50..22161819d1 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -1014,8 +1014,7 @@ void clusterRegisterMaster(ClusterControllerData* self, RegisterMasterRequest co
 	// Construct the client information
 	if (db->clientInfo->get().commitProxies != req.commitProxies ||
 	    db->clientInfo->get().grvProxies != req.grvProxies ||
-	    db->clientInfo->get().tenantMode != db->config.tenantMode ||
-		db->clientInfo->get().clusterId != req.clusterId ||
+	    db->clientInfo->get().tenantMode != db->config.tenantMode || db->clientInfo->get().clusterId != req.clusterId ||
 	    db->clientInfo->get().clusterType != db->clusterType ||
 	    db->clientInfo->get().metaclusterName != db->metaclusterName) {
 		TraceEvent("PublishNewClientInfo", self->id)
diff --git a/fdbserver/workloads/TenantManagementConcurrencyWorkload.actor.cpp b/fdbserver/workloads/TenantManagementConcurrencyWorkload.actor.cpp
index 6f718e33c7..a3b2f35a8b 100644
--- a/fdbserver/workloads/TenantManagementConcurrencyWorkload.actor.cpp
+++ b/fdbserver/workloads/TenantManagementConcurrencyWorkload.actor.cpp
@@ -263,7 +263,6 @@ struct TenantManagementConcurrencyWorkload : TestWorkload {
 		                                self->tenantNamePrefix.withSuffix("\xff"_sr),
 		                                self->maxTenants + 1));
 
-
 		state std::vector<std::pair<TenantName, TenantMapEntry>> metaclusterMap;
 
 		if (self->useMetacluster) {