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

Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2020-08-25 08:07:23 -07:00
commit 47e9fb3ddb
3 changed files with 147 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

263
controller/PostgreSQL.cpp
View file

@ -273,18 +273,18 @@ void PostgreSQL::initializeNetworks(PGconn *conn)
std::string setKey = "networks:{" + _myAddressStr + "}"; std::string setKey = "networks:{" + _myAddressStr + "}";
if (_rc != NULL) { // if (_rc != NULL) {
try { // try {
if (_rc->clusterMode) { // if (_rc->clusterMode) {
_cluster->del(setKey); // _cluster->del(setKey);
} else { // } else {
_redis->del(setKey); // _redis->del(setKey);
} // }
} catch (sw::redis::Error &e) { // } catch (sw::redis::Error &e) {
// del can throw an error if the key doesn't exist // // del can throw an error if the key doesn't exist
// swallow it and move along // // swallow it and move along
} // }
} // }
std::unordered_set<std::string> networkSet; std::unordered_set<std::string> networkSet;
@ -475,17 +475,17 @@ void PostgreSQL::initializeNetworks(PGconn *conn)
PQclear(res); PQclear(res);
if(!networkSet.empty()) { // if(!networkSet.empty()) {
if (_rc && _rc->clusterMode) { // if (_rc && _rc->clusterMode) {
auto tx = _cluster->transaction(_myAddressStr, true); // auto tx = _cluster->transaction(_myAddressStr, true);
tx.sadd(setKey, networkSet.begin(), networkSet.end()); // tx.sadd(setKey, networkSet.begin(), networkSet.end());
tx.exec(); // tx.exec();
} else if (_rc && !_rc->clusterMode) { // } else if (_rc && !_rc->clusterMode) {
auto tx = _redis->transaction(true); // auto tx = _redis->transaction(true);
tx.sadd(setKey, networkSet.begin(), networkSet.end()); // tx.sadd(setKey, networkSet.begin(), networkSet.end());
tx.exec(); // tx.exec();
} // }
} // }
if (++this->_ready == 2) { if (++this->_ready == 2) {
if (_waitNoticePrinted) { if (_waitNoticePrinted) {
@ -509,36 +509,36 @@ void PostgreSQL::initializeMembers(PGconn *conn)
fprintf(stderr, "Bad Database Connection: %s", PQerrorMessage(conn)); fprintf(stderr, "Bad Database Connection: %s", PQerrorMessage(conn));
exit(1); exit(1);
} }
std::string setKeyBase = "network-nodes-all:{" + _myAddressStr + "}:"; // std::string setKeyBase = "network-nodes-all:{" + _myAddressStr + "}:";
if (_rc != NULL) { // if (_rc != NULL) {
std::lock_guard<std::mutex> l(_networks_l); // std::lock_guard<std::mutex> l(_networks_l);
std::unordered_set<std::string> deletes; // std::unordered_set<std::string> deletes;
for ( auto it : _networks) { // for ( auto it : _networks) {
uint64_t nwid_i = it.first; // uint64_t nwid_i = it.first;
char nwidTmp[64] = {0}; // char nwidTmp[64] = {0};
OSUtils::ztsnprintf(nwidTmp, sizeof(nwidTmp), "%.16llx", nwid_i); // OSUtils::ztsnprintf(nwidTmp, sizeof(nwidTmp), "%.16llx", nwid_i);
std::string nwid(nwidTmp); // std::string nwid(nwidTmp);
std::string key = setKeyBase + nwid; // std::string key = setKeyBase + nwid;
deletes.insert(key); // deletes.insert(key);
} // }
if (!deletes.empty()) { // if (!deletes.empty()) {
if (_rc->clusterMode) { // if (_rc->clusterMode) {
auto tx = _cluster->transaction(_myAddressStr, true); // auto tx = _cluster->transaction(_myAddressStr, true);
for (std::string k : deletes) { // for (std::string k : deletes) {
tx.del(k); // tx.del(k);
} // }
tx.exec(); // tx.exec();
} else { // } else {
auto tx = _redis->transaction(true); // auto tx = _redis->transaction(true);
for (std::string k : deletes) { // for (std::string k : deletes) {
tx.del(k); // tx.del(k);
} // }
tx.exec(); // tx.exec();
} // }
} // }
} // }
const char *params[1] = { const char *params[1] = {
_myAddressStr.c_str() _myAddressStr.c_str()
@ -578,7 +578,7 @@ void PostgreSQL::initializeMembers(PGconn *conn)
std::string memberId(PQgetvalue(res, i, 0)); std::string memberId(PQgetvalue(res, i, 0));
std::string networkId(PQgetvalue(res, i, 1)); std::string networkId(PQgetvalue(res, i, 1));
networkMembers.insert(std::pair<std::string, std::string>(setKeyBase+networkId, memberId)); // networkMembers.insert(std::pair<std::string, std::string>(setKeyBase+networkId, memberId));
std::string ctime = PQgetvalue(res, i, 5); std::string ctime = PQgetvalue(res, i, 5);
config["id"] = memberId; config["id"] = memberId;
@ -685,23 +685,23 @@ void PostgreSQL::initializeMembers(PGconn *conn)
PQclear(res); PQclear(res);
if (!networkMembers.empty()) { // if (!networkMembers.empty()) {
if (_rc != NULL) { // if (_rc != NULL) {
if (_rc->clusterMode) { // if (_rc->clusterMode) {
auto tx = _cluster->transaction(_myAddressStr, true); // auto tx = _cluster->transaction(_myAddressStr, true);
for (auto it : networkMembers) { // for (auto it : networkMembers) {
tx.sadd(it.first, it.second); // tx.sadd(it.first, it.second);
} // }
tx.exec(); // tx.exec();
} else { // } else {
auto tx = _redis->transaction(true); // auto tx = _redis->transaction(true);
for (auto it : networkMembers) { // for (auto it : networkMembers) {
tx.sadd(it.first, it.second); // tx.sadd(it.first, it.second);
} // }
tx.exec(); // tx.exec();
} // }
} // }
} // }
if (++this->_ready == 2) { if (++this->_ready == 2) {
if (_waitNoticePrinted) { if (_waitNoticePrinted) {
fprintf(stderr,"[%s] NOTICE: %.10llx controller PostgreSQL data download complete." ZT_EOL_S,_timestr(),(unsigned long long)_myAddress.toInt()); fprintf(stderr,"[%s] NOTICE: %.10llx controller PostgreSQL data download complete." ZT_EOL_S,_timestr(),(unsigned long long)_myAddress.toInt());
@ -755,7 +755,7 @@ void PostgreSQL::heartbeat()
std::string build = std::to_string(ZEROTIER_ONE_VERSION_BUILD); std::string build = std::to_string(ZEROTIER_ONE_VERSION_BUILD);
std::string now = std::to_string(ts); std::string now = std::to_string(ts);
std::string host_port = std::to_string(_listenPort); std::string host_port = std::to_string(_listenPort);
std::string use_redis = (_rc != NULL) ? "true" : "false"; std::string use_redis = "false"; // (_rc != NULL) ? "true" : "false";
const char *values[10] = { const char *values[10] = {
controllerId, controllerId,
hostname, hostname,
@ -788,13 +788,13 @@ void PostgreSQL::heartbeat()
} }
PQclear(res); PQclear(res);
} }
if (_rc != NULL) { // if (_rc != NULL) {
if (_rc->clusterMode) { // if (_rc->clusterMode) {
_cluster->zadd("controllers", controllerId, ts); // _cluster->zadd("controllers", controllerId, ts);
} else { // } else {
_redis->zadd("controllers", controllerId, ts); // _redis->zadd("controllers", controllerId, ts);
} // }
} // }
std::this_thread::sleep_for(std::chrono::milliseconds(1000)); std::this_thread::sleep_for(std::chrono::milliseconds(1000));
} }
@ -833,6 +833,7 @@ void PostgreSQL::membersDbWatcher()
void PostgreSQL::_membersWatcher_Postgres(PGconn *conn) { void PostgreSQL::_membersWatcher_Postgres(PGconn *conn) {
char buf[11] = {0}; char buf[11] = {0};
std::string cmd = "LISTEN member_" + std::string(_myAddress.toString(buf)); std::string cmd = "LISTEN member_" + std::string(_myAddress.toString(buf));
fprintf(stderr, "Listening to member stream: %s\n", cmd.c_str());
PGresult *res = PQexec(conn, cmd.c_str()); PGresult *res = PQexec(conn, cmd.c_str());
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) { if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr, "LISTEN command failed: %s\n", PQresultErrorMessage(res)); fprintf(stderr, "LISTEN command failed: %s\n", PQresultErrorMessage(res));
@ -874,7 +875,7 @@ void PostgreSQL::_membersWatcher_Postgres(PGconn *conn) {
void PostgreSQL::_membersWatcher_Redis() { void PostgreSQL::_membersWatcher_Redis() {
char buf[11] = {0}; char buf[11] = {0};
std::string key = "member-stream:{" + std::string(_myAddress.toString(buf)) + "}"; std::string key = "member-stream:{" + std::string(_myAddress.toString(buf)) + "}";
fprintf(stderr, "Listening to member stream: %s\n", key.c_str());
while (_run == 1) { while (_run == 1) {
try { try {
json tmp; json tmp;
@ -1515,20 +1516,20 @@ void PostgreSQL::commitThread()
} catch (std::exception &e) { } catch (std::exception &e) {
fprintf(stderr, "ERROR: Error updating member: %s\n", e.what()); fprintf(stderr, "ERROR: Error updating member: %s\n", e.what());
} }
if (_rc != NULL) { // if (_rc != NULL) {
try { // try {
std::string id = (*config)["id"]; // std::string id = (*config)["id"];
std::string controllerId = _myAddressStr.c_str(); // std::string controllerId = _myAddressStr.c_str();
std::string key = "networks:{" + controllerId + "}"; // std::string key = "networks:{" + controllerId + "}";
if (_rc->clusterMode) { // if (_rc->clusterMode) {
_cluster->sadd(key, id); // _cluster->sadd(key, id);
} else { // } else {
_redis->sadd(key, id); // _redis->sadd(key, id);
} // }
} catch (sw::redis::Error &e) { // } catch (sw::redis::Error &e) {
fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what()); // fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what());
} // }
} // }
} else if (objtype == "_delete_network") { } else if (objtype == "_delete_network") {
try { try {
std::string networkId = (*config)["nwid"]; std::string networkId = (*config)["nwid"];
@ -1552,22 +1553,22 @@ void PostgreSQL::commitThread()
} catch (std::exception &e) { } catch (std::exception &e) {
fprintf(stderr, "ERROR: Error deleting network: %s\n", e.what()); fprintf(stderr, "ERROR: Error deleting network: %s\n", e.what());
} }
if (_rc != NULL) { // if (_rc != NULL) {
try { // try {
std::string id = (*config)["id"]; // std::string id = (*config)["id"];
std::string controllerId = _myAddressStr.c_str(); // std::string controllerId = _myAddressStr.c_str();
std::string key = "networks:{" + controllerId + "}"; // std::string key = "networks:{" + controllerId + "}";
if (_rc->clusterMode) { // if (_rc->clusterMode) {
_cluster->srem(key, id); // _cluster->srem(key, id);
_cluster->del("network-nodes-online:{"+controllerId+"}:"+id); // _cluster->del("network-nodes-online:{"+controllerId+"}:"+id);
} else { // } else {
_redis->srem(key, id); // _redis->srem(key, id);
_redis->del("network-nodes-online:{"+controllerId+"}:"+id); // _redis->del("network-nodes-online:{"+controllerId+"}:"+id);
} // }
} catch (sw::redis::Error &e) { // } catch (sw::redis::Error &e) {
fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what()); // fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what());
} // }
} // }
} else if (objtype == "_delete_member") { } else if (objtype == "_delete_member") {
try { try {
std::string memberId = (*config)["id"]; std::string memberId = (*config)["id"];
@ -1595,23 +1596,23 @@ void PostgreSQL::commitThread()
} catch (std::exception &e) { } catch (std::exception &e) {
fprintf(stderr, "ERROR: Error deleting member: %s\n", e.what()); fprintf(stderr, "ERROR: Error deleting member: %s\n", e.what());
} }
if (_rc != NULL) { // if (_rc != NULL) {
try { // try {
std::string memberId = (*config)["id"]; // std::string memberId = (*config)["id"];
std::string networkId = (*config)["nwid"]; // std::string networkId = (*config)["nwid"];
std::string controllerId = _myAddressStr.c_str(); // std::string controllerId = _myAddressStr.c_str();
std::string key = "network-nodes-all:{" + controllerId + "}:" + networkId; // std::string key = "network-nodes-all:{" + controllerId + "}:" + networkId;
if (_rc->clusterMode) { // if (_rc->clusterMode) {
_cluster->srem(key, memberId); // _cluster->srem(key, memberId);
_cluster->del("member:{"+controllerId+"}:"+networkId+":"+memberId); // _cluster->del("member:{"+controllerId+"}:"+networkId+":"+memberId);
} else { // } else {
_redis->srem(key, memberId); // _redis->srem(key, memberId);
_redis->del("member:{"+controllerId+"}:"+networkId+":"+memberId); // _redis->del("member:{"+controllerId+"}:"+networkId+":"+memberId);
} // }
} catch (sw::redis::Error &e) { // } catch (sw::redis::Error &e) {
fprintf(stderr, "ERROR: Error deleting member from Redis: %s\n", e.what()); // fprintf(stderr, "ERROR: Error deleting member from Redis: %s\n", e.what());
} // }
} // }
} else { } else {
fprintf(stderr, "ERROR: unknown objtype"); fprintf(stderr, "ERROR: unknown objtype");
} }
@ -1619,7 +1620,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(10)); std::this_thread::sleep_for(std::chrono::milliseconds(100));
} }
PQfinish(conn); PQfinish(conn);
@ -1634,11 +1635,11 @@ void PostgreSQL::onlineNotificationThread()
{ {
waitForReady(); waitForReady();
if (_rc != NULL) { // if (_rc != NULL) {
onlineNotification_Redis(); // onlineNotification_Redis();
} else { // } else {
onlineNotification_Postgres(); onlineNotification_Postgres();
} // }
} }
void PostgreSQL::onlineNotification_Postgres() void PostgreSQL::onlineNotification_Postgres()
@ -1783,7 +1784,7 @@ void PostgreSQL::onlineNotification_Redis()
fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what()); fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what());
#endif #endif
} }
std::this_thread::sleep_for(std::chrono::milliseconds(100)); std::this_thread::sleep_for(std::chrono::seconds(10));
} }
} }

4
node/Bond.hpp
View file

@ -87,7 +87,9 @@ public:
std::string policyAlias() { return _policyAlias; } std::string policyAlias() { return _policyAlias; }
/** /**
* Inform the bond about the path that its peer (owning object) just learned about * Inform the bond about the path that its peer (owning object) just learned about.
* If the path is allowed to be used, it will be inducted into the bond on a trial
* period where link statistics will be collected to judge its quality.
* *
* @param path Newly-learned Path which should now be handled by the Bond * @param path Newly-learned Path which should now be handled by the Bond
* @param now Current time * @param now Current time

19
service/OneService.cpp
View file

@ -1630,7 +1630,6 @@ public:
// Custom Policies // Custom Policies
json &customBondingPolicies = settings["policies"]; json &customBondingPolicies = settings["policies"];
for (json::iterator policyItr = customBondingPolicies.begin(); policyItr != customBondingPolicies.end();++policyItr) { for (json::iterator policyItr = customBondingPolicies.begin(); policyItr != customBondingPolicies.end();++policyItr) {
//fprintf(stderr, "\n\n--- (%s)\n", policyItr.key().c_str());
// Custom Policy // Custom Policy
std::string customPolicyStr(policyItr.key()); std::string customPolicyStr(policyItr.key());
json &customPolicy = policyItr.value(); json &customPolicy = policyItr.value();
@ -1684,7 +1683,6 @@ public:
// Policy-Specific link set // Policy-Specific link set
json &links = customPolicy["links"]; json &links = customPolicy["links"];
for (json::iterator linkItr = links.begin(); linkItr != links.end();++linkItr) { for (json::iterator linkItr = links.begin(); linkItr != links.end();++linkItr) {
//fprintf(stderr, "\t--- link (%s)\n", linkItr.key().c_str());
std::string linkNameStr(linkItr.key()); std::string linkNameStr(linkItr.key());
json &link = linkItr.value(); json &link = linkItr.value();
@ -1719,12 +1717,19 @@ public:
} }
_node->bondController()->addCustomLink(customPolicyStr, new Link(linkNameStr,ipvPref,speed,linkMonitorInterval,upDelay,downDelay,enabled,linkMode,failoverToStr,alloc)); _node->bondController()->addCustomLink(customPolicyStr, new Link(linkNameStr,ipvPref,speed,linkMonitorInterval,upDelay,downDelay,enabled,linkMode,failoverToStr,alloc));
} }
// TODO: This is dumb
std::string linkSelectMethodStr(OSUtils::jsonString(customPolicy["activeReselect"],"optimize")); std::string linkSelectMethodStr(OSUtils::jsonString(customPolicy["activeReselect"],"optimize"));
if (linkSelectMethodStr == "always") { newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_ALWAYS); } if (linkSelectMethodStr == "always") {
if (linkSelectMethodStr == "better") { newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_BETTER); } newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_ALWAYS);
if (linkSelectMethodStr == "failure") { newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_FAILURE); } }
if (linkSelectMethodStr == "optimize") { newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_OPTIMIZE); } if (linkSelectMethodStr == "better") {
newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_BETTER);
}
if (linkSelectMethodStr == "failure") {
newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_FAILURE);
}
if (linkSelectMethodStr == "optimize") {
newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_OPTIMIZE);
}
if (newTemplateBond->getLinkSelectMethod() < 0 || newTemplateBond->getLinkSelectMethod() > 3) { if (newTemplateBond->getLinkSelectMethod() < 0 || newTemplateBond->getLinkSelectMethod() > 3) {
fprintf(stderr, "warning: invalid value (%s) for linkSelectMethod, assuming mode: always\n", linkSelectMethodStr.c_str()); fprintf(stderr, "warning: invalid value (%s) for linkSelectMethod, assuming mode: always\n", linkSelectMethodStr.c_str());
} }