summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorali-mir <ali.mir@mongodb.com>2022-03-29 17:54:21 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-08-22 18:34:33 +0000
commit40a2da19ffc71fc9b22ea9c828ef9de6a79fa35a (patch)
tree52044ea1862f5ad8b34b007a3b6db3144376dfce
parent88f6fb33c3608ed20b55a7e0566815886a9d45f5 (diff)
downloadmongo-40a2da19ffc71fc9b22ea9c828ef9de6a79fa35a.tar.gz
SERVER-64741 Create mongos appendOplogNote command
(cherry picked from commit 55f3bca3212d994bf00f1165021db34b3ce1d0bb)
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml2
-rw-r--r--etc/backports_required_for_multiversion_tests.yml2
-rw-r--r--jstests/sharding/append_oplog_note_mongos.js76
-rw-r--r--jstests/sharding/database_and_shard_versioning_all_commands.js1
-rw-r--r--src/mongo/s/commands/SConscript1
-rw-r--r--src/mongo/s/commands/cluster_oplog_note_cmd.cpp106
6 files changed, 188 insertions, 0 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
index 29aadda4bc7..9a617e122de 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
@@ -187,6 +187,8 @@ selector:
- jstests/sharding/collation_shard_targeting_hashed_shard_key.js
# Enable when SERVER-62065 is released in 4.0
- jstests/sharding/repair_sharded_collection_history.js
+ # Will fail on 4.0 because the mongos version of appendOplogNote only exists on 4.2.
+ - jstests/sharding/append_oplog_note_mongos.js
exclude_with_any_tags:
- multiversion_incompatible
diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml
index f02f103a733..7a74aa7479c 100644
--- a/etc/backports_required_for_multiversion_tests.yml
+++ b/etc/backports_required_for_multiversion_tests.yml
@@ -144,6 +144,8 @@ all:
test_file: jstests/change_streams/show_raw_update_description_v1_oplog.js
- ticket: SERVER-63159
test_file: jstests/core/internal_apply_oplog_update.js
+ - ticket: SERVER-64741
+ test_file: jstests/sharding/append_oplog_note_mongos.js
# Tests that should only be excluded from particular suites should be listed under that suite.
diff --git a/jstests/sharding/append_oplog_note_mongos.js b/jstests/sharding/append_oplog_note_mongos.js
new file mode 100644
index 00000000000..1369ecb06be
--- /dev/null
+++ b/jstests/sharding/append_oplog_note_mongos.js
@@ -0,0 +1,76 @@
+/**
+ * Tests that the 'appendOplogNote' command on mongos correctly performs a no-op write on each
+ * shard and advances the $clusterTime.
+ */
+
+(function() {
+"use strict";
+
+load("jstests/libs/fail_point_util.js");
+
+function checkOplogEntry(actualOplogEntry) {
+ const {op, o} = actualOplogEntry;
+ assert.eq({op, o}, {op: "n", o: {a: 2}}, actualOplogEntry);
+}
+
+// We need to disable the periodic no-op writer so we can verify that the 'appendOplogNote'
+// no-op is the latest operation on the oplog.
+const st = new ShardingTest(
+ {mongos: 1, shards: 2, rs: {nodes: 2, setParameter: {writePeriodicNoops: false}}});
+const admin = st.getDB('admin');
+const shardOnePrimary = st.rs0.getPrimary();
+const shardTwoPrimary = st.rs1.getPrimary();
+
+// Test that issuing the command without the 'data' field results in an error.
+let res = assert.commandFailed(admin.runCommand({appendOplogNote: 1}));
+assert.eq(res.code, ErrorCodes.NoSuchKey);
+assert(res.hasOwnProperty("raw"), res);
+
+// Test that the error response contains the correct fields.
+const appendOplogNoteFailpoint = configureFailPoint(shardOnePrimary, "failCommand", {
+ errorCode: ErrorCodes.HostUnreachable,
+ failCommands: ["appendOplogNote"],
+ failInternalCommands: true
+});
+
+res = assert.commandFailed(admin.runCommand({appendOplogNote: 1, data: {a: 1}}));
+assert(res.hasOwnProperty("errmsg"), res);
+assert.eq(res.code, ErrorCodes.HostUnreachable);
+assert(res.hasOwnProperty("raw"), res);
+
+appendOplogNoteFailpoint.wait();
+appendOplogNoteFailpoint.off();
+
+// Test that a successful 'appendOplogNote' command performs a no-op write and advances the
+// $clusterTime.
+const shardOneBefore =
+ assert.commandWorked(shardOnePrimary.getDB("admin").runCommand({replSetGetStatus: 1}));
+const shardTwoBefore =
+ assert.commandWorked(shardTwoPrimary.getDB("admin").runCommand({replSetGetStatus: 1}));
+
+res = assert.commandWorked(admin.runCommand({appendOplogNote: 1, data: {a: 2}}));
+assert(res.hasOwnProperty("raw"), res);
+
+const shardOneAfter =
+ assert.commandWorked(shardOnePrimary.getDB("admin").runCommand({replSetGetStatus: 1}));
+const shardTwoAfter =
+ assert.commandWorked(shardTwoPrimary.getDB("admin").runCommand({replSetGetStatus: 1}));
+
+assert.lt(shardOneBefore.members[0].optime.ts, shardOneAfter.members[0].optime.ts);
+assert.lt(shardTwoBefore.members[0].optime.ts, shardTwoAfter.members[0].optime.ts);
+
+let lastEntryShardOne =
+ shardOnePrimary.getDB("local").oplog.rs.find().sort({$natural: -1}).limit(1).toArray()[0];
+let lastEntryShardTwo =
+ shardTwoPrimary.getDB("local").oplog.rs.find().sort({$natural: -1}).limit(1).toArray()[0];
+
+// The $clusterTime in the 'replSetGetStatus' response should be equal to the timestamp of
+// 'appendOplogNote' command no-op write, which is the last operation on the shard oplogs.
+checkOplogEntry(lastEntryShardOne);
+checkOplogEntry(lastEntryShardTwo);
+
+assert.eq(shardOneAfter.members[0].optime.ts, lastEntryShardOne.ts);
+assert.eq(shardTwoAfter.members[0].optime.ts, lastEntryShardTwo.ts);
+
+st.stop();
+}());
diff --git a/jstests/sharding/database_and_shard_versioning_all_commands.js b/jstests/sharding/database_and_shard_versioning_all_commands.js
index ca9d56c8a80..6e001ef5a2d 100644
--- a/jstests/sharding/database_and_shard_versioning_all_commands.js
+++ b/jstests/sharding/database_and_shard_versioning_all_commands.js
@@ -57,6 +57,7 @@ let testCases = {
sendsShardVersion: true,
command: {aggregate: collName, pipeline: [{$match: {x: 1}}], cursor: {batchSize: 10}},
},
+ appendOplogNote: {skip: "unversioned and executes on all shards"},
authenticate: {skip: "does not forward command to primary shard"},
availableQueryOptions: {skip: "executes locally on mongos (not sent to any remote node)"},
balancerStart: {skip: "not on a user database"},
diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript
index 8407084e202..a5215460c1e 100644
--- a/src/mongo/s/commands/SConscript
+++ b/src/mongo/s/commands/SConscript
@@ -25,6 +25,7 @@ env.Library(
'cluster_abort_transaction_cmd.cpp',
'cluster_add_shard_cmd.cpp',
'cluster_add_shard_to_zone_cmd.cpp',
+ 'cluster_oplog_note_cmd.cpp',
'cluster_available_query_options_cmd.cpp',
'cluster_build_info.cpp',
'cluster_clear_jumbo_flag_cmd.cpp',
diff --git a/src/mongo/s/commands/cluster_oplog_note_cmd.cpp b/src/mongo/s/commands/cluster_oplog_note_cmd.cpp
new file mode 100644
index 00000000000..03cfef179c4
--- /dev/null
+++ b/src/mongo/s/commands/cluster_oplog_note_cmd.cpp
@@ -0,0 +1,106 @@
+/**
+ * Copyright (C) 2022-present MongoDB, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Server Side Public License, version 1,
+ * as published by MongoDB, Inc.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Server Side Public License for more details.
+ *
+ * You should have received a copy of the Server Side Public License
+ * along with this program. If not, see
+ * <http://www.mongodb.com/licensing/server-side-public-license>.
+ *
+ * As a special exception, the copyright holders give permission to link the
+ * code of portions of this program with the OpenSSL library under certain
+ * conditions as described in each individual source file and distribute
+ * linked combinations including the program with the OpenSSL library. You
+ * must comply with the Server Side Public License in all respects for
+ * all of the code used other than as permitted herein. If you modify file(s)
+ * with this exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do so,
+ * delete this exception statement from your version. If you delete this
+ * exception statement from all source files in the program, then also delete
+ * it in the license file.
+ */
+
+#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCommand
+
+#include "mongo/platform/basic.h"
+
+#include "mongo/db/commands.h"
+
+#include "mongo/bson/util/bson_extract.h"
+#include "mongo/db/auth/action_type.h"
+#include "mongo/db/auth/authorization_session.h"
+#include "mongo/db/auth/resource_pattern.h"
+#include "mongo/db/concurrency/d_concurrency.h"
+#include "mongo/db/curop.h"
+#include "mongo/db/namespace_string.h"
+#include "mongo/db/operation_context.h"
+#include "mongo/db/service_context.h"
+#include "mongo/s/cluster_commands_helpers.h"
+
+
+namespace mongo {
+
+
+using std::string;
+using std::stringstream;
+
+class AppendOplogNoteCmd : public BasicCommand {
+public:
+ AppendOplogNoteCmd() : BasicCommand("appendOplogNote") {}
+
+ AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
+ return AllowedOnSecondary::kNever;
+ }
+
+ virtual bool adminOnly() const {
+ return true;
+ }
+
+ virtual bool supportsWriteConcern(const BSONObj& cmd) const override {
+ return true;
+ }
+
+ std::string help() const override {
+ return "Performs a no-op entry on the oplog on each shard";
+ }
+
+ virtual Status checkAuthForCommand(Client* client,
+ const std::string& dbname,
+ const BSONObj& cmdObj) const {
+ if (!AuthorizationSession::get(client)->isAuthorizedForActionsOnResource(
+ ResourcePattern::forClusterResource(), ActionType::appendOplogNote)) {
+ return Status(ErrorCodes::Unauthorized, "Unauthorized");
+ }
+ return Status::OK();
+ }
+
+ virtual bool run(OperationContext* opCtx,
+ const string& dbname,
+ const BSONObj& cmdObj,
+ BSONObjBuilder& result) {
+
+ auto shardResponses = scatterGatherUnversionedTargetAllShards(
+ opCtx,
+ dbname,
+ CommandHelpers::filterCommandRequestForPassthrough(cmdObj),
+ ReadPreferenceSetting::get(opCtx),
+ Shard::RetryPolicy::kIdempotent);
+
+ std::string errmsg;
+ return appendRawResponses(opCtx, &errmsg, &result, shardResponses);
+ }
+};
+
+MONGO_INITIALIZER(RegisterAppendOpLogNoteCmd)(InitializerContext* context) {
+ new AppendOplogNoteCmd();
+ return Status::OK();
+}
+
+} // namespace mongo