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

Fixed tests

This commit is contained in:
Markus Pilman 2023-02-24 11:32:37 -07:00
parent c1f80fe471
commit 6c15506c36
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdbcli/TenantCommands.actor.cpp
View File

@ -697,7 +697,13 @@ ACTOR Future<bool> tenantLockCommand(Reference<IDatabase> db, std::vector<String
}
if (tokens.size() > uidIdx) {
try {
uid = UID::fromStringThrowsOnFailure(tokens[uidIdx].toString());
auto uidStr = tokens[uidIdx].toString();
if (uidStr.size() < 32) {
// UID::fromString expects the string to be exactly 32 characters long, but the uid might be shorter
// if the most significant byte[s] are 0. So we need to pad
uidStr.insert(0, 32 - uidStr.size(), '0');
}
uid = UID::fromStringThrowsOnFailure(uidStr);
} catch (Error& e) {
ASSERT(e.code() == error_code_operation_failed);
fmt::print(stderr, "ERROR: Couldn't not parse `{}' as a valid UID", tokens[uidIdx].toString());

15
fdbcli/tests/fdbcli_tests.py
View File

@ -1021,8 +1021,11 @@ def tenant_lock(logger):
output = run_fdbcli_command('tenant lock tenant w')
output = output.strip()
logger.debug('output: {}'.format(output))
assert output.startswith("Locked tenant tenant with UID ")
uid_str = output.strip("Locked tenant tenant with UID ")
start_string = "Locked tenant `tenant' with UID `"
assert output.startswith(start_string)
assert output.endswith("'")
output = output[:-1]
uid_str = output.strip(start_string)
assert len(uid_str) <= 32 # could be smaller than 32 if the first 4 bits are 0
logger.debug('Verify tenant is readable')
@ -1036,15 +1039,15 @@ def tenant_lock(logger):
logger.debug('output: {}'.format(output))
assert output == 'ERROR: Tenant is locked (2144)'
logger.debug('Unlock tenant')
logger.debug('Unlock tenant with UID "{}"'.format(uid_str))
output = run_fdbcli_command('tenant unlock tenant {}'.format(uid_str))
logger.debug('output: {}'.format(output.strip()))
assert output.strip() == 'Unlocked tenant tenant'
assert output.strip() == "Unlocked tenant `tenant'"
logger.debug('Lock tenant in rw mode')
output = run_fdbcli_command('tenant lock tenant rw {}'.format(uid_str)).strip()
logger.debug('output: {}'.format(output))
assert output == 'Locked tenant tenant with UID {}'.format(uid_str)
assert output == "Locked tenant `tenant' with UID `{}'".format(uid_str)
logger.debug('Verify tenant is NOT readable')
output = run_fdbcli_command_and_get_error('usetenant tenant; get foo').strip()
@ -1059,7 +1062,7 @@ def tenant_lock(logger):
logger.debug('Unlock tenant')
output = run_fdbcli_command('tenant unlock tenant {}'.format(uid_str))
logger.debug('output: {}'.format(output.strip()))
assert output.strip() == 'Unlocked tenant tenant'
assert output.strip() == "Unlocked tenant `tenant'"
@enable_logging()

3
fdbclient/Tenant.cpp
View File

@ -161,7 +161,8 @@ void TenantMapEntry::configure(Standalone<StringRef> parameter, Optional<Value>
bool TenantMapEntry::operator==(TenantMapEntry const& other) const {
return id == other.id && tenantName == other.tenantName && tenantLockState == other.tenantLockState &&
tenantGroup == other.tenantGroup && configurationSequenceNum == other.configurationSequenceNum;
tenantLockId == other.tenantLockId && tenantGroup == other.tenantGroup &&
configurationSequenceNum == other.configurationSequenceNum;
}
bool TenantMapEntry::operator!=(TenantMapEntry const& other) const {