Skip to content

Commit e5c3235

Browse files
kevinAlbskevinAlbs
authored
Reduce use of write concern timeout in tests (#2126)
* do not set wTimeout in most tests Intended to resolve observed "waiting for replication timed out" test failures * update documentation example Use wTimeout=1000 to match CDRIVER-3347.
1 parent 016415b commit e5c3235

7 files changed

+18
-20
lines changed

‎src/libmongoc/examples/client-side-encryption-server-schema.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ main(void)
178178
/* Create the collection with the encryption JSON Schema. */
179179
create_cmd = BCON_NEW("create", ENCRYPTED_COLL, "validator", "{", "$jsonSchema", BCON_DOCUMENT(schema), "}");
180180
wc = mongoc_write_concern_new();
181-
mongoc_write_concern_set_wmajority(wc, 0);
181+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
182182
create_cmd_opts = bson_new();
183183
mongoc_write_concern_append(wc, create_cmd_opts);
184184
ret = mongoc_client_command_with_opts(

‎src/libmongoc/src/mongoc/mongoc-write-concern.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,7 @@ _mongoc_write_concern_new_from_iter(const bson_iter_t *iter, bson_error_t *error
463463
mongoc_write_concern_set_w(write_concern, w);
464464
} else if (BSON_ITER_HOLDS_UTF8(&inner)) {
465465
if (!strcmp(bson_iter_utf8(&inner, NULL), "majority")) {
466-
/* mongoc_write_concern_set_wmajority() only assigns wtimeout if
467-
* it is >= 0. Since we set wtimeout below, pass -1 here. */
468-
mongoc_write_concern_set_wmajority(write_concern, -1);
466+
mongoc_write_concern_set_w(write_concern, MONGOC_WRITE_CONCERN_W_MAJORITY);
469467
} else {
470468
mongoc_write_concern_set_wtag(write_concern, bson_iter_utf8(&inner, NULL));
471469
}

‎src/libmongoc/tests/test-conveniences.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ bson_lookup_write_concern(const bson_t *b, const char *key)
392392
if (BSON_ITER_HOLDS_NUMBER(&w)) {
393393
mongoc_write_concern_set_w(wc, (int32_t)bson_iter_as_int64(&w));
394394
} else if (!strcmp(bson_iter_utf8(&w, NULL), "majority")) {
395-
mongoc_write_concern_set_wmajority(wc, 0);
395+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
396396
} else {
397397
mongoc_write_concern_set_wtag(wc, bson_iter_utf8(&w, NULL));
398398
}

‎src/libmongoc/tests/test-mongoc-change-stream.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ test_change_stream_live_track_resume_token(void *test_ctx)
309309

310310
/* Insert a few docs to listen for. Use write concern majority, so subsequent
311311
* call to watch will be guaranteed to retrieve them. */
312-
mongoc_write_concern_set_wmajority(wc, 30000);
312+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
313313
mongoc_write_concern_append(wc, &opts);
314314
ASSERT_OR_PRINT(mongoc_collection_insert_one(coll, tmp_bson("{'_id': 0}"), &opts, NULL, &error), error);
315315

@@ -428,7 +428,7 @@ test_change_stream_live_batch_size(void *test_ctx)
428428

429429
ctx.expected_getmore_batch_size = 1;
430430

431-
mongoc_write_concern_set_wmajority(wc, 30000);
431+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
432432
mongoc_write_concern_append(wc, &opts);
433433
for (i = 0; i < 10; i++) {
434434
bson_t *doc = BCON_NEW("_id", BCON_INT32(i));
@@ -486,7 +486,7 @@ _test_resume_token_error(const char *id_projection)
486486
ASSERT(stream);
487487
ASSERT_OR_PRINT(!mongoc_change_stream_error_document(stream, &err, NULL), err);
488488

489-
mongoc_write_concern_set_wmajority(wc, 30000);
489+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
490490
mongoc_write_concern_append(wc, &opts);
491491
ASSERT_OR_PRINT(mongoc_collection_insert_one(coll, tmp_bson("{'_id': 2}"), &opts, NULL, &err), err);
492492

@@ -888,7 +888,7 @@ test_change_stream_live_watch(void *test_ctx)
888888

889889
BSON_UNUSED(test_ctx);
890890

891-
mongoc_write_concern_set_wmajority(wc, 30000);
891+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
892892

893893
coll = drop_and_get_coll(client, "db", "coll_watch");
894894
ASSERT(coll);
@@ -1610,7 +1610,7 @@ prose_test_11(void *ctx)
16101610
post_batch_expected = (_data_change_stream_t *)stream->cursor->impl.data;
16111611
ASSERT(bson_compare(resume_token, &post_batch_expected->post_batch_resume_token) == 0);
16121612

1613-
mongoc_write_concern_set_wmajority(wc, 30000);
1613+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
16141614
mongoc_write_concern_append(wc, &opts);
16151615
ASSERT_OR_PRINT(mongoc_collection_insert_one(coll, tmp_bson("{'_id': 0}"), &opts, NULL, &error), error);
16161616

@@ -1661,7 +1661,7 @@ prose_test_13(void *ctx)
16611661

16621662
/* Insert a few docs to listen for. Use write concern majority, so subsequent
16631663
* call to watch will be guaranteed to retrieve them. */
1664-
mongoc_write_concern_set_wmajority(wc, 30000);
1664+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
16651665
mongoc_write_concern_append(wc, &opts);
16661666
ASSERT_OR_PRINT(mongoc_collection_insert_one(coll, tmp_bson("{'_id': 0}"), &opts, NULL, &error), error);
16671667

‎src/libmongoc/tests/test-mongoc-client-side-encryption.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ _before_test(json_test_ctx_t *ctx, const bson_t *test)
5353
/* Insert data into the key vault. */
5454
client = test_framework_new_default_client();
5555
wc = mongoc_write_concern_new();
56-
mongoc_write_concern_set_wmajority(wc, 1000);
56+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
5757
bson_init(&insert_opts);
5858
mongoc_write_concern_append(wc, &insert_opts);
5959

@@ -400,7 +400,7 @@ test_bson_size_limits_and_batch_splitting(bool with_qe)
400400
(void)mongoc_collection_drop(coll, NULL);
401401
datakey = get_bson_from_json_file("./src/libmongoc/tests/client_side_encryption_prose/limits-key.json");
402402
wc = mongoc_write_concern_new();
403-
mongoc_write_concern_set_wmajority(wc, 1000);
403+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
404404
mongoc_collection_set_write_concern(coll, wc);
405405
ASSERT_OR_PRINT(mongoc_collection_insert_one(coll, datakey, NULL /* opts */, NULL /* reply */, &error), error);
406406
mongoc_write_concern_destroy(wc);
@@ -1033,7 +1033,7 @@ _test_key_vault(bool with_external_key_vault)
10331033

10341034
/* Insert the document external-key.json into ``keyvault.datakeys``. */
10351035
wc = mongoc_write_concern_new();
1036-
mongoc_write_concern_set_wmajority(wc, 1000);
1036+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
10371037
mongoc_collection_set_write_concern(coll, wc);
10381038
datakey = get_bson_from_json_file("./src/libmongoc/tests/"
10391039
"client_side_encryption_prose/external/"
@@ -1807,7 +1807,7 @@ _test_corpus(bool local_schema)
18071807
coll = mongoc_client_get_collection(client, "keyvault", "datakeys");
18081808
(void)mongoc_collection_drop(coll, NULL);
18091809
wc = mongoc_write_concern_new();
1810-
mongoc_write_concern_set_wmajority(wc, 1000);
1810+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
18111811
mongoc_collection_set_write_concern(coll, wc);
18121812
_insert_from_file(coll,
18131813
"./src/libmongoc/tests/client_side_encryption_prose/"
@@ -1980,7 +1980,7 @@ _reset(mongoc_client_pool_t **pool,
19801980
coll = mongoc_client_get_collection(*singled_threaded_client, "db", "keyvault");
19811981
(void)mongoc_collection_drop(coll, NULL);
19821982
wc = mongoc_write_concern_new();
1983-
mongoc_write_concern_set_wmajority(wc, 1000);
1983+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
19841984
mongoc_collection_set_write_concern(coll, wc);
19851985
datakey = get_bson_from_json_file("./src/libmongoc/tests/client_side_encryption_prose/limits-key.json");
19861986
BSON_ASSERT(datakey);
@@ -2211,7 +2211,7 @@ _test_multi_threaded(bool external_key_vault)
22112211
datakey = get_bson_from_json_file("./src/libmongoc/tests/client_side_encryption_prose/limits-key.json");
22122212
BSON_ASSERT(datakey);
22132213
wc = mongoc_write_concern_new();
2214-
mongoc_write_concern_set_wmajority(wc, 1000);
2214+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
22152215
mongoc_collection_set_write_concern(coll, wc);
22162216
ASSERT_OR_PRINT(mongoc_collection_insert_one(coll, datakey, NULL /* opts */, NULL /* reply */, &error), error);
22172217

‎src/libmongoc/tests/test-mongoc-primary-stepdown.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ _setup_test_with_client(mongoc_client_t *client)
6262

6363
{
6464
mongoc_write_concern_t *const wc = mongoc_write_concern_new();
65-
mongoc_write_concern_set_wmajority(wc, -1);
65+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
6666
ASSERT(mongoc_write_concern_append(wc, &opts));
6767
mongoc_write_concern_destroy(wc);
6868
}
@@ -158,7 +158,7 @@ test_getmore_iteration(mongoc_client_t *client, stream_tracker_t *st)
158158

159159
{
160160
mongoc_write_concern_t *const wc = mongoc_write_concern_new();
161-
mongoc_write_concern_set_wmajority(wc, -1);
161+
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
162162
ASSERT(mongoc_write_concern_append(wc, &opts));
163163
mongoc_write_concern_destroy(wc);
164164
}

‎src/libmongoc/tests/test-mongoc-sample-commands.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3933,7 +3933,7 @@ with_transaction_example(bson_error_t *error)
39333933
* concern by default.
39343934
*/
39353935
wc = mongoc_write_concern_new();
3936-
mongoc_write_concern_set_wmajority(wc, 0);
3936+
mongoc_write_concern_set_wmajority(wc, 1000);
39373937
insert_opts = bson_new();
39383938
mongoc_write_concern_append(wc, insert_opts);
39393939
coll = mongoc_client_get_collection(client, "mydb1", "foo");

0 commit comments

Comments
 (0)