From dee387846fc54214d517eb61e7eb2bbb0acba018 Mon Sep 17 00:00:00 2001
From: Etienne Petrel <etienne.petrel@mongodb.com>
Date: Tue, 22 Feb 2022 03:58:13 +0000
Subject: Import wiredtiger: ea428f0b6b9622c707733e9959d17c7f944b63ba from
 branch mongodb-master

ref: 444173ed06..ea428f0b6b
for: 6.0.0

WT-8801       Update the backup documentation and test_backup14.py
---
 src/third_party/wiredtiger/import.data                 |  2 +-
 src/third_party/wiredtiger/src/docs/backup.dox         |  3 ++-
 src/third_party/wiredtiger/test/suite/test_backup14.py | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 23bd633a6c7..c2f786bda04 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "444173ed064fa0a28de21bff582774ceda9f00cf"
+    "commit": "ea428f0b6b9622c707733e9959d17c7f944b63ba"
 }
diff --git a/src/third_party/wiredtiger/src/docs/backup.dox b/src/third_party/wiredtiger/src/docs/backup.dox
index 2cf28059965..087bbb9273e 100644
--- a/src/third_party/wiredtiger/src/docs/backup.dox
+++ b/src/third_party/wiredtiger/src/docs/backup.dox
@@ -118,7 +118,8 @@ are no longer part of the backup when later incremental backups no longer
 return their name. This is especially important for WiredTiger log files
 that are no longer needed and must be removed before recovery is run.
 
-@copydoc doc_bulk_durability
+Block-based incremental backup can be performed after a bulk load, without
+an intervening full backup.
 
 The following is the procedure for incrementally backing up a database
 using block modifications:
diff --git a/src/third_party/wiredtiger/test/suite/test_backup14.py b/src/third_party/wiredtiger/test/suite/test_backup14.py
index 23758099fbd..d692f6073fc 100644
--- a/src/third_party/wiredtiger/test/suite/test_backup14.py
+++ b/src/third_party/wiredtiger/test/suite/test_backup14.py
@@ -79,13 +79,12 @@ class test_backup14(backup_base):
     def add_data_validate_backups(self):
         self.pr('Adding initial data')
         self.initial_backup = True
-        self.add_data(self.uri, self.bigkey, self.bigval)
+        self.add_data(self.uri, self.bigkey, self.bigval, True)
 
         self.take_full_backup(self.home_incr)
         self.initial_backup = False
-        self.session.checkpoint()
 
-        self.add_data(self.uri, self.bigkey, self.bigval)
+        self.add_data(self.uri, self.bigkey, self.bigval, True)
 
         self.take_full_backup(self.home_full)
         self.take_incr_backup(self.home_incr)
@@ -98,6 +97,7 @@ class test_backup14(backup_base):
     #
     def remove_all_records_validate(self):
         self.remove_data()
+        self.session.checkpoint()
         self.take_full_backup(self.home_full)
         self.take_incr_backup(self.home_incr)
         self.compare_backups(self.uri, self.home_full, self.home_incr, str(self.bkup_id))
@@ -116,7 +116,7 @@ class test_backup14(backup_base):
         self.session.create(self.uri2, "key_format=S,value_format=S")
 
         self.new_table = True
-        self.add_data(self.uri2, self.bigkey, self.bigval)
+        self.add_data(self.uri2, self.bigkey, self.bigval, True)
         self.take_incr_backup(self.home_incr)
 
         table_list = 'tablelist.txt'
@@ -132,7 +132,7 @@ class test_backup14(backup_base):
     #
     def create_dropped_table_add_new_content(self):
         self.session.create(self.uri, "key_format=S,value_format=S")
-        self.add_data(self.uri, self.bigkey, self.bigval)
+        self.add_data(self.uri, self.bigkey, self.bigval, True)
         self.take_full_backup(self.home_full)
         self.take_incr_backup(self.home_incr)
         self.compare_backups(self.uri, self.home_full, self.home_incr, str(self.bkup_id))
@@ -147,7 +147,7 @@ class test_backup14(backup_base):
         # Insert bulk data into uri3 (table:logged_table).
         #
         self.session.create(self.uri_logged, "key_format=S,value_format=S")
-        self.add_data(self.uri_logged, self.bigkey, self.bigval)
+        self.add_data(self.uri_logged, self.bigkey, self.bigval, True)
 
         self.take_full_backup(self.home_full)
         self.take_incr_backup(self.home_incr)
@@ -157,7 +157,7 @@ class test_backup14(backup_base):
         # Insert bulk data into uri4 (table:not_logged_table).
         #
         self.session.create(self.uri_not_logged, "key_format=S,value_format=S,log=(enabled=false)")
-        self.add_data(self.uri_not_logged, self.bigkey, self.bigval)
+        self.add_data(self.uri_not_logged, self.bigkey, self.bigval, True)
 
         self.take_full_backup(self.home_full)
         self.take_incr_backup(self.home_incr)
-- 
cgit v1.2.1