Skip to content

Commit e17273d

Browse files
authored
MONGOCRYPT-820 bypass serverStatus from auto-encryption (#1028)
* MONGOCRYPT-820 bypass `serverStatus` from auto-encryption * reduce `exec_timeout_secs` Set to 3600 seconds (60 minutes) to match comment. Fixes error from `evergreen validate`: ``` exec timeout (216000) is too high ```
1 parent ed95121 commit e17273d

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

.evergreen/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ tasks:
559559
- name: "release-python-linux"
560560
tags: ["release_python_tag"]
561561
run_on: ubuntu2004-large
562-
exec_timeout_secs: 216000 # 60 minutes (manylinux task is slow).
562+
exec_timeout_secs: 3600 # 60 minutes (manylinux task is slow).
563563
commands:
564564
- func: "fetch source"
565565
- func: "build python release"

src/mongocrypt-ctx-encrypt.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,6 +2186,8 @@ _check_cmd_for_auto_encrypt(mongocrypt_binary_t *cmd, bool *bypass, char **targe
21862186
*bypass = true;
21872187
} else if (0 == strcmp(cmd_name, "updateSearchIndex")) {
21882188
*bypass = true;
2189+
} else if (0 == strcmp(cmd_name, "serverStatus")) {
2190+
*bypass = true;
21892191
}
21902192

21912193
/* database/client commands are ineligible. */

test/test-mongocrypt-ctx-encrypt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,7 @@ static void _test_encrypt_init_each_cmd(_mongocrypt_tester_t *tester) {
990990
_init_bypass(tester, "{'createSearchIndexes': 'coll' }");
991991
_init_bypass(tester, "{'dropSearchIndex': 'coll' }");
992992
_init_bypass(tester, "{'updateSearchIndex': 'coll' }");
993+
_init_bypass(tester, "{'serverStatus': 1 }");
993994
}
994995

995996
static void _test_encrypt_invalid_siblings(_mongocrypt_tester_t *tester) {

0 commit comments

Comments
 (0)