From 135a547889122472bb0004c4f0e6d81d435b9524 Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Thu, 28 May 2020 19:22:07 -0700
Subject: [PATCH] No longer update both pgsql & redis

---
 controller/PostgreSQL.cpp | 82 +++++++++++----------------------------
 controller/PostgreSQL.hpp |  2 +-
 2 files changed, 24 insertions(+), 60 deletions(-)

diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp
index 22049389a..a9f9500bb 100644
--- a/controller/PostgreSQL.cpp
+++ b/controller/PostgreSQL.cpp
@@ -1558,6 +1558,15 @@ void PostgreSQL::onlineNotificationThread()
 {
 	waitForReady();
 
+	if (_rc != NULL) {
+		onlineNotification_Redis();
+	} else {
+		onlineNotification_Postgres();
+	}
+}
+
+void PostgreSQL::onlineNotification_Postgres()
+{
 	PGconn *conn = getPgConn();
 	if (PQstatus(conn) == CONNECTION_BAD) {
 		fprintf(stderr, "Connection to database failed: %s\n", PQerrorMessage(conn));
@@ -1566,64 +1575,19 @@ void PostgreSQL::onlineNotificationThread()
 	}
 	_connected = 1;
 
-	while (_run == 1) {
-		std::unordered_map< std::pair<uint64_t,uint64_t>,std::pair<int64_t,InetAddress>,_PairHasher > lastOnline;
-		{
-			std::lock_guard<std::mutex> l(_lastOnline_l);
-			lastOnline.swap(_lastOnline);
-		}
-
-		onlineNotification_Postgres(conn, lastOnline);
-
-		try {
-			if (!lastOnline.empty()) {
-				if (_rc->clusterMode) {
-					auto tx = _cluster->transaction(_myAddressStr, true);
-					_doRedisUpdate(tx, _myAddressStr, lastOnline);
-				} else {
-					auto tx = _redis->transaction(true);
-					_doRedisUpdate(tx, _myAddressStr, lastOnline);
-				}
-			}
-		} catch (sw::redis::Error &e) {
-#ifdef ZT_TRACE
-			fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what());
-#endif
-		}
-		std::this_thread::sleep_for(std::chrono::milliseconds(100));
-	}
-
-	fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
-	PQfinish(conn);
-	if (_run == 1) {
-		fprintf(stderr, "ERROR: %s onlineNotificationThread should still be running! Exiting Controller.\n", _myAddressStr.c_str());
-		exit(6);
-	}
-
-	// if (_rc != NULL) {
-	// 	onlineNotification_Redis();
-	// } else {
-	// 	onlineNotification_Postgres();
-	// }
-}
-
-void PostgreSQL::onlineNotification_Postgres(PGconn *conn, std::unordered_map< std::pair<uint64_t,uint64_t>,std::pair<int64_t,InetAddress>,_PairHasher > &lastOnline)
-{
-	
-
 	nlohmann::json jtmp1, jtmp2;
-	// while (_run == 1) {
+	while (_run == 1) {
 		if (PQstatus(conn) != CONNECTION_OK) {
 			fprintf(stderr, "ERROR: Online Notification thread lost connection to Postgres.");
 			PQfinish(conn);
 			exit(5);
 		}
 
-		// std::unordered_map< std::pair<uint64_t,uint64_t>,std::pair<int64_t,InetAddress>,_PairHasher > lastOnline;
-		// {
-		// 	std::lock_guard<std::mutex> l(_lastOnline_l);
-		// 	lastOnline.swap(_lastOnline);
-		// }
+		std::unordered_map< std::pair<uint64_t,uint64_t>,std::pair<int64_t,InetAddress>,_PairHasher > lastOnline;
+		{
+			std::lock_guard<std::mutex> l(_lastOnline_l);
+			lastOnline.swap(_lastOnline);
+		}
 
 		PGresult *res = NULL;
 
@@ -1705,14 +1669,14 @@ void PostgreSQL::onlineNotification_Postgres(PGconn *conn, std::unordered_map< s
 			PQclear(res);
 		}
 
-	// 	std::this_thread::sleep_for(std::chrono::milliseconds(100));
-	// }
-	// fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
-	// PQfinish(conn);
-	// if (_run == 1) {
-	// 	fprintf(stderr, "ERROR: %s onlineNotificationThread should still be running! Exiting Controller.\n", _myAddressStr.c_str());
-	// 	exit(6);
-	// }
+		std::this_thread::sleep_for(std::chrono::milliseconds(100));
+	}
+	fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
+	PQfinish(conn);
+	if (_run == 1) {
+		fprintf(stderr, "ERROR: %s onlineNotificationThread should still be running! Exiting Controller.\n", _myAddressStr.c_str());
+		exit(6);
+	}
 }
 
 void PostgreSQL::onlineNotification_Redis()
diff --git a/controller/PostgreSQL.hpp b/controller/PostgreSQL.hpp
index 061349e1e..f61670132 100644
--- a/controller/PostgreSQL.hpp
+++ b/controller/PostgreSQL.hpp
@@ -70,7 +70,7 @@ private:
 
 	void commitThread();
 	void onlineNotificationThread();
-	void onlineNotification_Postgres(PGconn *conn, std::unordered_map< std::pair<uint64_t,uint64_t>,std::pair<int64_t,InetAddress>,_PairHasher > &lastOnline);
+	void onlineNotification_Postgres();
 	void onlineNotification_Redis();
 	void _doRedisUpdate(sw::redis::Transaction &tx, std::string &controllerId, 
 		std::unordered_map< std::pair<uint64_t,uint64_t>,std::pair<int64_t,InetAddress>,_PairHasher > &lastOnline);