From 08443ed18d929f2cec3d2584e0968d3b59e4e917 Mon Sep 17 00:00:00 2001
From: Meng Xu <meng_xu@apple.com>
Date: Tue, 4 Feb 2020 17:06:02 -0800
Subject: [PATCH] FastRestore:Remove debug trace for debugging connection
 errors

---
 fdbclient/MonitorLeader.actor.cpp | 2 --
 fdbclient/NativeAPI.actor.cpp     | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
index b1d4f992ec..6a5c4195de 100644
--- a/fdbclient/MonitorLeader.actor.cpp
+++ b/fdbclient/MonitorLeader.actor.cpp
@@ -728,9 +728,7 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration( Reference<ClusterCo
 			incorrectTime = Optional<double>();
 		}
 
-		TraceEvent("MXTEST_MonitorProxiesOneGenerationStart");
 		state ErrorOr<CachedSerialization<ClientDBInfo>> rep = wait( clientLeaderServer.openDatabase.tryGetReply( req, TaskPriority::CoordinationReply ) );
-		TraceEvent("MXTEST_MonitorProxiesOneGenerationEnd").detail("Rep", rep.present());
 		if (rep.present()) {
 			if( rep.get().read().forward.present() ) {
 				TraceEvent("MonitorProxiesForwarding").detail("NewConnStr", rep.get().read().forward.get().toString()).detail("OldConnStr", info.intermediateConnFile->getConnectionString().toString());
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 1dd3be38ee..f3ce951e0d 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -776,7 +776,6 @@ Future<Void> DatabaseContext::connectionFileChanged() {
 extern IPAddress determinePublicIPAutomatically(ClusterConnectionString const& ccs);
 
 Database Database::createDatabase( Reference<ClusterConnectionFile> connFile, int apiVersion, bool internal, LocalityData const& clientLocality, DatabaseContext *preallocatedDb ) {
-	TraceEvent("MX1");
 	if(!g_network)
 		throw network_not_setup();
 
@@ -811,9 +810,7 @@ Database Database::createDatabase( Reference<ClusterConnectionFile> connFile, in
 	Reference<AsyncVar<ClientDBInfo>> clientInfo(new AsyncVar<ClientDBInfo>());
 	Reference<AsyncVar<Reference<ClusterConnectionFile>>> connectionFile(new AsyncVar<Reference<ClusterConnectionFile>>());
 	connectionFile->set(connFile);
-	TraceEvent("MX2");
 	Future<Void> clientInfoMonitor = monitorProxies(connectionFile, clientInfo, networkOptions.supportedVersions, StringRef(networkOptions.traceLogGroup));
-	TraceEvent("MX3");
 
 	DatabaseContext *db;
 	if(preallocatedDb) {
@@ -823,7 +820,6 @@ Database Database::createDatabase( Reference<ClusterConnectionFile> connFile, in
 		db = new DatabaseContext(connectionFile, clientInfo, clientInfoMonitor, TaskPriority::DefaultEndpoint, clientLocality, true, false, internal, apiVersion, /*switchable*/ true);
 	}
 
-	TraceEvent("MX4");
 	return Database(db);
 }