ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 04:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't spam the logs quite as much on first startup

Browse Source 
sleep the thread 1 second every round until we're actually updating
members
This commit is contained in:
Grant Limberg 2022-06-22 10:36:29 -07:00
parent 9d4336d296
commit ccc0ebd0f9
No known key found for this signature in database
GPG Key ID: 8F2F97D3BE8D7735
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
controller/PostgreSQL.cpp
View File

@ -1684,6 +1684,7 @@ void PostgreSQL::onlineNotification_Redis()
while (_run == 1) {
fprintf(stderr, "onlineNotification tick\n");
auto start = std::chrono::high_resolution_clock::now();
uint64_t count = 0;
std::unordered_map< std::pair<uint64_t,uint64_t>,std::pair<int64_t,InetAddress>,_PairHasher > lastOnline;
{
@ -1694,10 +1695,10 @@ void PostgreSQL::onlineNotification_Redis()
if (!lastOnline.empty()) {
if (_rc->clusterMode) {
auto tx = _cluster->transaction(controllerId, true);
_doRedisUpdate(tx, controllerId, lastOnline);
count = _doRedisUpdate(tx, controllerId, lastOnline);
} else {
auto tx = _redis->transaction(true);
_doRedisUpdate(tx, controllerId, lastOnline);
count = _doRedisUpdate(tx, controllerId, lastOnline);
}
}
} catch (sw::redis::Error &e) {
@ -1710,11 +1711,15 @@ void PostgreSQL::onlineNotification_Redis()
fprintf(stderr, "onlineNotification ran in %llu ms\n", total);
std::this_thread::yield();
if (count > 0) {
std::this_thread::yield();
} else {
std::this_thread::sleep_for(std::chrono::seconds(1));
}
}
}
void PostgreSQL::_doRedisUpdate(sw::redis::Transaction &tx, std::string &controllerId,
uint64_t PostgreSQL::_doRedisUpdate(sw::redis::Transaction &tx, std::string &controllerId,
std::unordered_map< std::pair<uint64_t,uint64_t>,std::pair<int64_t,InetAddress>,_PairHasher > &lastOnline)
{
@ -1778,6 +1783,8 @@ void PostgreSQL::_doRedisUpdate(sw::redis::Transaction &tx, std::string &control
}
tx.exec();
fprintf(stderr, "%s: Updated online status of %d members\n", _myAddressStr.c_str(), count);
return count;
}

2
controller/PostgreSQL.hpp
View File

@ -138,7 +138,7 @@ private:
void onlineNotificationThread();
void onlineNotification_Postgres();
void onlineNotification_Redis();
void _doRedisUpdate(sw::redis::Transaction &tx, std::string &controllerId,
uint64_t _doRedisUpdate(sw::redis::Transaction &tx, std::string &controllerId,
std::unordered_map< std::pair<uint64_t,uint64_t>,std::pair<int64_t,InetAddress>,_PairHasher > &lastOnline);
enum OverrideMode {