Import wiredtiger: 186281ffe0f77518738647c0a0aae5e0d122ad33 from branch mongodb-master

ref: 82de987481..186281ffe0
for: 5.1.0

WT-8001       Fix Inconsistent API behaviour when setting global oldest and stable timestamps

1 files changed, 1 insertions, 14 deletions

diff --git a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c
index c9883800199..5f5c019d3ad 100644
--- a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c
+++ b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c
@@ -149,14 +149,11 @@ thread_ts_run(void *arg)
     WT_RAND_STATE rnd;
     WT_SESSION *session;
     THREAD_DATA *td;
-    wt_timestamp_t all_dur_ts, prev_all_dur_ts;
     uint32_t rand_op;
     int dbg;
     char tscfg[64], ts_string[WT_TS_HEX_STRING_SIZE];
     bool first;
 
-    prev_all_dur_ts = WT_TS_NONE;
-
     td = (THREAD_DATA *)arg;
     __wt_random_init(&rnd);
 
@@ -172,15 +169,6 @@ thread_ts_run(void *arg)
         ret = td->conn->query_timestamp(td->conn, ts_string, "get=all_durable");
         testutil_check(pthread_rwlock_unlock(&ts_lock));
         testutil_assert(ret == 0 || ret == WT_NOTFOUND);
-        /*
-         * All durable can intermittently move backwards, we do not want to set stable and the
-         * oldest timestamps backwards - refer WT-8001.
-         */
-        all_dur_ts = strtoul(ts_string, NULL, 16);
-        if (!first && all_dur_ts < prev_all_dur_ts) {
-            __wt_sleep(0, 1000);
-            continue;
-        }
         if (ret == 0) {
             rand_op = __wt_random(&rnd) % 4;
             /*
@@ -204,7 +192,6 @@ thread_ts_run(void *arg)
                 testutil_check(td->conn->set_timestamp(td->conn, tscfg));
             }
             first = false;
-            prev_all_dur_ts = all_dur_ts;
             /*
              * Set and reset the checkpoint retention setting on a regular basis. We want to test
              * racing with the internal archive thread while we're here.
@@ -446,7 +433,7 @@ thread_run(void *arg)
                   durable_ahead_commit ? active_ts + 4 : active_ts));
                 /* Ensure the global timestamp is not behind the all durable timestamp. */
                 if (durable_ahead_commit)
-                    __wt_atomic_addv64(&global_ts, 3);
+                    __wt_atomic_addv64(&global_ts, 4);
             } else
                 testutil_check(
                   __wt_snprintf(tscfg, sizeof(tscfg), "commit_timestamp=%" PRIx64, active_ts));