CDRIVER-2422 don't ignore readConcern opt in raw commands

Author: jmikola

src/mongoc/mongoc-cmd.c

@@ -655,11 +655,12 @@ mongoc_cmd_parts_assemble (mongoc_cmd_parts_t *parts,
             &parts->assembled_body, "$clusterTime", 12, cluster_time);
       }
 
-      if (parts->is_read_command && !is_get_more) {
+      if (!is_get_more) {
          /* This condition should never trigger for an implicit client session.
           * Even though the causal consistency option may default to true, an
           * implicit client session will have no previous operation time. */
-         if (cs && mongoc_session_opts_get_causal_consistency (&cs->opts) &&
+         if (parts->is_read_command && cs &&
+             mongoc_session_opts_get_causal_consistency (&cs->opts) &&
              cs->operation_timestamp) {
             _mongoc_cmd_parts_ensure_copied (parts);
             bson_append_document_begin (

tests/test-mongoc-client.c

@@ -1446,6 +1446,87 @@ test_command_with_opts (void)
 }
 
 
+static void
+test_command_with_opts_op_msg (void)
+{
+   mock_server_t *server;
+   mongoc_client_t *client;
+   bson_t *cmd;
+   mongoc_write_concern_t *wc;
+   mongoc_read_concern_t *read_concern;
+   mongoc_read_prefs_t *prefs;
+   bson_error_t error;
+   future_t *future;
+   request_t *request;
+   bson_t opts = BSON_INITIALIZER;
+
+   server = mock_mongos_new (WIRE_VERSION_OP_MSG);
+
+   mock_server_auto_endsessions (server);
+
+   mock_server_run (server);
+
+   client = mongoc_client_new_from_uri (mock_server_get_uri (server));
+
+   /* client's write concern, read concern, read prefs are ignored */
+   wc = mongoc_write_concern_new ();
+   mongoc_write_concern_set_w (wc, 2);
+   mongoc_client_set_write_concern (client, wc);
+
+   read_concern = mongoc_read_concern_new ();
+   mongoc_read_concern_set_level (read_concern, "majority");
+   mongoc_client_set_read_concern (client, read_concern);
+
+   prefs = mongoc_read_prefs_new (MONGOC_READ_SECONDARY);
+   mongoc_client_set_read_prefs (client, prefs);
+
+   cmd = tmp_bson ("{'create': 'db'}");
+   future = future_client_command_with_opts (
+      client, "admin", cmd, NULL, NULL, NULL, &error);
+
+   request = mock_server_receives_msg (
+      server,
+      0,
+      tmp_bson ("{"
+                "   'create': 'db',"
+                "   'readConcern': {'$exists': false},"
+                "   'writeConcern': {'$exists': false}"
+                "}"));
+
+   mock_server_replies_ok_and_destroys (request);
+   ASSERT_OR_PRINT (future_get_bool (future), error);
+   future_destroy (future);
+
+   /* write concern, read concern, and read preference passed in explicitly */
+   mongoc_write_concern_append (wc, &opts);
+   mongoc_read_concern_append (read_concern, &opts);
+   future = future_client_command_with_opts (
+      client, "admin", cmd, prefs, &opts, NULL, &error);
+
+   request = mock_server_receives_msg (
+      server,
+      0,
+      tmp_bson ("{"
+                "   'create':'db',"
+                "   'writeConcern': {'w': 2},"
+                "   'readConcern': {'level':'majority'},"
+                "   '$readPreference': {"
+                "      'mode':'secondary'"
+                "   }"
+                "}"));
+
+   mock_server_replies_ok_and_destroys (request);
+   ASSERT_OR_PRINT (future_get_bool (future), error);
+   future_destroy (future);
+
+   mongoc_read_prefs_destroy (prefs);
+   mongoc_read_concern_destroy (read_concern);
+   mongoc_write_concern_destroy (wc);
+   mongoc_client_destroy (client);
+   mock_server_destroy (server);
+}
+
+
 static void
 test_command_empty (void)
 {
@@ -3372,6 +3453,8 @@ test_client_install (TestSuite *suite)
       suite, "/Client/command_with_opts/legacy", test_command_with_opts_legacy);
    TestSuite_AddMockServerTest (
       suite, "/Client/command_with_opts", test_command_with_opts);
+   TestSuite_AddMockServerTest (
+      suite, "/Client/command_with_opts/op_msg", test_command_with_opts_op_msg);
    TestSuite_AddMockServerTest (
       suite, "/Client/command_with_opts/read", test_read_command_with_opts);
    TestSuite_AddLive (suite, "/Client/command/empty", test_command_empty);