diff options
| author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-02-08 02:56:04 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-08 03:46:37 +0000 |
| commit | 24d29e06e2009d88a6e0e7962dfb22116ca12d95 (patch) | |
| tree | 382230bfd36aea9fc56f7aa8bdefe97b2a03b0d8 | |
| parent | 28e9440459ed56073bb1af3d0eed545cae44636d (diff) | |
| download | mongo-24d29e06e2009d88a6e0e7962dfb22116ca12d95.tar.gz | |
Import wiredtiger: 79c9e7149493ad043fffdb3626fe018568f6892a from branch mongodb-master
ref: 18a36d80c1..79c9e71494
for: 5.3.0
WT-8784 Fix invalid S3CacheExists if condition
| -rw-r--r-- | src/third_party/wiredtiger/ext/storage_sources/s3_store/s3_storage_source.cpp | 4 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/ext/storage_sources/s3_store/s3_storage_source.cpp b/src/third_party/wiredtiger/ext/storage_sources/s3_store/s3_storage_source.cpp index 97f4f72989e..f1baaefbd3f 100644 --- a/src/third_party/wiredtiger/ext/storage_sources/s3_store/s3_storage_source.cpp +++ b/src/third_party/wiredtiger/ext/storage_sources/s3_store/s3_storage_source.cpp @@ -93,12 +93,12 @@ S3Exist(WT_FILE_SYSTEM *fileSystem, WT_SESSION *session, const char *name, bool { S3_STORAGE *s3; int ret; - *exist = false; s3 = FS2S3(fileSystem); S3_FILE_SYSTEM *fs = (S3_FILE_SYSTEM *)fileSystem; /* It's not in the cache, try the S3 bucket. */ - if (*exist = !S3CacheExists(fileSystem, name)) + *exist = S3CacheExists(fileSystem, name); + if (!*exist) ret = fs->connection->ObjectExists(fs->bucketName, name, *exist); return (ret); diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index f64d64a05ec..fa9b18d4a07 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": "18a36d80c13eb4e040cf79fb58c0904836ae7d60" + "commit": "79c9e7149493ad043fffdb3626fe018568f6892a" } |