apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-15 18:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

reject overlap in transaction case

Browse Source
This commit is contained in:
Jon Fu 2022-07-26 15:04:18 -07:00
parent 6ff90c83b1
commit a3b56ebadc
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fdbserver/workloads/TenantManagementWorkload.actor.cpp
View File

@ -789,7 +789,6 @@ struct TenantManagementWorkload : TestWorkload {
TenantManagementWorkload* self) { TenantManagementWorkload* self) {
if (operationType == OperationType::SPECIAL_KEYS) { if (operationType == OperationType::SPECIAL_KEYS) {
tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES); tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
// state std::map<TenantName, TenantName>::iterator iter = tenantRenames.begin();
for (auto& iter : tenantRenames) { for (auto& iter : tenantRenames) {
tr->set(self->specialKeysTenantRenamePrefix.withSuffix(iter.first), iter.second); tr->set(self->specialKeysTenantRenamePrefix.withSuffix(iter.first), iter.second);
} }
@ -801,19 +800,7 @@ struct TenantManagementWorkload : TestWorkload {
ASSERT(!tenantNotFound && !tenantExists); ASSERT(!tenantNotFound && !tenantExists);
} else { // operationType == OperationType::MANAGEMENT_TRANSACTION } else { // operationType == OperationType::MANAGEMENT_TRANSACTION
tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS); tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
// These types of overlap will also fail as tenantNotFound or tenantExists:
// A->A
// A->B + B->C
// These types of overlap:
// A->B + A->C (Old Name Overlap)
// A->C + B->C (New Name Overlap)
// cannot be detected since everything happens in one commit
// and will not observe each other's changes in time
if (tenantOverlap) {
throw special_keys_api_failure();
}
std::vector<Future<Void>> renameFutures; std::vector<Future<Void>> renameFutures;
// state std::map<TenantName, TenantName>::iterator iter = tenantRenames.begin();
for (auto& iter : tenantRenames) { for (auto& iter : tenantRenames) {
renameFutures.push_back(success(TenantAPI::renameTenantTransaction(tr, iter.first, iter.second))); renameFutures.push_back(success(TenantAPI::renameTenantTransaction(tr, iter.first, iter.second)));
} }
@ -845,8 +832,23 @@ struct TenantManagementWorkload : TestWorkload {
for (int i = 0; i < numTenants; ++i) { for (int i = 0; i < numTenants; ++i) {
TenantName oldTenant = self->chooseTenantName(false); TenantName oldTenant = self->chooseTenantName(false);
TenantName newTenant = self->chooseTenantName(false); TenantName newTenant = self->chooseTenantName(false);
tenantOverlap = tenantOverlap || oldTenant == newTenant || allTenantNames.count(oldTenant) || bool checkOverlap =
allTenantNames.count(newTenant); oldTenant == newTenant || allTenantNames.count(oldTenant) || allTenantNames.count(newTenant);
// reject the rename here if it has overlap and we are doing a transaction operation
// and then pick another combination
if (checkOverlap && operationType == OperationType::MANAGEMENT_TRANSACTION) {
// These types of overlap will also fail as tenantNotFound or tenantExists:
// A->A
// A->B + B->C
// These types of overlap:
// A->B + A->C (Old Name Overlap)
// A->C + B->C (New Name Overlap)
// cannot be detected since everything happens in one commit
// and will not observe each other's changes in time
--i;
continue;
}
tenantOverlap = tenantOverlap || checkOverlap;
tenantRenames[oldTenant] = newTenant; tenantRenames[oldTenant] = newTenant;
allTenantNames.insert(oldTenant); allTenantNames.insert(oldTenant);
allTenantNames.insert(newTenant); allTenantNames.insert(newTenant);