Import wiredtiger: e8cf194d813096cc2b30c0dd2d9d9c93ade79756 from branch mongodb-4.2

ref: 22b1224ee0..e8cf194d81
for: 4.1.5

WT-4298       Fix workgen to retry on WT_ROLLBACK and clear ops after warmup
WT-4343       Unlock when sleeping to allow other log threads to make progress
WT-4371       Workgen improvements to create a MongoDB-like workload
WT-4376       Fix a bug where table index open can race
WT-4385       Prepare-conflict during a cursor scan can return the wrong key
WT-4392       A large lint change
WT-4395       Seg fault walking corrupted log with log cursor
WT-4396       When retrying after prepare-conflict, cursor unable to find a valid update
WT-4400       Fix workgen use of PRIxxx macros, needed for old C++ compilers

1 files changed, 4 insertions, 3 deletions

diff --git a/src/third_party/wiredtiger/bench/workgen/workgen.h b/src/third_party/wiredtiger/bench/workgen/workgen.h
index cc93409b388..ec825e0a193 100644
--- a/src/third_party/wiredtiger/bench/workgen/workgen.h
+++ b/src/third_party/wiredtiger/bench/workgen/workgen.h
@@ -86,6 +86,7 @@ struct Track {
 
     uint64_t ops_in_progress;           // Total operations not completed */
     uint64_t ops;                       // Total operations completed */
+    uint64_t rollbacks;                 // Total operations rolled back */
     uint64_t latency_ops;               // Total ops sampled for latency
     uint64_t latency;                   // Total latency */
     uint64_t bucket_ops;                // Computed for percentile_latency
@@ -282,8 +283,8 @@ struct Value {
 
 struct Operation {
     enum OpType {
-	OP_CHECKPOINT, OP_INSERT, OP_NONE, OP_NOOP, OP_REMOVE, OP_SEARCH,
-	OP_SLEEP, OP_UPDATE };
+	OP_CHECKPOINT, OP_INSERT, OP_LOG_FLUSH, OP_NONE, OP_NOOP,
+	OP_REMOVE, OP_SEARCH, OP_SLEEP, OP_UPDATE };
     OpType _optype;
     OperationInternal *_internal;
 
@@ -401,7 +402,7 @@ struct WorkloadOptions {
     std::string report_file;
     int report_interval;
     int run_time;
-    int sample_interval;
+    int sample_interval_ms;
     int sample_rate;
     std::string sample_file;
     int warmup;