diff options
| author | Will Korteland <will.korteland@mongodb.com> | 2022-02-10 04:19:56 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-10 05:45:13 +0000 |
| commit | 986917d2d1d761cd0fec7a6ce9ed289730b84f1a (patch) | |
| tree | cb2cd7fd63285ef7ee11cbdcc71fb8c7c4e1c45d /src/third_party/wiredtiger | |
| parent | 68729ecf131ddddf7f121730c015e8804ded4105 (diff) | |
| download | mongo-986917d2d1d761cd0fec7a6ce9ed289730b84f1a.tar.gz | |
Import wiredtiger: 2bb45102b7f5cbf484ffc5adac1b5b2b66f9cb92 from branch mongodb-master
ref: 1b10e56368..2bb45102b7
for: 5.3.0
WT-7967 Document that block incremental backup IDs should be unique
Diffstat (limited to 'src/third_party/wiredtiger')
| -rw-r--r-- | src/third_party/wiredtiger/dist/api_data.py | 3 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/docs/backup.dox | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/wiredtiger.in | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/dist/api_data.py b/src/third_party/wiredtiger/dist/api_data.py index 2c134b1d226..8b807beb777 100644 --- a/src/third_party/wiredtiger/dist/api_data.py +++ b/src/third_party/wiredtiger/dist/api_data.py @@ -1585,7 +1585,8 @@ methods = { Config('this_id', '', r''' a string that identifies the current system state as a future backup source for an incremental backup via 'src_id'. This identifier is required when opening - an incremental backup cursor and an error will be returned if one is not provided'''), + an incremental backup cursor and an error will be returned if one is not provided. + The identifiers can be any text string, but should be unique'''), ]), Config('next_random', 'false', r''' configure the cursor to return a pseudo-random record from the diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 650c04ba5d0..feb2c2adc3c 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": "9c99e00c5ed50907c5240d94b95c2e280b230123" + "commit": "2bb45102b7f5cbf484ffc5adac1b5b2b66f9cb92" } diff --git a/src/third_party/wiredtiger/src/docs/backup.dox b/src/third_party/wiredtiger/src/docs/backup.dox index f42e0a4cf31..4341b118a70 100644 --- a/src/third_party/wiredtiger/src/docs/backup.dox +++ b/src/third_party/wiredtiger/src/docs/backup.dox @@ -127,7 +127,7 @@ using block modifications: additional configuration \c incremental=(enabled=true,this_id="ID1"). The identifier specified in \c this_id starts block tracking and that identifier can be used in the future as the source of an incremental -backup. +backup. Identifiers can be any text string, but should be unique. 2. Begin the incremental backup by opening a backup cursor with the \c backup: URI and config string of \c incremental=(src_id="ID1",this_id="ID2"). diff --git a/src/third_party/wiredtiger/src/include/wiredtiger.in b/src/third_party/wiredtiger/src/include/wiredtiger.in index 2d9203f6d39..fa9c2e5e2cb 100644 --- a/src/third_party/wiredtiger/src/include/wiredtiger.in +++ b/src/third_party/wiredtiger/src/include/wiredtiger.in @@ -966,7 +966,8 @@ struct __wt_session { * @config{ this_id, a string that identifies the * current system state as a future backup source for an incremental backup via 'src_id'. * This identifier is required when opening an incremental backup cursor and an error will - * be returned if one is not provided., a string; default empty.} + * be returned if one is not provided. The identifiers can be any text string\, but should + * be unique., a string; default empty.} * @config{ ),,} * @config{next_random, configure the cursor to return a pseudo-random record from the * object when the WT_CURSOR::next method is called; valid only for row-store cursors. See |