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

back to bulk apply for status updates in BigTable

Browse source
This commit is contained in:
Grant Limberg 2025-09-08 10:50:10 -07:00
parent 1ba4ccd98d
commit 1d65c1e43e
1 changed files with 17 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
nonfree/controller/BigTableStatusWriter.cpp
View file

@ -91,6 +91,7 @@ void BigTableStatusWriter::writePending()
} }
fprintf(stderr, "Writing %zu pending status entries to BigTable\n", toWrite.size()); fprintf(stderr, "Writing %zu pending status entries to BigTable\n", toWrite.size());
cbt::BulkMutation bulk;
for (const auto& entry : toWrite) { for (const auto& entry : toWrite) {
std::string row_key = entry.network_id + "#" + entry.node_id; std::string row_key = entry.network_id + "#" + entry.node_id;
cbt::SingleRowMutation m(row_key); cbt::SingleRowMutation m(row_key);
@ -107,16 +108,17 @@ void BigTableStatusWriter::writePending()
} }
int64_t ts = entry.last_seen; int64_t ts = entry.last_seen;
m.emplace_back(cbt::SetCell(checkInColumnFamily, lastSeenColumn, std::move(ts))); m.emplace_back(cbt::SetCell(checkInColumnFamily, lastSeenColumn, std::move(ts)));
bulk.emplace_back(m);
}
fprintf(stderr, "Applying %zu mutations to BigTable\n", bulk.size());
try { try {
auto status = _table->Apply(std::move(m)); std::vector<cbt::FailedMutation> failures = _table->BulkApply(std::move(bulk));
if (! status.ok()) { fprintf(stderr, "BigTable write completed with %zu failures\n", failures.size());
fprintf(stderr, "Error writing to BigTable: %s\n", status.message().c_str()); for (auto const& r : failures) {
} // Handle error (log it, retry, etc.)
else { std::cerr << "Error writing to BigTable: " << r.status() << "\n";
_pubsubWriter->publishStatusChange(
entry.target, entry.network_id, entry.node_id, entry.os, entry.arch, entry.version,
entry.last_seen);
} }
} }
catch (const std::exception& e) { catch (const std::exception& e) {
@ -126,46 +128,5 @@ void BigTableStatusWriter::writePending()
return; return;
} }
} }
// cbt::BulkMutation bulk;
// for (const auto& entry : toWrite) {
// std::string row_key = entry.network_id + "#" + entry.node_id;
// cbt::SingleRowMutation m(row_key);
// m.emplace_back(cbt::SetCell(nodeInfoColumnFamily, osColumn, entry.os));
// m.emplace_back(cbt::SetCell(nodeInfoColumnFamily, archColumn, entry.arch));
// m.emplace_back(cbt::SetCell(nodeInfoColumnFamily, versionColumn, entry.version));
// char buf[64] = { 0 };
// std::string addressStr = entry.address.toString(buf);
// if (entry.address.ss_family == AF_INET) {
// m.emplace_back(cbt::SetCell(checkInColumnFamily, ipv4Column, std::move(addressStr)));
// }
// else if (entry.address.ss_family == AF_INET6) {
// m.emplace_back(cbt::SetCell(checkInColumnFamily, ipv6Column, std::move(addressStr)));
// }
// int64_t ts = entry.last_seen;
// m.emplace_back(cbt::SetCell(checkInColumnFamily, lastSeenColumn, std::move(ts)));
// bulk.emplace_back(m);
// // TODO: Check performance on this. May need to bach these.
// _pubsubWriter->publishStatusChange(
// entry.target, entry.network_id, entry.node_id, entry.os, entry.arch, entry.version, entry.last_seen);
// }
// fprintf(stderr, "Applying %zu mutations to BigTable\n", bulk.size());
// try {
// std::vector<cbt::FailedMutation> failures = table.BulkApply(std::move(bulk));
// fprintf(stderr, "BigTable write completed with %zu failures\n", failures.size());
// for (auto const& r : failures) {
// // Handle error (log it, retry, etc.)
// std::cerr << "Error writing to BigTable: " << r.status() << "\n";
// }
// }
// catch (const std::exception& e) {
// fprintf(stderr, "Exception writing to BigTable: %s\n", e.what());
// span->SetAttribute("error", e.what());
// span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
// return;
// }
}
} // namespace ZeroTier } // namespace ZeroTier