Apply code review suggestions

This commit is contained in:
Junhyun Shim 2022-07-28 00:45:50 +02:00
parent 144bb4e110
commit 1e83d7e1ab
3 changed files with 7 additions and 14 deletions

View File

@ -1845,12 +1845,8 @@ ACTOR static Future<Void> doKeyServerLocationRequest(GetKeyServerLocationsReques
while (tenantEntry.isError()) { while (tenantEntry.isError()) {
bool finalQuery = commitData->version.get() >= minTenantVersion; bool finalQuery = commitData->version.get() >= minTenantVersion;
Optional<TenantNameRef> tenantName;
if (req.tenant.name.present()) {
tenantName = req.tenant.name.get();
}
ErrorOr<Optional<TenantMapEntry>> _tenantEntry = ErrorOr<Optional<TenantMapEntry>> _tenantEntry =
getTenantEntry(commitData, tenantName, Optional<int64_t>(), finalQuery); getTenantEntry(commitData, req.tenant.name, Optional<int64_t>(), finalQuery);
tenantEntry = _tenantEntry; tenantEntry = _tenantEntry;
if (tenantEntry.isError()) { if (tenantEntry.isError()) {

View File

@ -3222,9 +3222,7 @@ ACTOR Future<GetValueReqAndResultRef> quickGetValue(StorageServer* data,
++data->counters.quickGetValueMiss; ++data->counters.quickGetValueMiss;
if (SERVER_KNOBS->QUICK_GET_VALUE_FALLBACK) { if (SERVER_KNOBS->QUICK_GET_VALUE_FALLBACK) {
state Transaction tr(data->cx, state Transaction tr(data->cx, pOriginalReq->tenantInfo.name.castTo<TenantName>());
pOriginalReq->tenantInfo.name.present() ? pOriginalReq->tenantInfo.name.get()
: Optional<TenantName>());
tr.setVersion(version); tr.setVersion(version);
// TODO: is DefaultPromiseEndpoint the best priority for this? // TODO: is DefaultPromiseEndpoint the best priority for this?
tr.trState->taskID = TaskPriority::DefaultPromiseEndpoint; tr.trState->taskID = TaskPriority::DefaultPromiseEndpoint;
@ -3859,9 +3857,7 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
++data->counters.quickGetKeyValuesMiss; ++data->counters.quickGetKeyValuesMiss;
if (SERVER_KNOBS->QUICK_GET_KEY_VALUES_FALLBACK) { if (SERVER_KNOBS->QUICK_GET_KEY_VALUES_FALLBACK) {
state Transaction tr(data->cx, state Transaction tr(data->cx, pOriginalReq->tenantInfo.name.castTo<TenantName>());
pOriginalReq->tenantInfo.name.present() ? pOriginalReq->tenantInfo.name.get()
: Optional<TenantName>());
tr.setVersion(version); tr.setVersion(version);
// TODO: is DefaultPromiseEndpoint the best priority for this? // TODO: is DefaultPromiseEndpoint the best priority for this?
tr.trState->taskID = TaskPriority::DefaultPromiseEndpoint; tr.trState->taskID = TaskPriority::DefaultPromiseEndpoint;

View File

@ -414,9 +414,10 @@ void bindDeterministicRandomToOpenssl() {
if (ec) { if (ec) {
::ERR_error_string_n(ec, msg, sizeof(msg)); ::ERR_error_string_n(ec, msg, sizeof(msg));
} }
printf("ERROR: Failed to bind DeterministicRandom to OpenSSL RNG\n" fprintf(stderr,
" OpenSSL error message: '%s'\n", "ERROR: Failed to bind DeterministicRandom to OpenSSL RNG\n"
msg); " OpenSSL error message: '%s'\n",
msg);
throw internal_error(); throw internal_error();
} else { } else {
printf("DeterministicRandom successfully bound to OpenSSL RNG\n"); printf("DeterministicRandom successfully bound to OpenSSL RNG\n");