Merge pull request #7013 from sfc-gh-jslocum/writeduringread_keysize_main

Fix for WriteDuringRead workload key sizes with useSystemKeys=true bu…
This commit is contained in:
Steve Atherton 2022-04-29 14:01:44 -07:00 committed by GitHub
commit 165d9fa6b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -1014,7 +1014,7 @@ struct WriteDuringReadWorkload : TestWorkload {
tr.setOption(FDBTransactionOptions::NEXT_WRITE_NO_WRITE_CONFLICT_RANGE);
tr.atomicOp(key, value, opType);
//TraceEvent("WDRAtomicOpSuccess").detail("Key", key).detail("Value", value.size());
if (!noConflict && key.size() <= getMaxWriteKeySize(key, false)) {
if (!noConflict && key.size() <= getMaxWriteKeySize(key, self->useSystemKeys)) {
self->addedConflicts.insert(key, true);
}
Optional<Value> existing = self->memoryGet(&self->memoryDatabase, key);
@ -1033,7 +1033,7 @@ struct WriteDuringReadWorkload : TestWorkload {
if (noConflict)
tr.setOption(FDBTransactionOptions::NEXT_WRITE_NO_WRITE_CONFLICT_RANGE);
tr.set(key, value);
if (!noConflict && key.size() <= getMaxWriteKeySize(key, false)) {
if (!noConflict && key.size() <= getMaxWriteKeySize(key, self->useSystemKeys)) {
self->addedConflicts.insert(key, true);
}
//TraceEvent("WDRSetSuccess").detail("Key", key).detail("Value", value.size());