Skip to content

Commit ccb9a45

Browse files
glimbergglimberg
committed
Remove extra verbose logging from controller
1 parent 68a9634 commit ccb9a45

File tree

6 files changed

+1
-71
lines changed

6 files changed

+1
-71
lines changed

‎nonfree/controller/BigTableStatusWriter.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ void BigTableStatusWriter::writePending()
8787
if (toWrite.empty()) {
8888
return;
8989
}
90-
fprintf(stderr, "Writing %zu pending status entries to BigTable\n", toWrite.size());
9190

9291
cbt::BulkMutation bulk;
9392
for (const auto& entry : toWrite) {

‎nonfree/controller/CentralDB.cpp‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,11 @@ bool CentralDB::save(nlohmann::json& record, bool notifyListeners)
319319
auto span = tracer->StartSpan("CentralDB::save::network");
320320
auto scope = tracer->WithActiveSpan(span);
321321

322-
fprintf(stderr, "CentralDB network save %s\n", record["id"].get<std::string>().c_str());
323322
const uint64_t nwid = OSUtils::jsonIntHex(record["id"], 0ULL);
324323
if (nwid) {
325324
nlohmann::json old;
326325
get(nwid, old);
327326
if ((! old.is_object()) || (! _compareRecords(old, record))) {
328-
fprintf(stderr, "posting network change to commit queue\n");
329327
record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
330328
_queueItem qi;
331329
qi.jsonData = record;
@@ -348,12 +346,10 @@ bool CentralDB::save(nlohmann::json& record, bool notifyListeners)
348346
std::string memberId = record["id"];
349347
const uint64_t nwid = OSUtils::jsonIntHex(record["nwid"], 0ULL);
350348
const uint64_t id = OSUtils::jsonIntHex(record["id"], 0ULL);
351-
fprintf(stderr, "member save %s-%s\n", networkId.c_str(), memberId.c_str());
352349
if ((id) && (nwid)) {
353350
nlohmann::json network, old;
354351
get(nwid, network, id, old);
355352
if ((! old.is_object()) || (! _compareRecords(old, record))) {
356-
fprintf(stderr, "posting member change to commit queue\n");
357353
record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
358354

359355
_queueItem qi;
@@ -395,7 +391,6 @@ void CentralDB::eraseNetwork(const uint64_t networkId)
395391
char networkIdStr[17];
396392
span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
397393

398-
fprintf(stderr, "CentralDB::eraseNetwork\n");
399394
char tmp2[24];
400395
waitForReady();
401396
Utils::hex(networkId, tmp2);
@@ -425,7 +420,6 @@ void CentralDB::eraseMember(const uint64_t networkId, const uint64_t memberId)
425420
span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
426421
span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
427422

428-
fprintf(stderr, "CentralDB::eraseMember\n");
429423
char tmp2[24];
430424
waitForReady();
431425

@@ -1149,11 +1143,6 @@ void CentralDB::commitThread()
11491143
auto provider = opentelemetry::trace::Provider::GetTracerProvider();
11501144
auto tracer = provider->GetTracer("CentralDB");
11511145

1152-
fprintf(stderr, "checking qitem trace context\n");
1153-
for (auto const& kv : qitem.traceContext) {
1154-
fprintf(stderr, "traceContext: %s: %s\n", kv.first.c_str(), kv.second.c_str());
1155-
}
1156-
11571146
auto propagator = opentelemetry::context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
11581147
OtelCarrier<std::map<std::string, std::string> > carrier(qitem.traceContext);
11591148
auto current_ctx = opentelemetry::context::RuntimeContext::GetCurrent();
@@ -1202,7 +1191,6 @@ void CentralDB::commitThread()
12021191

12031192
memberId = config["id"];
12041193
networkId = config["nwid"];
1205-
fprintf(stderr, "commit member %s-%s\n", networkId.c_str(), memberId.c_str());
12061194

12071195
std::string target = "NULL";
12081196
if (! config["remoteTraceTarget"].is_null()) {
@@ -1243,18 +1231,12 @@ void CentralDB::commitThread()
12431231
change_source = "controller";
12441232
}
12451233
if (! isNewMember && change_source != "controller" && frontend != change_source) {
1246-
fprintf(
1247-
stderr, "skipping member %s-%s update. change source: %s, frontend: %s\n",
1248-
networkId.c_str(), memberId.c_str(), change_source.c_str(), frontend.c_str());
12491234
// if it is not a new member and the change source is not the controller and doesn't match
12501235
// the frontend, don't apply the change.
12511236
continue;
12521237
}
12531238

12541239
std::vector<std::string> ipAssignments;
1255-
fprintf(
1256-
stderr, "Saving IP Assignments: \n\tipAssignments: %s\n",
1257-
OSUtils::jsonDump(config["ipAssignments"], -1).c_str());
12581240
if (config["ipAssignments"].is_array()) {
12591241
for (auto& ip : config["ipAssignments"]) {
12601242
if (ip.is_string()) {
@@ -1263,8 +1245,6 @@ void CentralDB::commitThread()
12631245
}
12641246
}
12651247

1266-
fprintf(stderr, "member json: %s\n", config.dump().c_str());
1267-
12681248
int64_t vMajor = OSUtils::jsonUInt(config["vMajor"], 0);
12691249
int64_t vMinor = OSUtils::jsonUInt(config["vMinor"], 0);
12701250
int64_t vRev = OSUtils::jsonUInt(config["vRev"], 0);
@@ -1399,7 +1379,6 @@ void CentralDB::commitThread()
13991379
pqxx::work w(*c->c);
14001380

14011381
std::string id = config["id"];
1402-
fprintf(stderr, "commit network %s\n", id.c_str());
14031382

14041383
pqxx::row nwrow =
14051384
w.exec("SELECT COUNT(id) frontend FROM networks_ctl WHERE id = $1", pqxx::params { id })
@@ -1423,10 +1402,6 @@ void CentralDB::commitThread()
14231402
if (! isNewNetwork && change_source != "controller" && frontend != change_source) {
14241403
// if it is not a new network and the change source is not the controller and doesn't match
14251404
// the frontend, don't apply the change.
1426-
fprintf(
1427-
stderr,
1428-
"Skipping network update %s. isNewNetwork: %s, change_source: %s, frontend: %s\n",
1429-
id.c_str(), isNewNetwork ? "true" : "false", change_source.c_str(), frontend.c_str());
14301405
continue;
14311406
}
14321407

@@ -1499,7 +1474,6 @@ void CentralDB::commitThread()
14991474
try {
15001475
pqxx::work w(*c->c);
15011476
std::string networkId = config["id"];
1502-
fprintf(stderr, "Deleting network %s\n", networkId.c_str());
15031477
w.exec("DELETE FROM network_memberships_ctl WHERE network_id = $1", pqxx::params { networkId });
15041478
w.exec("DELETE FROM networks_ctl WHERE id = $1", pqxx::params { networkId });
15051479

@@ -1546,8 +1520,6 @@ void CentralDB::commitThread()
15461520
std::string memberId = config["id"];
15471521
std::string networkId = config["nwid"];
15481522

1549-
fprintf(stderr, "Deleting member %s-%s\n", networkId.c_str(), memberId.c_str());
1550-
15511523
pqxx::result res =
15521524
w.exec(
15531525
"DELETE FROM network_memberships_ctl WHERE device_id = $1 AND network_id = $2",

‎nonfree/controller/EmbeddedNetworkController.cpp‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,7 +1655,6 @@ void EmbeddedNetworkController::onNetworkMemberDeauthorize(const void* db, uint6
16551655
auto span = tracer->StartSpan("embedded_controller::onNetworkMemberDeauthorize");
16561656
auto scope = tracer->WithActiveSpan(span);
16571657

1658-
fprintf(stderr, "Member Deauthorized: nwid=%.16llx, nodeid=%.10llx\n", networkId, memberId);
16591658
const int64_t now = OSUtils::now();
16601659
Revocation rev(
16611660
(uint32_t)_node->prng(), networkId, 0, now, ZT_REVOCATION_FLAG_FAST_PROPAGATE, Address(memberId),
@@ -1666,10 +1665,7 @@ void EmbeddedNetworkController::onNetworkMemberDeauthorize(const void* db, uint6
16661665
for (auto i = _memberStatus.begin(); i != _memberStatus.end(); ++i) {
16671666
if ((i->first.networkId == networkId) && (i->second.online(now))) {
16681667
_node->ncSendRevocation(Address(i->first.nodeId), rev);
1669-
fprintf(stderr, " Sent revocation to %.10llx\n", i->first.nodeId);
1670-
}
1671-
else {
1672-
fprintf(stderr, " Not sending revocation to %.10llx\n", i->first.nodeId);
1668+
// fprintf(stderr, " Sent revocation to %.10llx\n", i->first.nodeId);
16731669
}
16741670
}
16751671
}
@@ -2307,20 +2303,10 @@ void EmbeddedNetworkController::_request(
23072303
}
23082304
}
23092305

2310-
fprintf(stderr, "haveManagedIpv4AutoAssignment=%s\n", haveManagedIpv4AutoAssignment ? "true" : "false");
2311-
fprintf(stderr, "ipAssignmentPools.is_array()=%s\n", ipAssignmentPools.is_array() ? "true" : "false");
2312-
fprintf(stderr, "v4AssignMode.is_object()=%s\n", v4AssignMode.is_object() ? "true" : "false");
2313-
fprintf(
2314-
stderr, "v4AssignMode[\"zt\"]=%s\n",
2315-
(v4AssignMode.is_object() && OSUtils::jsonBool(v4AssignMode["zt"], false)) ? "true" : "false");
2316-
fprintf(stderr, "noAutoAssignIps=%s\n", noAutoAssignIps ? "true" : "false");
2317-
23182306
if ((ipAssignmentPools.is_array()) && ((v4AssignMode.is_object()) && (OSUtils::jsonBool(v4AssignMode["zt"], false)))
23192307
&& (! haveManagedIpv4AutoAssignment) && (! noAutoAssignIps)) {
2320-
fprintf(stderr, "Trying to do managed IPv4 auto-assignment\n");
23212308
for (unsigned long p = 0; ((p < ipAssignmentPools.size()) && (! haveManagedIpv4AutoAssignment)); ++p) {
23222309
json& pool = ipAssignmentPools[p];
2323-
fprintf(stderr, " considering pool %lu: %s\n", p, OSUtils::jsonDump(pool, 2).c_str());
23242310
if (pool.is_object()) {
23252311
InetAddress ipRangeStartIA(OSUtils::jsonString(pool["ipRangeStart"], "").c_str());
23262312
InetAddress ipRangeEndIA(OSUtils::jsonString(pool["ipRangeEnd"], "").c_str());
@@ -2371,7 +2357,6 @@ void EmbeddedNetworkController::_request(
23712357
char tmpip[64];
23722358
const std::string ipStr(ip4.toIpString(tmpip));
23732359
if (std::find(ipAssignments.begin(), ipAssignments.end(), ipStr) == ipAssignments.end()) {
2374-
fprintf(stderr, " assigning %s\n", ipStr.c_str());
23752360
ipAssignments.push_back(ipStr);
23762361
member["ipAssignments"] = ipAssignments;
23772362
if (nc->staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES) {

‎nonfree/controller/PostgreSQL.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ bool PostgresMemberListener::onNotification(const std::string& payload)
5757
auto scope = tracer->WithActiveSpan(span);
5858
span->SetAttribute("payload", payload);
5959

60-
fprintf(stderr, "Member Notification received: %s\n", payload.c_str());
6160
Metrics::pgsql_mem_notification++;
6261
nlohmann::json tmp(nlohmann::json::parse(payload));
6362
nlohmann::json& ov = tmp["old_val"];
@@ -70,21 +69,18 @@ bool PostgresMemberListener::onNotification(const std::string& payload)
7069

7170
if (oldConfig.is_object() && newConfig.is_object()) {
7271
_db->save(newConfig, true);
73-
fprintf(stderr, "payload sent\n");
7472
}
7573
else if (newConfig.is_object() && ! oldConfig.is_object()) {
7674
// new member
7775
Metrics::member_count++;
7876
_db->save(newConfig, true);
79-
fprintf(stderr, "new member payload sent\n");
8077
}
8178
else if (! newConfig.is_object() && oldConfig.is_object()) {
8279
// member delete
8380
uint64_t networkId = OSUtils::jsonIntHex(oldConfig["nwid"], 0ULL);
8481
uint64_t memberId = OSUtils::jsonIntHex(oldConfig["id"], 0ULL);
8582
if (memberId && networkId) {
8683
_db->eraseMember(networkId, memberId);
87-
fprintf(stderr, "member delete payload sent\n");
8884
}
8985
}
9086
return true;
@@ -135,7 +131,6 @@ bool PostgresNetworkListener::onNotification(const std::string& payload)
135131
auto scope = tracer->WithActiveSpan(span);
136132
span->SetAttribute("payload", payload);
137133

138-
fprintf(stderr, "Network Notification received: %s\n", payload.c_str());
139134
Metrics::pgsql_net_notification++;
140135
nlohmann::json tmp(nlohmann::json::parse(payload));
141136

@@ -153,15 +148,13 @@ bool PostgresNetworkListener::onNotification(const std::string& payload)
153148
span->SetAttribute("action", "network_change");
154149
span->SetAttribute("network_id", nwid);
155150
_db->save(newConfig, true);
156-
fprintf(stderr, "payload sent\n");
157151
}
158152
else if (newConfig.is_object() && ! oldConfig.is_object()) {
159153
std::string nwid = newConfig["id"];
160154
span->SetAttribute("network_id", nwid);
161155
span->SetAttribute("action", "new_network");
162156
// new network
163157
_db->save(newConfig, true);
164-
fprintf(stderr, "new network payload sent\n");
165158
}
166159
else if (! newConfig.is_object() && oldConfig.is_object()) {
167160
// network delete
@@ -172,7 +165,6 @@ bool PostgresNetworkListener::onNotification(const std::string& payload)
172165
span->SetAttribute("network_id_int", networkId);
173166
if (networkId) {
174167
_db->eraseNetwork(networkId);
175-
fprintf(stderr, "network delete payload sent\n");
176168
}
177169
}
178170
return true;

‎nonfree/controller/PubSubListener.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ void PubSubListener::subscribe()
8080
{
8181
while (_run) {
8282
try {
83-
fprintf(stderr, "Starting new subscription session\n");
8483
auto session = _subscriber->Subscribe([this](pubsub::Message const& m, pubsub::AckHandler h) {
8584
auto provider = opentelemetry::trace::Provider::GetTracerProvider();
8685
auto tracer = provider->GetTracer("PubSubListener");
@@ -89,7 +88,6 @@ void PubSubListener::subscribe()
8988
auto attrs = m.attributes();
9089
std::map<std::string, std::string> attrs_map;
9190
for (auto const& kv : m.attributes()) {
92-
fprintf(stderr, "Message attribute: %s=%s\n", kv.first.c_str(), kv.second.c_str());
9391
attrs_map.emplace(kv.first, kv.second);
9492
}
9593

@@ -106,7 +104,6 @@ void PubSubListener::subscribe()
106104
span->SetAttribute("message_id", m.message_id());
107105
span->SetAttribute("ordering_key", m.ordering_key());
108106

109-
fprintf(stderr, "Received message %s\n", m.message_id().c_str());
110107
if (onNotification(m.data())) {
111108
std::move(h).ack();
112109
span->SetStatus(opentelemetry::trace::StatusCode::kOk);
@@ -160,8 +157,6 @@ bool PubSubNetworkListener::onNotification(const std::string& payload)
160157
span->SetStatus(opentelemetry::trace::StatusCode::kError, "Failed to parse protobuf");
161158
return false;
162159
}
163-
fprintf(stderr, "PubSubNetworkListener: parsed protobuf message. %s\n", nc.DebugString().c_str());
164-
fprintf(stderr, "Network notification received\n");
165160

166161
try {
167162
nlohmann::json oldConfig, newConfig;
@@ -228,7 +223,6 @@ bool PubSubNetworkListener::onNotification(const std::string& payload)
228223
span->SetStatus(opentelemetry::trace::StatusCode::kError, "Unknown exception");
229224
return false;
230225
}
231-
fprintf(stderr, "PubSubNetworkListener onNotification complete\n");
232226
return true;
233227
}
234228

@@ -256,8 +250,6 @@ bool PubSubMemberListener::onNotification(const std::string& payload)
256250
span->SetStatus(opentelemetry::trace::StatusCode::kError, "Failed to parse protobuf");
257251
return false;
258252
}
259-
fprintf(stderr, "PubSubMemberListener: parsed protobuf message. %s\n", mc.DebugString().c_str());
260-
fprintf(stderr, "Member notification received");
261253

262254
try {
263255
nlohmann::json tmp;

‎nonfree/controller/PubSubWriter.cpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ bool PubSubWriter::publishMessage(
6464
auto span = tracer->StartSpan("PubSubWriter::publishMessage");
6565
auto scope = tracer->WithActiveSpan(span);
6666

67-
fprintf(stderr, "Publishing message to %s\n", _topic.c_str());
6867
std::vector<std::pair<std::string, std::string> > attributes;
6968
attributes.emplace_back("controller_id", _controller_id);
7069

@@ -75,7 +74,6 @@ bool PubSubWriter::publishMessage(
7574
propagator->Inject(carrier, current_ctx);
7675

7776
for (const auto& kv : attrs_map) {
78-
fprintf(stderr, "Attributes injected: %s=%s\n", kv.first.c_str(), kv.second.c_str());
7977
attributes.emplace_back(kv.first, kv.second);
8078
}
8179

@@ -94,7 +92,6 @@ bool PubSubWriter::publishMessage(
9492
return false;
9593
}
9694

97-
fprintf(stderr, "Published message to %s\n", _topic.c_str());
9895
return true;
9996
}
10097

@@ -103,7 +100,6 @@ bool PubSubWriter::publishNetworkChange(
103100
const nlohmann::json& newNetwork,
104101
const std::string& frontend)
105102
{
106-
fprintf(stderr, "Publishing network change\n");
107103
pbmessages::NetworkChange* nc = networkChangeFromJson(_controller_id, oldNetwork, newNetwork);
108104

109105
std::string networkID;
@@ -129,7 +125,6 @@ bool PubSubWriter::publishMemberChange(
129125
const nlohmann::json& newMember,
130126
const std::string& frontend)
131127
{
132-
fprintf(stderr, "Publishing member change\n");
133128
pbmessages::MemberChange* mc = memberChangeFromJson(_controller_id, oldMember, newMember);
134129
std::string memberID;
135130
if (mc->has_new_()) {
@@ -314,8 +309,6 @@ pbmessages::MemberChange_Member* memberFromJson(const nlohmann::json& j)
314309
return nullptr;
315310
}
316311

317-
fprintf(stderr, "memberFromJSON: %s\n", j.dump().c_str());
318-
319312
pbmessages::MemberChange_Member* m = new pbmessages::MemberChange_Member();
320313
try {
321314
m->set_network_id(OSUtils::jsonString(j["nwid"], ""));
@@ -373,15 +366,12 @@ pbmessages::MemberChange_Member* memberFromJson(const nlohmann::json& j)
373366
delete m;
374367
return nullptr;
375368
}
376-
fprintf(stderr, "memberFromJSON complete\n");
377369
return m;
378370
}
379371

380372
pbmessages::MemberChange*
381373
memberChangeFromJson(std::string controllerID, const nlohmann::json& oldMember, const nlohmann::json& newMember)
382374
{
383-
fprintf(stderr, "memberrChangeFromJson: old: %s\n", oldMember.dump().c_str());
384-
fprintf(stderr, "memberrChangeFromJson: new: %s\n", newMember.dump().c_str());
385375
pbmessages::MemberChange* mc = new pbmessages::MemberChange();
386376
pbmessages::MemberChange_Member* om = memberFromJson(oldMember);
387377
if (om != nullptr) {

0 commit comments

Comments
 (0)