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

Merge pull request #2312 from tclinken/fix-waiting-for-dd-output 

Only print 'waiting for DD to end...' if test actually waits
This commit is contained in:
Meng Xu 2019-11-04 14:57:40 -08:00 committed by GitHub
parent b326d26a47 8f84fbc4b9
commit 927a9c02fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbserver/tester.actor.cpp
View File

@ -1093,11 +1093,12 @@ ACTOR Future<Void> runTests( Reference<AsyncVar<Optional<struct ClusterControlle
// do we handle a failure here? // do we handle a failure here?
} }
printf("\n%d tests passed; %d tests failed, waiting for DD to end...\n\n", passCount, failCount); printf("\n%d tests passed; %d tests failed.\n", passCount, failCount);
//If the database was deleted during the workload we need to recreate the database //If the database was deleted during the workload we need to recreate the database
if(tests.empty() || useDB) { if(tests.empty() || useDB) {
if(waitForQuiescenceEnd) { if(waitForQuiescenceEnd) {
printf("Waiting for DD to end...\n");
try { try {
wait(quietDatabase(cx, dbInfo, "End", 0, 2e6, 2e6) || wait(quietDatabase(cx, dbInfo, "End", 0, 2e6, 2e6) ||
(databasePingDelay == 0.0 ? Never() (databasePingDelay == 0.0 ? Never()
@ -1108,6 +1109,7 @@ ACTOR Future<Void> runTests( Reference<AsyncVar<Optional<struct ClusterControlle
} }
} }
} }
printf("\n");
return Void(); return Void();
} }