ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-16 06:08:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Central startup update (#1973)

Browse Source 
* allow specifying authtoken in central startup

* set allowManagedFrom

* move redis_mem_notification to the correct place

* add node checkins metric

* wire up min/max connection pool size metrics
This commit is contained in:
Grant Limberg
2023-04-25 12:44:18 -07:00
committed by GitHub
parent 8e6e4ede6d
commit e4cb74896b
5 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller/PostgreSQL.cpp
View File

@ -1145,6 +1145,7 @@ void PostgreSQL::_membersWatcher_Redis() {
_redis->xdel(key, id);
}
lastID = id;
Metrics::redis_mem_notification++;
}
}
}
@ -1687,6 +1688,7 @@ void PostgreSQL::onlineNotification_Postgres()
<< " ON CONFLICT (network_id, member_id) DO UPDATE SET address = EXCLUDED.address, last_updated = EXCLUDED.last_updated";
pipe.insert(memberUpdate.str());
Metrics::pgsql_node_checkin++;
}
while(!pipe.empty()) {
pipe.retrieve();
@ -1794,7 +1796,7 @@ uint64_t PostgreSQL::_doRedisUpdate(sw::redis::Transaction &tx, std::string &con
.sadd("network-nodes-all:{"+controllerId+"}:"+networkId, memberId)
.hmset("member:{"+controllerId+"}:"+networkId+":"+memberId, record.begin(), record.end());
++count;
Metrics::redis_mem_notification++;
Metrics::redis_node_checkin++;
}
// expire records from all-nodes and network-nodes member list