void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove redundant writes when changes come from Central

Browse source 
network & member changes tagged with `"fromCentral": true` will not be rewritten to the db
This commit is contained in:
Grant Limberg 2020-10-05 11:02:40 -07:00
parent 610d4ff016
commit f9396f979f
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
1 changed files with 377 additions and 369 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
controller/PostgreSQL.cpp
View file

@ -1078,6 +1078,10 @@ void PostgreSQL::commitThread()
const std::string objtype = (*config)["objtype"]; const std::string objtype = (*config)["objtype"];
if (objtype == "member") { if (objtype == "member") {
try { try {
bool fromCentral = OSUtils::jsonBool((*config)["fromCentral"], false);
if (!fromCentral) {
// Central already writes all of this to the DB on a change.
// No need for the controller to do it as well.
std::string memberId = (*config)["id"]; std::string memberId = (*config)["id"];
std::string networkId = (*config)["nwid"]; std::string networkId = (*config)["nwid"];
std::string identity = (*config)["identity"]; std::string identity = (*config)["identity"];
@ -1233,6 +1237,7 @@ void PostgreSQL::commitThread()
config = nullptr; config = nullptr;
continue; continue;
} }
}
const uint64_t nwidInt = OSUtils::jsonIntHex((*config)["nwid"], 0ULL); const uint64_t nwidInt = OSUtils::jsonIntHex((*config)["nwid"], 0ULL);
const uint64_t memberidInt = OSUtils::jsonIntHex((*config)["id"], 0ULL); const uint64_t memberidInt = OSUtils::jsonIntHex((*config)["id"], 0ULL);
@ -1254,6 +1259,8 @@ void PostgreSQL::commitThread()
} }
} else if (objtype == "network") { } else if (objtype == "network") {
try { try {
bool fromCentral = OSUtils::jsonBool((*config)["fromCentral"], false);
if (!fromCentral) {
std::string id = (*config)["id"]; std::string id = (*config)["id"];
std::string controllerId = _myAddressStr.c_str(); std::string controllerId = _myAddressStr.c_str();
std::string name = (*config)["name"]; std::string name = (*config)["name"];
@ -1519,6 +1526,7 @@ void PostgreSQL::commitThread()
continue; continue;
} }
PQclear(res); PQclear(res);
}
const uint64_t nwidInt = OSUtils::jsonIntHex((*config)["nwid"], 0ULL); const uint64_t nwidInt = OSUtils::jsonIntHex((*config)["nwid"], 0ULL);
if (nwidInt) { if (nwidInt) {
@ -1639,7 +1647,7 @@ void PostgreSQL::commitThread()
fprintf(stderr, "ERROR: Error getting objtype: %s\n", e.what()); fprintf(stderr, "ERROR: Error getting objtype: %s\n", e.what());
} }
std::this_thread::sleep_for(std::chrono::milliseconds(100)); std::this_thread::sleep_for(std::chrono::milliseconds(1));
} }
PQfinish(conn); PQfinish(conn);