From 06de25a6802aa88b3576a5e3d917cf41cd5f50e8 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Wed, 27 May 2020 22:25:07 -0700 Subject: [PATCH] bump online notification pause to 100ms also put all online notification redis commands into a single tx --- controller/PostgreSQL.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp index 2a512bbc2..22049389a 100644 --- a/controller/PostgreSQL.cpp +++ b/controller/PostgreSQL.cpp @@ -1590,7 +1590,7 @@ void PostgreSQL::onlineNotificationThread() fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what()); #endif } - std::this_thread::sleep_for(std::chrono::milliseconds(10)); + std::this_thread::sleep_for(std::chrono::milliseconds(100)); } fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str()); @@ -1705,7 +1705,7 @@ void PostgreSQL::onlineNotification_Postgres(PGconn *conn, std::unordered_map< s PQclear(res); } - // std::this_thread::sleep_for(std::chrono::milliseconds(10)); + // 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); @@ -1743,7 +1743,7 @@ void PostgreSQL::onlineNotification_Redis() fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what()); #endif } - std::this_thread::sleep_for(std::chrono::milliseconds(10)); + std::this_thread::sleep_for(std::chrono::milliseconds(100)); } } @@ -1785,8 +1785,6 @@ void PostgreSQL::_doRedisUpdate(sw::redis::Transaction &tx, std::string &control .hmset("member:{"+controllerId+"}:"+networkId+":"+memberId, record.begin(), record.end()); } - tx.exec(); - // expire records from all-nodes and network-nodes member list uint64_t expireOld = OSUtils::now() - 300000;