CDRIVER-775: Set wtimeoutms for all replica acknowledged write concerns

Author: jmikola

src/mongoc/mongoc-uri.c

@@ -890,6 +890,9 @@ _mongoc_uri_build_write_concern (mongoc_uri_t *uri) /* IN */
          default:
             if (value > 0) {
                mongoc_write_concern_set_w (write_concern, value);
+               if (value > 1) {
+                  mongoc_write_concern_set_wtimeout (write_concern, wtimeoutms);
+               }
                break;
             }
             MONGOC_WARNING ("Unsupported w value [w=%d].", value);
@@ -902,6 +905,7 @@ _mongoc_uri_build_write_concern (mongoc_uri_t *uri) /* IN */
             mongoc_write_concern_set_wmajority (write_concern, wtimeoutms);
          } else {
             mongoc_write_concern_set_wtag (write_concern, str);
+            mongoc_write_concern_set_wtimeout (write_concern, wtimeoutms);
          }
       } else {
          BSON_ASSERT (false);

tests/test-mongoc-uri.c

@@ -649,6 +649,7 @@ typedef struct
    bool        parses;
    int32_t     w;
    const char *wtag;
+   int32_t     wtimeoutms;
 } write_concern_test;
 
 
@@ -676,6 +677,9 @@ test_mongoc_uri_write_concern (void)
       { "mongodb://localhost/?w=0&journal=true", false, MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED },
       { "mongodb://localhost/?w=-1&journal=true", false, MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED },
       { "mongodb://localhost/?w=1&journal=true", true, 1 },
+      { "mongodb://localhost/?w=2&wtimeoutms=1000", true, 2, NULL, 1000 },
+      { "mongodb://localhost/?w=majority&wtimeoutms=1000", true, MONGOC_WRITE_CONCERN_W_MAJORITY, NULL, 1000 },
+      { "mongodb://localhost/?w=mytag&wtimeoutms=1000", true, MONGOC_WRITE_CONCERN_W_TAG, "mytag", 1000 },
       { NULL }
    };
 
@@ -703,6 +707,10 @@ test_mongoc_uri_write_concern (void)
          assert (0 == strcmp (t->wtag, mongoc_write_concern_get_wtag (wr)));
       }
 
+      if (t->wtimeoutms) {
+         assert (t->wtimeoutms == mongoc_write_concern_get_wtimeout (wr));
+      }
+
       mongoc_uri_destroy (uri);
    }
 }