wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up log messages

This commit is contained in:
Junhyun Shim 2023-01-12 18:41:13 +01:00
parent e3a1e8dd24
commit 09a159d140
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bindings/c/test/mako/admin_server.cpp
View File

@ -134,21 +134,21 @@ void AdminServer::start() {
sendObject(pipe_to_client, Response{});
return;
} else if (auto p = boost::get<BatchCreateTenantRequest>(&req)) {
logr.info("received request to batch-create tenant {}-{} in database '{}'",
logr.info("received request to batch-create tenants [{}:{}) in database '{}'",
p->id_begin,
p->id_end,
p->cluster_file);
auto err_msg = createTenant(getOrCreateDatabase(databases, p->cluster_file), p->id_begin, p->id_end);
sendObject(pipe_to_client, Response{ std::move(err_msg) });
} else if (auto p = boost::get<BatchDeleteTenantRequest>(&req)) {
logr.info("received request to batch-delete tenant {}-{} in database '{}'",
logr.info("received request to batch-delete tenants [{}:{}) in database '{}'",
p->id_begin,
p->id_end,
p->cluster_file);
auto err_msg = deleteTenant(getOrCreateDatabase(databases, p->cluster_file), p->id_begin, p->id_end);
sendObject(pipe_to_client, Response{ std::move(err_msg) });
} else {
logr.info("Unknown request received");
logr.error("unknown request received");
sendObject(pipe_to_client, Response{ std::string("unknown request type") });
}
} catch (const std::exception& e) {
@ -170,19 +170,18 @@ boost::optional<std::string> AdminServer::createTenant(fdb::Database db, int id_
auto f = tx.commit();
const auto rc = waitAndHandleError(tx, f);
if (rc == FutureRC::OK) {
logr.info("create_tenant commit OK", id_begin, id_end);
tx.reset();
break;
} else if (rc == FutureRC::RETRY) {
logr.error("create_tenant retryable error: {}", f.error().what());
logr.info("create_tenants retryable error: {}", f.error().what());
continue;
} else {
logr.error("create_tenant unretryable error: {}", f.error().what());
return fmt::format("create_tenant [{}:{}) failed with '{}'", id_begin, id_end, f.error().what());
logr.error("create_tenants unretryable error: {}", f.error().what());
return fmt::format("create_tenants [{}:{}) failed with '{}'", id_begin, id_end, f.error().what());
}
}
logr.info("create_tenants [{}-{}) OK", id_begin, id_end);
logr.info("blobbify tenants [{}-{})", id_begin, id_end);
logr.info("blobbify_tenants [{}-{})", id_begin, id_end);
for (auto id = id_begin; id < id_end; id++) {
while (true) {
auto tenant = db.openTenant(fdb::toBytesRef(getTenantNameByIndex(id)));
@ -195,17 +194,17 @@ boost::optional<std::string> AdminServer::createTenant(fdb::Database db, int id_
}
break;
} else if (rc == FutureRC::RETRY) {
logr.info("blobbify_tenant retryable error: {}", blobbify_future.error().what());
logr.info("blobbify_tenants retryable error: {}", blobbify_future.error().what());
continue;
} else {
logr.error("unretryable error during blobbify: {}", blobbify_future.error().what());
logr.error("blobbify_tenants unretryable error: {}", blobbify_future.error().what());
return fmt::format("critical error encountered while blobbifying tenant {}: {}",
id,
blobbify_future.error().what());
}
}
}
logr.info("blobbify tenants [{}-{}) OK", id_begin, id_end);
logr.info("blobbify_tenants [{}-{}) OK", id_begin, id_end);
return {};
} catch (const std::exception& e) {
return std::string(e.what());
@ -257,12 +256,13 @@ boost::optional<std::string> AdminServer::getTenantPrefixes(fdb::Transaction tx,
boost::optional<std::string> AdminServer::deleteTenant(fdb::Database db, int id_begin, int id_end) {
try {
auto tx = db.createTransaction();
while (true) {
std::vector<fdb::ByteString> prefixes;
if (auto error = getTenantPrefixes(db.createTransaction(), id_begin, id_end, prefixes)) {
return error;
}
auto tx = db.createTransaction();
logr.info("collected prefixes of tenants [{}:{})", id_begin, id_end);
tx.setOption(FDBTransactionOption::FDB_TR_OPTION_LOCK_AWARE, fdb::BytesRef());
tx.setOption(FDBTransactionOption::FDB_TR_OPTION_RAW_ACCESS, fdb::BytesRef());
for (const auto& tenant_prefix : prefixes) {
@ -274,7 +274,7 @@ boost::optional<std::string> AdminServer::deleteTenant(fdb::Database db, int id_
tx.reset();
// continue on this iteration
} else if (rc == FutureRC::RETRY) {
logr.error("Retryable error during tenant prefix clear: {}", commit_future.error().what());
logr.info("clear_tenant_prefixes retryable error: {}", commit_future.error().what());
continue;
} else {
return fmt::format("unretryable error while clearing key ranges for tenant [{}:{}): {}",
@ -282,6 +282,7 @@ boost::optional<std::string> AdminServer::deleteTenant(fdb::Database db, int id_
id_end,
commit_future.error().what());
}
logr.info("clear_tenant_prefixes [{}:{}) OK", id_begin, id_end);
// tenant keyspaces have been cleared. now delete tenants
for (int id = id_begin; id < id_end; id++) {
fdb::Tenant::deleteTenant(tx, fdb::toBytesRef(getTenantNameByIndex(id)));
@ -289,6 +290,7 @@ boost::optional<std::string> AdminServer::deleteTenant(fdb::Database db, int id_
commit_future = tx.commit();
rc = waitAndHandleError(tx, commit_future);
if (rc == FutureRC::OK) {
logr.info("delete_tenants [{}:{}) OK", id_begin, id_end);
return {};
} else if (rc == FutureRC::ABORT) {
return fmt::format("unretryable error while committing delete-tenant for tenant id range [{}:{}): {}",
@ -297,7 +299,7 @@ boost::optional<std::string> AdminServer::deleteTenant(fdb::Database db, int id_
commit_future.error().what());
} else {
// try again
logr.error("retryable error during tenant delete: {}", commit_future.error().what());
logr.info("delete_tenants retryable error: {}", commit_future.error().what());
}
}
} catch (const std::exception& e) {