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

fixed conflict range workload by just disabling timeKeeper instead of the check, because it should be a more robust fix

This commit is contained in:
Evan Tschannen 2017-10-10 16:01:02 -07:00
parent c8525dc3e7
commit 8feb3b8fbc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fdbserver/workloads/ConflictRange.actor.cpp
View File

@ -23,6 +23,7 @@
#include "fdbserver/TesterInterface.h"
#include "fdbclient/ReadYourWrites.h"
#include "workloads.h"
#include "fdbclient/ManagementAPI.h"
//For this test to report properly buggify must be disabled (flow.h) , and failConnection must be disabled in (sim2.actor.cpp)
@ -93,6 +94,10 @@ struct ConflictRangeWorkload : TestWorkload {
state int clearedBegin;
state int clearedEnd;
if(g_network->isSimulated()) {
Void _ = wait( timeKeeperSetDisable(cx) );
}
loop {
randomSets = !randomSets;
@ -290,7 +295,7 @@ struct ConflictRangeWorkload : TestWorkload {
if( res.size() == originalResults.size() ) {
for( int i = 0; i < res.size(); i++ ) {
if( res[i] != originalResults[i] && ( !res[i].key.startsWith(systemKeys.begin) || !originalResults[i].key.startsWith(systemKeys.begin) ) ) {
if( res[i] != originalResults[i] ) {
TraceEvent(SevError, "ConflictRangeError").detail("Info", "No conflict returned, however results do not match")
.detail("Original", printable(originalResults[i].key) + " " + printable(originalResults[i].value))
.detail("New", printable(res[i].key) + " " + printable(res[i].value));