From 766dc23e26e04f1113da654288304e3092d2676d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <ejt@apple.com>
Date: Fri, 2 Jun 2017 13:52:21 -0700
Subject: [PATCH] fix: do not use TLS in protectedAddresses

---
 fdbclient/ManagementAPI.actor.cpp                 | 2 +-
 fdbserver/SimulatedCluster.actor.cpp              | 2 +-
 fdbserver/workloads/RemoveServersSafely.actor.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index e69ab9859e..81a306c9d4 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -705,7 +705,7 @@ ACTOR Future<CoordinatorsResult::Type> changeQuorum( Database cx, Reference<IQuo
 
 			if(g_network->isSimulated()) {
 				for(int i = 0; i < (desiredCoordinators.size()/2)+1; i++) {
-					g_simulator.protectedAddresses.insert( desiredCoordinators[i] );
+					g_simulator.protectedAddresses.insert( NetworkAddress(desiredCoordinators[i].ip,desiredCoordinators[i].port,true,false) );
 				}
 			}
 
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index 7a0849dd8d..9eacebc403 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -745,7 +745,7 @@ void setupSimulatedSystem( vector<Future<Void>> *systemActors, std::string baseF
 	g_random->randomShuffle(coordinatorAddresses);
 	for(int i = 0; i < (coordinatorAddresses.size()/2)+1; i++) {
 		TraceEvent("ProtectMachine").detail("Address", coordinatorAddresses[i]).detail("Coordinators", coordinatorAddresses.size()).backtrace();
-		g_simulator.protectedAddresses.insert(coordinatorAddresses[i]);
+		g_simulator.protectedAddresses.insert(NetworkAddress(coordinatorAddresses[i].ip,coordinatorAddresses[i].port,true,false));
 	}
 	g_random->randomShuffle(coordinatorAddresses);
 
diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp
index 1ee6a3c527..938deb0839 100644
--- a/fdbserver/workloads/RemoveServersSafely.actor.cpp
+++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp
@@ -359,7 +359,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 			}
 			if (removedCount >= 1) {
 				TraceEvent("ProtectMachine").detail("Address", addr).detail("Coordinators", coordinators.size()).backtrace();
-				g_simulator.protectedAddresses.insert(addr);
+				g_simulator.protectedAddresses.insert(NetworkAddress(addr.ip,addr.port,true,false));
 				safeCoordinators.push_back(addr);
 				safeCount++;
 			}