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

end cv1 spans before sleeps
Some checks are pending
/ build_macos (push) Waiting to run
Details
/ build_windows (push) Waiting to run
Details
/ build_ubuntu (push) Waiting to run
Details

Browse source
This commit is contained in:
Grant Limberg 2025-07-15 12:11:10 -07:00
parent 01bd4373b6
commit 4edeacd1f0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
controller/CV1.cpp
View file

@ -1159,6 +1159,7 @@ void CV1::heartbeat()
} }
catch (std::exception& e) { catch (std::exception& e) {
fprintf(stderr, "%s: Heartbeat update failed: %s\n", controllerId, e.what()); fprintf(stderr, "%s: Heartbeat update failed: %s\n", controllerId, e.what());
span->End();
std::this_thread::sleep_for(std::chrono::milliseconds(1000)); std::this_thread::sleep_for(std::chrono::milliseconds(1000));
continue; continue;
} }
@ -1179,6 +1180,7 @@ void CV1::heartbeat()
fprintf(stderr, "ERROR: Redis error in heartbeat thread: %s\n", e.what()); fprintf(stderr, "ERROR: Redis error in heartbeat thread: %s\n", e.what());
} }
span->End();
std::this_thread::sleep_for(std::chrono::milliseconds(1000)); std::this_thread::sleep_for(std::chrono::milliseconds(1000));
} }
fprintf(stderr, "Exited heartbeat thread\n"); fprintf(stderr, "Exited heartbeat thread\n");
@ -1210,11 +1212,6 @@ void CV1::_membersWatcher_Postgres()
MemberNotificationReceiver m(this, *c->c, stream); MemberNotificationReceiver m(this, *c->c, stream);
while (_run == 1) { while (_run == 1) {
auto provider = opentelemetry::trace::Provider::GetTracerProvider();
auto tracer = provider->GetTracer("cv1");
auto span = tracer->StartSpan("cv1::_membersWatcher_Postgres");
auto scope = tracer->WithActiveSpan(span);
c->c->await_notification(5, 0); c->c->await_notification(5, 0);
} }
@ -1970,6 +1967,8 @@ void CV1::onlineNotification_Postgres()
ConnectionPoolStats stats = _pool->get_stats(); ConnectionPoolStats stats = _pool->get_stats();
fprintf(stderr, "%s pool stats: in use size: %llu, available size: %llu, total: %llu\n", _myAddressStr.c_str(), stats.borrowed_size, stats.pool_size, (stats.borrowed_size + stats.pool_size)); fprintf(stderr, "%s pool stats: in use size: %llu, available size: %llu, total: %llu\n", _myAddressStr.c_str(), stats.borrowed_size, stats.pool_size, (stats.borrowed_size + stats.pool_size));
span->End();
std::this_thread::sleep_for(std::chrono::seconds(10)); std::this_thread::sleep_for(std::chrono::seconds(10));
} }
fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str()); fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
@ -2022,6 +2021,7 @@ void CV1::onlineNotification_Redis()
auto total = dur.count(); auto total = dur.count();
fprintf(stderr, "onlineNotification ran in %llu ms\n", total); fprintf(stderr, "onlineNotification ran in %llu ms\n", total);
span->End();
std::this_thread::sleep_for(std::chrono::seconds(5)); std::this_thread::sleep_for(std::chrono::seconds(5));
} }