RethinkDB direct connectivity integration.
This commit is contained in:
Adam Ierymenko
parent
4e88c80a22
commit
f5014d7d71
4 changed files with 477 additions and 254 deletions
|
|
@ -1,4 +1,25 @@
|
|||
/*
|
||||
* ZeroTier One - Network Virtualization Everywhere
|
||||
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifdef ZT_CONTROLLER_USE_RETHINKDB
|
||||
|
||||
#include "RethinkDB.hpp"
|
||||
#include "EmbeddedNetworkController.hpp"
|
||||
|
||||
#include <chrono>
|
||||
#include <algorithm>
|
||||
|
|
@ -7,19 +28,25 @@
|
|||
#include "../ext/librethinkdbxx/build/include/rethinkdb.h"
|
||||
|
||||
namespace R = RethinkDB;
|
||||
using nlohmann::json;
|
||||
using json = nlohmann::json;
|
||||
|
||||
namespace ZeroTier {
|
||||
|
||||
RethinkDB::RethinkDB(const Address &myAddress,const char *host,const int port,const char *db,const char *auth) :
|
||||
RethinkDB::RethinkDB(EmbeddedNetworkController *const nc,const Address &myAddress,const char *path) :
|
||||
_controller(nc),
|
||||
_myAddress(myAddress),
|
||||
_host(host ? host : "127.0.0.1"),
|
||||
_db(db),
|
||||
_auth(auth ? auth : ""),
|
||||
_port((port > 0) ? port : 28015),
|
||||
_ready(2), // two tables need to be synchronized before we're ready
|
||||
_run(1)
|
||||
_ready(2), // two tables need to be synchronized before we're ready, so this is ready when it reaches 0
|
||||
_run(1),
|
||||
_waitNoticePrinted(false)
|
||||
{
|
||||
std::vector<std::string> ps(OSUtils::split(path,":","",""));
|
||||
if ((ps.size() != 5)||(ps[0] != "rethinkdb"))
|
||||
throw std::runtime_error("invalid rethinkdb database url");
|
||||
_host = ps[1];
|
||||
_db = ps[2];
|
||||
_auth = ps[3];
|
||||
_port = Utils::strToInt(ps[4].c_str());
|
||||
|
||||
_readyLock.lock();
|
||||
|
||||
{
|
||||
|
|
@ -31,29 +58,35 @@ RethinkDB::RethinkDB(const Address &myAddress,const char *host,const int port,co
|
|||
_membersDbWatcher = std::thread([this]() {
|
||||
while (_run == 1) {
|
||||
try {
|
||||
auto rdb = R::connect(this->_host,this->_port,this->_auth);
|
||||
std::unique_ptr<R::Connection> rdb(R::connect(this->_host,this->_port,this->_auth));
|
||||
if (rdb) {
|
||||
_membersDbWatcherConnection = (void *)rdb.get();
|
||||
auto cur = R::db(this->_db).table("Member").get_all(this->_myAddressStr,R::optargs("index","controllerId")).changes(R::optargs("squash",0.1,"include_initial",true,"include_types",true,"include_states",true)).run(*rdb);
|
||||
auto cur = R::db(this->_db).table("Member",R::optargs("read_mode","outdated")).get_all(this->_myAddressStr,R::optargs("index","controllerId")).changes(R::optargs("squash",0.05,"include_initial",true,"include_types",true,"include_states",true)).run(*rdb);
|
||||
while (cur.has_next()) {
|
||||
if (_run != 1) break;
|
||||
json tmp(json::parse(cur.next().as_json()));
|
||||
if ((tmp["type"] == "state")&&(tmp["state"] == "ready")) {
|
||||
if (--this->_ready == 0)
|
||||
if (--this->_ready == 0) {
|
||||
if (_waitNoticePrinted)
|
||||
fprintf(stderr,"NOTICE: controller RethinkDB data download complete." ZT_EOL_S);
|
||||
this->_readyLock.unlock();
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
this->_memberChanged(tmp["old_val"],tmp["new_val"]);
|
||||
json &ov = tmp["old_val"];
|
||||
json &nv = tmp["new_val"];
|
||||
if (ov.is_object()||nv.is_object())
|
||||
this->_memberChanged(ov,nv);
|
||||
} catch ( ... ) {} // ignore bad records
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (std::exception &e) {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB: %s" ZT_EOL_S,e.what());
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (member change stream): %s" ZT_EOL_S,e.what());
|
||||
} catch (R::Error &e) {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB: %s" ZT_EOL_S,e.message.c_str());
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (member change stream): %s" ZT_EOL_S,e.message.c_str());
|
||||
} catch ( ... ) {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB: unknown exception" ZT_EOL_S);
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (member change stream): unknown exception" ZT_EOL_S);
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(250));
|
||||
}
|
||||
|
|
@ -62,50 +95,131 @@ RethinkDB::RethinkDB(const Address &myAddress,const char *host,const int port,co
|
|||
_networksDbWatcher = std::thread([this]() {
|
||||
while (_run == 1) {
|
||||
try {
|
||||
auto rdb = R::connect(this->_host,this->_port,this->_auth);
|
||||
std::unique_ptr<R::Connection> rdb(R::connect(this->_host,this->_port,this->_auth));
|
||||
if (rdb) {
|
||||
_membersDbWatcherConnection = (void *)rdb.get();
|
||||
auto cur = R::db(this->_db).table("Network").get_all(this->_myAddressStr,R::optargs("index","controllerId")).changes(R::optargs("squash",0.1,"include_initial",true,"include_types",true,"include_states",true)).run(*rdb);
|
||||
auto cur = R::db(this->_db).table("Network",R::optargs("read_mode","outdated")).get_all(this->_myAddressStr,R::optargs("index","controllerId")).changes(R::optargs("squash",0.05,"include_initial",true,"include_types",true,"include_states",true)).run(*rdb);
|
||||
while (cur.has_next()) {
|
||||
if (_run != 1) break;
|
||||
json tmp(json::parse(cur.next().as_json()));
|
||||
if ((tmp["type"] == "state")&&(tmp["state"] == "ready")) {
|
||||
if (--this->_ready == 0)
|
||||
if (--this->_ready == 0) {
|
||||
if (_waitNoticePrinted)
|
||||
fprintf(stderr,"NOTICE: controller RethinkDB data download complete." ZT_EOL_S);
|
||||
this->_readyLock.unlock();
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
this->_networkChanged(tmp["old_val"],tmp["new_val"]);
|
||||
json &ov = tmp["old_val"];
|
||||
json &nv = tmp["new_val"];
|
||||
if (ov.is_object()||nv.is_object())
|
||||
this->_networkChanged(ov,nv);
|
||||
} catch ( ... ) {} // ignore bad records
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (std::exception &e) {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB: %s" ZT_EOL_S,e.what());
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (network change stream): %s" ZT_EOL_S,e.what());
|
||||
} catch (R::Error &e) {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB: %s" ZT_EOL_S,e.message.c_str());
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (network change stream): %s" ZT_EOL_S,e.message.c_str());
|
||||
} catch ( ... ) {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB: unknown exception" ZT_EOL_S);
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (network change stream): unknown exception" ZT_EOL_S);
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(250));
|
||||
}
|
||||
});
|
||||
|
||||
for(int t=0;t<ZT_CONTROLLER_RETHINKDB_COMMIT_THREADS;++t) {
|
||||
_commitThread[t] = std::thread([this]() {
|
||||
std::unique_ptr<R::Connection> rdb;
|
||||
std::unique_ptr<nlohmann::json> config;
|
||||
while ((this->_commitQueue.get(config))&&(_run == 1)) {
|
||||
if (!config)
|
||||
continue;
|
||||
json record;
|
||||
const std::string objtype = (*config)["objtype"];
|
||||
const char *table;
|
||||
std::string deleteId;
|
||||
if (objtype == "member") {
|
||||
const std::string nwid = (*config)["nwid"];
|
||||
const std::string id = (*config)["id"];
|
||||
record["id"] = nwid + "-" + id;
|
||||
record["controllerId"] = this->_myAddressStr;
|
||||
record["networkId"] = nwid;
|
||||
record["nodeId"] = id;
|
||||
record["config"] = *config;
|
||||
table = "Member";
|
||||
} else if (objtype == "network") {
|
||||
const std::string id = (*config)["id"];
|
||||
record["id"] = id;
|
||||
record["controllerId"] = this->_myAddressStr;
|
||||
record["config"] = *config;
|
||||
table = "Network";
|
||||
} else if (objtype == "delete_network") {
|
||||
deleteId = (*config)["id"];
|
||||
table = "Network";
|
||||
} else if (objtype == "delete_member") {
|
||||
deleteId = (*config)["nwid"];
|
||||
deleteId.push_back('-');
|
||||
const std::string tmp = (*config)["id"];
|
||||
deleteId.append(tmp);
|
||||
table = "Member";
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
|
||||
while (_run == 1) {
|
||||
try {
|
||||
if (!rdb)
|
||||
rdb = R::connect(this->_host,this->_port,this->_auth);
|
||||
if (rdb) {
|
||||
if (deleteId.length() > 0) {
|
||||
R::db(this->_db).table(table).get(deleteId).delete_().run(*rdb);
|
||||
} else {
|
||||
R::db(this->_db).table(table).insert(record.dump(),R::optargs("conflict","update","return_changes",false)).run(*rdb);
|
||||
}
|
||||
break;
|
||||
} else {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (insert/update): connect failed (will retry)" ZT_EOL_S);
|
||||
}
|
||||
} catch (std::exception &e) {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (insert/update): %s" ZT_EOL_S,e.what());
|
||||
rdb.reset();
|
||||
} catch (R::Error &e) {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (insert/update): %s" ZT_EOL_S,e.message.c_str());
|
||||
rdb.reset();
|
||||
} catch ( ... ) {
|
||||
fprintf(stderr,"ERROR: controller RethinkDB (insert/update): unknown exception" ZT_EOL_S);
|
||||
rdb.reset();
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(250));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
RethinkDB::~RethinkDB()
|
||||
{
|
||||
// FIXME: not totally safe but will generally work, and only happens on shutdown anyway
|
||||
// FIXME: not totally safe but will generally work, and only happens on shutdown anyway.
|
||||
// Would need to add some kind of 'whack it' support to librethinkdbxx to do better.
|
||||
_run = 0;
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(10));
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||
if (_membersDbWatcherConnection)
|
||||
((R::Connection *)_membersDbWatcherConnection)->close();
|
||||
if (_networksDbWatcherConnection)
|
||||
((R::Connection *)_networksDbWatcherConnection)->close();
|
||||
_commitQueue.stop();
|
||||
for(int t=0;t<ZT_CONTROLLER_RETHINKDB_COMMIT_THREADS;++t)
|
||||
_commitThread[t].join();
|
||||
_membersDbWatcher.join();
|
||||
_networksDbWatcher.join();
|
||||
}
|
||||
|
||||
inline bool RethinkDB::get(const uint64_t networkId,nlohmann::json &network)
|
||||
{
|
||||
waitForReady();
|
||||
|
||||
std::shared_ptr<_Network> nw;
|
||||
{
|
||||
std::lock_guard<std::mutex> l(_networks_l);
|
||||
|
|
@ -121,8 +235,10 @@ inline bool RethinkDB::get(const uint64_t networkId,nlohmann::json &network)
|
|||
return true;
|
||||
}
|
||||
|
||||
inline bool RethinkDB::get(const uint64_t networkId,nlohmann::json &network,const uint64_t memberId,nlohmann::json &member,NetworkSummaryInfo &info)
|
||||
inline bool RethinkDB::get(const uint64_t networkId,nlohmann::json &network,const uint64_t memberId,nlohmann::json &member)
|
||||
{
|
||||
waitForReady();
|
||||
|
||||
std::shared_ptr<_Network> nw;
|
||||
{
|
||||
std::lock_guard<std::mutex> l(_networks_l);
|
||||
|
|
@ -133,7 +249,30 @@ inline bool RethinkDB::get(const uint64_t networkId,nlohmann::json &network,cons
|
|||
}
|
||||
|
||||
std::lock_guard<std::mutex> l2(nw->lock);
|
||||
auto m = nw->members.find(memberId);
|
||||
auto m = nw->members.find(memberId);
|
||||
if (m == nw->members.end())
|
||||
return false;
|
||||
network = nw->config;
|
||||
member = m->second;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
inline bool RethinkDB::get(const uint64_t networkId,nlohmann::json &network,const uint64_t memberId,nlohmann::json &member,NetworkSummaryInfo &info)
|
||||
{
|
||||
waitForReady();
|
||||
|
||||
std::shared_ptr<_Network> nw;
|
||||
{
|
||||
std::lock_guard<std::mutex> l(_networks_l);
|
||||
auto nwi = _networks.find(networkId);
|
||||
if (nwi == _networks.end())
|
||||
return false;
|
||||
nw = nwi->second;
|
||||
}
|
||||
|
||||
std::lock_guard<std::mutex> l2(nw->lock);
|
||||
auto m = nw->members.find(memberId);
|
||||
if (m == nw->members.end())
|
||||
return false;
|
||||
network = nw->config;
|
||||
|
|
@ -145,6 +284,8 @@ inline bool RethinkDB::get(const uint64_t networkId,nlohmann::json &network,cons
|
|||
|
||||
inline bool RethinkDB::get(const uint64_t networkId,nlohmann::json &network,std::vector<nlohmann::json> &members)
|
||||
{
|
||||
waitForReady();
|
||||
|
||||
std::shared_ptr<_Network> nw;
|
||||
{
|
||||
std::lock_guard<std::mutex> l(_networks_l);
|
||||
|
|
@ -164,6 +305,8 @@ inline bool RethinkDB::get(const uint64_t networkId,nlohmann::json &network,std:
|
|||
|
||||
inline bool RethinkDB::summary(const uint64_t networkId,NetworkSummaryInfo &info)
|
||||
{
|
||||
waitForReady();
|
||||
|
||||
std::shared_ptr<_Network> nw;
|
||||
{
|
||||
std::lock_guard<std::mutex> l(_networks_l);
|
||||
|
|
@ -179,10 +322,51 @@ inline bool RethinkDB::summary(const uint64_t networkId,NetworkSummaryInfo &info
|
|||
return true;
|
||||
}
|
||||
|
||||
void RethinkDB::networks(std::vector<uint64_t> &networks)
|
||||
{
|
||||
waitForReady();
|
||||
std::lock_guard<std::mutex> l(_networks_l);
|
||||
networks.reserve(_networks.size() + 1);
|
||||
for(auto n=_networks.begin();n!=_networks.end();++n)
|
||||
networks.push_back(n->first);
|
||||
}
|
||||
|
||||
void RethinkDB::save(const nlohmann::json &record)
|
||||
{
|
||||
waitForReady();
|
||||
_commitQueue.post(std::unique_ptr<nlohmann::json>(new nlohmann::json(record)));
|
||||
}
|
||||
|
||||
void RethinkDB::eraseNetwork(const uint64_t networkId)
|
||||
{
|
||||
char tmp2[24];
|
||||
waitForReady();
|
||||
Utils::hex(networkId,tmp2);
|
||||
json tmp;
|
||||
tmp["id"] = tmp2;
|
||||
tmp["objtype"] = "delete_network"; // pseudo-type, tells thread to delete network
|
||||
_commitQueue.post(std::unique_ptr<nlohmann::json>(new nlohmann::json(tmp)));
|
||||
}
|
||||
|
||||
void RethinkDB::eraseMember(const uint64_t networkId,const uint64_t memberId)
|
||||
{
|
||||
char tmp2[24];
|
||||
json tmp;
|
||||
waitForReady();
|
||||
Utils::hex(networkId,tmp2);
|
||||
tmp["nwid"] = tmp2;
|
||||
Utils::hex10(memberId,tmp2);
|
||||
tmp["id"] = tmp2;
|
||||
tmp["objtype"] = "delete_member"; // pseudo-type, tells thread to delete network
|
||||
_commitQueue.post(std::unique_ptr<nlohmann::json>(new nlohmann::json(tmp)));
|
||||
}
|
||||
|
||||
void RethinkDB::_memberChanged(nlohmann::json &old,nlohmann::json &member)
|
||||
{
|
||||
uint64_t memberId = 0;
|
||||
uint64_t networkId = 0;
|
||||
bool isAuth = false;
|
||||
bool wasAuth = false;
|
||||
std::shared_ptr<_Network> nw;
|
||||
|
||||
if (old.is_object()) {
|
||||
|
|
@ -201,7 +385,8 @@ void RethinkDB::_memberChanged(nlohmann::json &old,nlohmann::json &member)
|
|||
std::lock_guard<std::mutex> l(nw->lock);
|
||||
if (OSUtils::jsonBool(config["activeBridge"],false))
|
||||
nw->activeBridgeMembers.erase(memberId);
|
||||
if (OSUtils::jsonBool(config["authorized"],false))
|
||||
wasAuth = OSUtils::jsonBool(config["authorized"],false);
|
||||
if (wasAuth)
|
||||
nw->authorizedMembers.erase(memberId);
|
||||
json &ips = config["ipAssignments"];
|
||||
if (ips.is_array()) {
|
||||
|
|
@ -234,35 +419,43 @@ void RethinkDB::_memberChanged(nlohmann::json &old,nlohmann::json &member)
|
|||
nw2.reset(new _Network);
|
||||
nw = nw2;
|
||||
}
|
||||
std::lock_guard<std::mutex> l(nw->lock);
|
||||
|
||||
nw->members[memberId] = config;
|
||||
{
|
||||
std::lock_guard<std::mutex> l(nw->lock);
|
||||
|
||||
if (OSUtils::jsonBool(config["activeBridge"],false))
|
||||
nw->activeBridgeMembers.insert(memberId);
|
||||
const bool isAuth = OSUtils::jsonBool(config["authorized"],false);
|
||||
if (isAuth)
|
||||
nw->authorizedMembers.insert(memberId);
|
||||
json &ips = config["ipAssignments"];
|
||||
if (ips.is_array()) {
|
||||
for(unsigned long i=0;i<ips.size();++i) {
|
||||
json &ipj = ips[i];
|
||||
if (ipj.is_string()) {
|
||||
const std::string ips = ipj;
|
||||
InetAddress ipa(ips.c_str());
|
||||
ipa.setPort(0);
|
||||
nw->allocatedIps.insert(ipa);
|
||||
nw->members[memberId] = config;
|
||||
|
||||
if (OSUtils::jsonBool(config["activeBridge"],false))
|
||||
nw->activeBridgeMembers.insert(memberId);
|
||||
isAuth = OSUtils::jsonBool(config["authorized"],false);
|
||||
if (isAuth)
|
||||
nw->authorizedMembers.insert(memberId);
|
||||
json &ips = config["ipAssignments"];
|
||||
if (ips.is_array()) {
|
||||
for(unsigned long i=0;i<ips.size();++i) {
|
||||
json &ipj = ips[i];
|
||||
if (ipj.is_string()) {
|
||||
const std::string ips = ipj;
|
||||
InetAddress ipa(ips.c_str());
|
||||
ipa.setPort(0);
|
||||
nw->allocatedIps.insert(ipa);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!isAuth) {
|
||||
const int64_t ldt = (int64_t)OSUtils::jsonInt(config["lastDeauthorizedTime"],0ULL);
|
||||
if (ldt > nw->mostRecentDeauthTime)
|
||||
nw->mostRecentDeauthTime = ldt;
|
||||
}
|
||||
}
|
||||
|
||||
if (!isAuth) {
|
||||
const int64_t ldt = (int64_t)OSUtils::jsonInt(config["lastDeauthorizedTime"],0ULL);
|
||||
if (ldt > nw->mostRecentDeauthTime)
|
||||
nw->mostRecentDeauthTime = ldt;
|
||||
}
|
||||
_controller->onNetworkMemberUpdate(networkId,memberId);
|
||||
}
|
||||
}
|
||||
|
||||
if ((wasAuth)&&(!isAuth)&&(networkId)&&(memberId))
|
||||
_controller->onNetworkMemberDeauthorize(networkId,memberId);
|
||||
}
|
||||
|
||||
void RethinkDB::_networkChanged(nlohmann::json &old,nlohmann::json &network)
|
||||
|
|
@ -281,8 +474,11 @@ void RethinkDB::_networkChanged(nlohmann::json &old,nlohmann::json &network)
|
|||
nw2.reset(new _Network);
|
||||
nw = nw2;
|
||||
}
|
||||
std::lock_guard<std::mutex> l2(nw->lock);
|
||||
nw->config = config;
|
||||
{
|
||||
std::lock_guard<std::mutex> l2(nw->lock);
|
||||
nw->config = config;
|
||||
}
|
||||
_controller->onNetworkUpdate(id);
|
||||
}
|
||||
}
|
||||
} else if (old.is_object()) {
|
||||
|
|
@ -306,3 +502,5 @@ int main(int argc,char **argv)
|
|||
pause();
|
||||
}
|
||||
*/
|
||||
|
||||
#endif // ZT_CONTROLLER_USE_RETHINKDB
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue