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

Rename debug_onIdle

This commit is contained in:
Andrew Noyes 2020-04-28 19:44:34 +00:00
parent 5b365458cb
commit 4fce3032d9
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdbclient/ReadYourWrites.h
View File

@ -120,7 +120,8 @@ public:
void reset();
void debugTransaction(UID dID) { tr.debugTransaction(dID); }
Future<Void> debug_onIdle() { return reading; }
// Wait for all reads that are currently pending to complete
Future<Void> pendingReads() { return reading; }
// Used by ThreadSafeTransaction for exceptions thrown in void methods
Error deferredError;

2
fdbclient/SpecialKeySpace.actor.cpp
View File

@ -249,7 +249,7 @@ ReadConflictRangeImpl::ReadConflictRangeImpl(KeyRangeRef kr) : SpecialKeyRangeBa
ACTOR static Future<Standalone<RangeResultRef>> getReadConflictRangeImpl(Reference<ReadYourWritesTransaction> ryw,
KeyRange kr) {
wait(ryw->debug_onIdle());
wait(ryw->pendingReads());
return ryw->getReadConflictRangeIntersecting(
KeyRange(KeyRangeRef(kr.begin.removePrefix(LiteralStringRef("\xff\xff/transaction/read_conflict_range/")),
kr.end.removePrefix(LiteralStringRef("\xff\xff/transaction/read_conflict_range/")))));

2
fdbserver/workloads/WriteDuringRead.actor.cpp
View File

@ -808,7 +808,7 @@ struct WriteDuringReadWorkload : TestWorkload {
}
wait( waitForAll( operations ) );
ASSERT( timebomb == 0 || 1000*(now() - startTime) <= timebomb + 1 );
wait( tr.debug_onIdle() );
wait( tr.pendingReads() );
wait( delay(0.000001) ); //to ensure triggered watches have a change to register
self->finished.trigger();
wait( waitForAll( watches ) ); //only for errors, should have all returned