Revert "SERVER-60694 Move collMod to DDL coordinator infrastructure"

18 files changed, 53 insertions, 779 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 442bda2ad74..91bedb4cf6c 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -608,23 +608,9 @@ env.CppUnitTest(
 )
 
 env.Library(
-    target="coll_mod_command_idl",
-    source=[
-        'coll_mod.idl',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/db/catalog/collection_options',
-    ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/auth/authprivilege',
-        '$BUILD_DIR/mongo/db/timeseries/timeseries_options',
-        '$BUILD_DIR/mongo/idl/idl_parser',
-    ],
-)
-
-env.Library(
     target="commands",
     source=[
+        'coll_mod.idl',
         'coll_mod_reply_validation.cpp',
         'commands.cpp',
         'drop.idl',
@@ -653,7 +639,6 @@ env.Library(
         '$BUILD_DIR/mongo/rpc/rewrite_state_change_errors',
         '$BUILD_DIR/mongo/rpc/rpc',
         'audit',
-        'coll_mod_command_idl',
         'index_commands_idl',
         'namespace_string',
     ],
diff --git a/src/mongo/db/coll_mod.idl b/src/mongo/db/coll_mod.idl
index 455fff974a0..49fdfd6471d 100644
--- a/src/mongo/db/coll_mod.idl
+++ b/src/mongo/db/coll_mod.idl
@@ -89,9 +89,23 @@ structs:
                 type: safeBool
                 unstable: true
 
-    CollModRequest:
-        description: "The collMod command's request."
+commands:
+    collMod:
+        description: "Specify collMod Command."
+        command_name: collMod
+        namespace: concatenate_with_db
+        cpp_name: collMod
         strict: true
+        api_version: "1"
+        access_check:
+            complex:
+                - check: should_ignore_auth_checks
+                - privilege:
+                    resource_pattern: exact_namespace
+                    action_type: collMod
+                - privilege:
+                    resource_pattern: exact_namespace
+                    action_type: find
         fields:
             index:
                 description: "Index to be modified."
@@ -155,8 +169,6 @@ structs:
                 optional: true
                 type: CollModTimeseries
                 unstable: false
-            # TODO (SERVER-61685): `isTimeseriesNamespace` is not needed for the collMod command but kept
-            # for backward compatibility. Remove this flag after 6.0 branching.
             isTimeseriesNamespace:
                 description: "This flag is set to true when the command was originally sent to
                               mongos on the time-series view, but got rewritten to target
@@ -171,25 +183,4 @@ structs:
                 optional: true
                 type: safeBool
                 unstable: true
-
-commands:
-    collMod:
-        description: "Specify collMod Command."
-        command_name: collMod
-        namespace: concatenate_with_db
-        cpp_name: collMod
-        strict: true
-        api_version: "1"
-        access_check:
-            complex:
-                - check: should_ignore_auth_checks
-                - privilege:
-                    resource_pattern: exact_namespace
-                    action_type: collMod
-                - privilege:
-                    resource_pattern: exact_namespace
-                    action_type: find
-        inline_chained_structs: true
-        chained_structs:
-            CollModRequest: CollModRequest
         reply_type: CollModReply
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index 3b9ae68663e..0e586ee7515 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -291,8 +291,6 @@ env.Library(
         'cleanup_orphaned_cmd.cpp',
         'clone_catalog_data_command.cpp',
         'clone_collection_options_from_primary_shard_cmd.cpp',
-        'collmod_coordinator.cpp',
-        'collmod_coordinator_document.idl',
         'config/configsvr_abort_reshard_collection_command.cpp',
         'config/configsvr_add_shard_command.cpp',
         'config/configsvr_add_shard_to_zone_command.cpp',
@@ -345,7 +343,6 @@ env.Library(
         'set_allow_migrations_coordinator.cpp',
         'set_allow_migrations_coordinator_document.idl',
         'set_shard_version_command.cpp',
-        'sharded_collmod.idl',
         'sharded_index_consistency_server_status.cpp',
         'sharded_rename_collection.idl',
         'sharding_ddl_coordinator.cpp',
@@ -355,8 +352,6 @@ env.Library(
         'sharding_state_command.cpp',
         'shardsvr_abort_reshard_collection_command.cpp',
         'shardsvr_cleanup_reshard_collection_command.cpp',
-        'shardsvr_collmod_command.cpp',
-        'shardsvr_collmod_participant_command.cpp',
         'shardsvr_commit_reshard_collection_command.cpp',
         'shardsvr_create_collection_command.cpp',
         'shardsvr_create_collection_participant_command.cpp',
@@ -390,7 +385,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/repl/replica_set_messages',
         '$BUILD_DIR/mongo/db/timeseries/catalog_helper',
-        '$BUILD_DIR/mongo/db/timeseries/timeseries_collmod',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_options',
         '$BUILD_DIR/mongo/s/commands/sharded_cluster_sharding_commands',
diff --git a/src/mongo/db/s/collmod_coordinator.cpp b/src/mongo/db/s/collmod_coordinator.cpp
deleted file mode 100644
index 9c13e2756a5..00000000000
--- a/src/mongo/db/s/collmod_coordinator.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- *    Copyright (C) 2021-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::kSharding
-
-#include "mongo/db/s/collmod_coordinator.h"
-
-#include "mongo/db/catalog/collection_catalog.h"
-#include "mongo/db/catalog/database_holder.h"
-#include "mongo/db/coll_mod_gen.h"
-#include "mongo/db/db_raii.h"
-#include "mongo/db/ops/insert.h"
-#include "mongo/db/s/sharded_collmod_gen.h"
-#include "mongo/db/s/sharding_ddl_util.h"
-#include "mongo/db/s/sharding_state.h"
-#include "mongo/db/timeseries/catalog_helper.h"
-#include "mongo/db/timeseries/timeseries_collmod.h"
-#include "mongo/idl/idl_parser.h"
-#include "mongo/logv2/log.h"
-#include "mongo/s/async_requests_sender.h"
-#include "mongo/s/cluster_commands_helpers.h"
-#include "mongo/s/grid.h"
-
-namespace mongo {
-
-namespace {
-
-bool isShardedColl(OperationContext* opCtx, const NamespaceString& nss) {
-    try {
-        auto coll = Grid::get(opCtx)->catalogClient()->getCollection(opCtx, nss);
-        return true;
-    } catch (const ExceptionFor<ErrorCodes::NamespaceNotFound>&) {
-        // The collection is not sharded or doesn't exist.
-        return false;
-    }
-}
-
-bool hasTimeSeriesGranularityUpdate(const CollModRequest& request) {
-    return request.getTimeseries() && request.getTimeseries()->getGranularity();
-}
-
-}  // namespace
-
-CollModCoordinator::CollModCoordinator(ShardingDDLCoordinatorService* service,
-                                       const BSONObj& initialState)
-    : ShardingDDLCoordinator(service, initialState) {
-    _initialState = initialState.getOwned();
-    _doc = CollModCoordinatorDocument::parse(IDLParserErrorContext("CollModCoordinatorDocument"),
-                                             _initialState);
-}
-
-void CollModCoordinator::checkIfOptionsConflict(const BSONObj& doc) const {
-    const auto otherDoc =
-        CollModCoordinatorDocument::parse(IDLParserErrorContext("CollModCoordinatorDocument"), doc);
-
-    const auto& selfReq = _doc.getCollModRequest().toBSON();
-    const auto& otherReq = otherDoc.getCollModRequest().toBSON();
-
-    uassert(ErrorCodes::ConflictingOperationInProgress,
-            str::stream() << "Another collMod for namespace " << nss()
-                          << " is being executed with different parameters: " << selfReq,
-            SimpleBSONObjComparator::kInstance.evaluate(selfReq == otherReq));
-}
-
-boost::optional<BSONObj> CollModCoordinator::reportForCurrentOp(
-    MongoProcessInterface::CurrentOpConnectionsMode connMode,
-    MongoProcessInterface::CurrentOpSessionsMode sessionMode) noexcept {
-
-    BSONObjBuilder cmdBob;
-    if (const auto& optComment = getForwardableOpMetadata().getComment()) {
-        cmdBob.append(optComment.get().firstElement());
-    }
-    cmdBob.appendElements(_doc.getCollModRequest().toBSON());
-    BSONObjBuilder bob;
-    bob.append("type", "op");
-    bob.append("desc", "CollModCoordinator");
-    bob.append("op", "command");
-    bob.append("ns", nss().toString());
-    bob.append("command", cmdBob.obj());
-    bob.append("currentPhase", _doc.getPhase());
-    bob.append("active", true);
-    return bob.obj();
-}
-
-void CollModCoordinator::_enterPhase(Phase newPhase) {
-    StateDoc newDoc(_doc);
-    newDoc.setPhase(newPhase);
-
-    LOGV2_DEBUG(6069401,
-                2,
-                "CollMod coordinator phase transition",
-                "namespace"_attr = nss(),
-                "newPhase"_attr = CollModCoordinatorPhase_serializer(newDoc.getPhase()),
-                "oldPhase"_attr = CollModCoordinatorPhase_serializer(_doc.getPhase()));
-
-    if (_doc.getPhase() == Phase::kUnset) {
-        _doc = _insertStateDocument(std::move(newDoc));
-        return;
-    }
-    _doc = _updateStateDocument(cc().makeOperationContext().get(), std::move(newDoc));
-}
-
-void CollModCoordinator::_performNoopRetryableWriteOnParticipants(
-    OperationContext* opCtx, const std::shared_ptr<executor::TaskExecutor>& executor) {
-    auto shardsAndConfigsvr = [&] {
-        const auto shardRegistry = Grid::get(opCtx)->shardRegistry();
-        auto participants = shardRegistry->getAllShardIds(opCtx);
-        participants.emplace_back(shardRegistry->getConfigShard()->getId());
-        return participants;
-    }();
-
-    _doc = _updateSession(opCtx, _doc);
-    sharding_ddl_util::performNoopRetryableWriteOnShards(
-        opCtx, shardsAndConfigsvr, getCurrentSession(_doc), executor);
-}
-
-ExecutorFuture<void> CollModCoordinator::_runImpl(
-    std::shared_ptr<executor::ScopedTaskExecutor> executor,
-    const CancellationToken& token) noexcept {
-    return ExecutorFuture<void>(**executor)
-        .then(_executePhase(
-            Phase::kUpdateShards,
-            [this, executor = executor, anchor = shared_from_this()] {
-                auto opCtxHolder = cc().makeOperationContext();
-                auto* opCtx = opCtxHolder.get();
-                getForwardableOpMetadata().setOn(opCtx);
-
-                const auto isTimeSeries = timeseries::getTimeseriesOptions(
-                    opCtx, nss(), !nss().isTimeseriesBucketsCollection());
-                const auto collNss = isTimeSeries && !nss().isTimeseriesBucketsCollection()
-                    ? nss().makeTimeseriesBucketsNamespace()
-                    : nss();
-                const auto isSharded = isShardedColl(opCtx, collNss);
-
-                if (isSharded) {
-                    // Updating granularity on sharded time-series collections is not allowed.
-                    if (isTimeSeries) {
-                        uassert(
-                            ErrorCodes::NotImplemented,
-                            str::stream()
-                                << "Cannot update granularity of a sharded time-series collection.",
-                            !hasTimeSeriesGranularityUpdate(_doc.getCollModRequest()));
-                    }
-
-                    if (_recoveredFromDisk) {
-                        _performNoopRetryableWriteOnParticipants(opCtx, **executor);
-                    }
-                    _doc = _updateSession(opCtx, _doc);
-                    const OperationSessionInfo osi = getCurrentSession(_doc);
-
-                    const auto chunkManager = uassertStatusOK(
-                        Grid::get(opCtx)->catalogCache()->getCollectionRoutingInfoWithRefresh(
-                            opCtx, collNss));
-                    std::unique_ptr<CollatorInterface> collator;
-                    const auto expCtx =
-                        make_intrusive<ExpressionContext>(opCtx, std::move(collator), collNss);
-                    std::set<ShardId> participants;
-                    chunkManager.getShardIdsForQuery(
-                        expCtx, {} /* query */, {} /* collation */, &participants);
-
-                    ShardsvrCollModParticipant request(nss(), _doc.getCollModRequest());
-                    const auto cmdObj =
-                        CommandHelpers::appendMajorityWriteConcern(request.toBSON({}));
-                    const auto& responses = sharding_ddl_util::sendAuthenticatedCommandToShards(
-                        opCtx,
-                        nss().db(),
-                        cmdObj.addFields(osi.toBSON()),
-                        {std::make_move_iterator(participants.begin()),
-                         std::make_move_iterator(participants.end())},
-                        **executor);
-                    BSONObjBuilder builder;
-                    std::string errmsg;
-                    auto ok = appendRawResponses(opCtx, &errmsg, &builder, responses).responseOK;
-                    if (!errmsg.empty()) {
-                        CommandHelpers::appendSimpleCommandStatus(builder, ok, errmsg);
-                    }
-                    _result = builder.obj();
-                } else {
-                    CollMod cmd(nss());
-                    cmd.setCollModRequest(_doc.getCollModRequest());
-                    BSONObjBuilder collModResBuilder;
-                    uassertStatusOK(timeseries::processCollModCommandWithTimeSeriesTranslation(
-                        opCtx, nss(), cmd, &collModResBuilder));
-                    auto collModRes = collModResBuilder.obj();
-
-                    const auto dbInfo = uassertStatusOK(
-                        Grid::get(opCtx)->catalogCache()->getDatabase(opCtx, nss().db()));
-                    const auto shard = uassertStatusOK(
-                        Grid::get(opCtx)->shardRegistry()->getShard(opCtx, dbInfo.primaryId()));
-                    BSONObjBuilder builder;
-                    builder.appendElements(collModRes);
-                    BSONObjBuilder subBuilder(builder.subobjStart("raw"));
-                    subBuilder.append(shard->getConnString().toString(), collModRes);
-                    subBuilder.doneFast();
-                    _result = builder.obj();
-                }
-            }))
-        .onError([this, anchor = shared_from_this()](const Status& status) {
-            if (!status.isA<ErrorCategory::NotPrimaryError>() &&
-                !status.isA<ErrorCategory::ShutdownError>()) {
-                LOGV2_ERROR(5757002,
-                            "Error running collMod",
-                            "namespace"_attr = nss(),
-                            "error"_attr = redact(status));
-            }
-            return status;
-        });
-}
-
-}  // namespace mongo
diff --git a/src/mongo/db/s/collmod_coordinator.h b/src/mongo/db/s/collmod_coordinator.h
deleted file mode 100644
index 885551d4853..00000000000
--- a/src/mongo/db/s/collmod_coordinator.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- *    Copyright (C) 2021-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.
- */
-
-#pragma once
-
-#include "mongo/db/s/collmod_coordinator_document_gen.h"
-#include "mongo/db/s/sharding_ddl_coordinator.h"
-#include "mongo/s/request_types/sharded_ddl_commands_gen.h"
-
-namespace mongo {
-
-class CollModCoordinator final : public ShardingDDLCoordinator {
-public:
-    using StateDoc = CollModCoordinatorDocument;
-    using Phase = CollModCoordinatorPhaseEnum;
-
-    CollModCoordinator(ShardingDDLCoordinatorService* service, const BSONObj& initialState);
-
-    void checkIfOptionsConflict(const BSONObj& doc) const override;
-
-    boost::optional<BSONObj> reportForCurrentOp(
-        MongoProcessInterface::CurrentOpConnectionsMode connMode,
-        MongoProcessInterface::CurrentOpSessionsMode sessionMode) noexcept override;
-
-    /**
-     * Waits for the termination of the parent DDLCoordinator (so all the resources are liberated)
-     * and then return the result.
-     */
-    BSONObj getResult(OperationContext* opCtx) {
-        getCompletionFuture().get(opCtx);
-        invariant(_result.is_initialized());
-        return *_result;
-    }
-
-private:
-    ShardingDDLCoordinatorMetadata const& metadata() const override {
-        return _doc.getShardingDDLCoordinatorMetadata();
-    }
-
-    ExecutorFuture<void> _runImpl(std::shared_ptr<executor::ScopedTaskExecutor> executor,
-                                  const CancellationToken& token) noexcept override;
-
-    template <typename Func>
-    auto _executePhase(const Phase& newPhase, Func&& func) {
-        return [=] {
-            const auto& currPhase = _doc.getPhase();
-
-            if (currPhase > newPhase) {
-                // Do not execute this phase if we already reached a subsequent one.
-                return;
-            }
-            if (currPhase < newPhase) {
-                // Persist the new phase if this is the first time we are executing it.
-                _enterPhase(newPhase);
-            }
-            return func();
-        };
-    }
-
-    void _enterPhase(Phase newPhase);
-
-    void _performNoopRetryableWriteOnParticipants(
-        OperationContext* opCtx, const std::shared_ptr<executor::TaskExecutor>& executor);
-
-    BSONObj _initialState;
-    CollModCoordinatorDocument _doc;
-    boost::optional<BSONObj> _result;
-};
-
-}  // namespace mongo
diff --git a/src/mongo/db/s/collmod_coordinator_document.idl b/src/mongo/db/s/collmod_coordinator_document.idl
deleted file mode 100644
index 8ff37dc6308..00000000000
--- a/src/mongo/db/s/collmod_coordinator_document.idl
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (C) 2021-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.
-#
-
-# This file defines the format of documents stored in config.ddl.collMod on the coordinator
-# shard for a collMod operation.
-
-global:
-    cpp_namespace: "mongo"
-    cpp_includes:
-        - "mongo/s/catalog/type_collection.h"
-
-imports:
-    - "mongo/idl/basic_types.idl"
-    - "mongo/db/coll_mod.idl"
-    - "mongo/db/s/sharding_ddl_coordinator.idl"
-
-enums:
-    CollModCoordinatorPhase:
-        description: "The current state of a collMod operation on the coordinator."
-        type: string
-        values:
-            kUnset: "unset"
-            kUpdateShards: "UpdateShards"
-
-structs:
-    CollModCoordinatorDocument:
-        description: "Represents a collMod operation on the coordinator shard."
-        generate_comparison_operators: false
-        strict: false
-        chained_structs:
-            ShardingDDLCoordinatorMetadata: ShardingDDLCoordinatorMetadata
-        fields:
-            phase:
-                type: CollModCoordinatorPhase
-                default: kUnset
-            collModRequest:
-                type: CollModRequest
-                description: "Initial collMod request."
diff --git a/src/mongo/db/s/sharded_collmod.idl b/src/mongo/db/s/sharded_collmod.idl
deleted file mode 100644
index 1bd2081e25f..00000000000
--- a/src/mongo/db/s/sharded_collmod.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2018-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.
-#
-global:
-    cpp_namespace: "mongo"
-
-imports:
-    - "mongo/db/coll_mod.idl"
-    - "mongo/idl/basic_types.idl"
-
-commands:
-    _shardsvrCollModParticipant:
-        command_name: _shardsvrCollModParticipant
-        cpp_name: ShardsvrCollModParticipant
-        description: "Internal command sent to all shards to implement collMod locally"
-        strict: false
-        api_version: ""
-        namespace: concatenate_with_db
-        fields:
-            collModRequest:
-                type: CollModRequest
-                description: "Initial collMod request"
diff --git a/src/mongo/db/s/sharding_ddl_coordinator.idl b/src/mongo/db/s/sharding_ddl_coordinator.idl
index 2b43a7b48f4..17142de4ec7 100644
--- a/src/mongo/db/s/sharding_ddl_coordinator.idl
+++ b/src/mongo/db/s/sharding_ddl_coordinator.idl
@@ -50,7 +50,6 @@ enums:
             kCreateCollection: "createCollection"
             kRefineCollectionShardKey: "refineCollectionShardKey"
             kSetAllowMigrations: "setAllowMigrations"
-            kCollMod: "collMod"
 
 types:
     ForwardableOperationMetadata:
diff --git a/src/mongo/db/s/sharding_ddl_coordinator_service.cpp b/src/mongo/db/s/sharding_ddl_coordinator_service.cpp
index 1ec794cc435..aa3324ce8a1 100644
--- a/src/mongo/db/s/sharding_ddl_coordinator_service.cpp
+++ b/src/mongo/db/s/sharding_ddl_coordinator_service.cpp
@@ -42,7 +42,6 @@
 #include "mongo/db/s/sharding_ddl_coordinator.h"
 #include "mongo/logv2/log.h"
 
-#include "mongo/db/s/collmod_coordinator.h"
 #include "mongo/db/s/create_collection_coordinator.h"
 #include "mongo/db/s/drop_collection_coordinator.h"
 #include "mongo/db/s/drop_database_coordinator.h"
@@ -81,10 +80,6 @@ std::shared_ptr<ShardingDDLCoordinator> constructShardingDDLCoordinatorInstance(
         case DDLCoordinatorTypeEnum::kSetAllowMigrations:
             return std::make_shared<SetAllowMigrationsCoordinator>(service,
                                                                    std::move(initialState));
-            break;
-        case DDLCoordinatorTypeEnum::kCollMod:
-            return std::make_shared<CollModCoordinator>(service, std::move(initialState));
-            break;
         default:
             uasserted(ErrorCodes::BadValue,
                       str::stream()
diff --git a/src/mongo/db/s/sharding_ddl_util.cpp b/src/mongo/db/s/sharding_ddl_util.cpp
index c887ca96f02..09db3271b07 100644
--- a/src/mongo/db/s/sharding_ddl_util.cpp
+++ b/src/mongo/db/s/sharding_ddl_util.cpp
@@ -160,12 +160,11 @@ void linearizeCSRSReads(OperationContext* opCtx) {
         ShardingCatalogClient::kMajorityWriteConcern));
 }
 
-std::vector<AsyncRequestsSender::Response> sendAuthenticatedCommandToShards(
-    OperationContext* opCtx,
-    StringData dbName,
-    const BSONObj& command,
-    const std::vector<ShardId>& shardIds,
-    const std::shared_ptr<executor::TaskExecutor>& executor) {
+void sendAuthenticatedCommandToShards(OperationContext* opCtx,
+                                      StringData dbName,
+                                      const BSONObj& command,
+                                      const std::vector<ShardId>& shardIds,
+                                      const std::shared_ptr<executor::TaskExecutor>& executor) {
     // TODO SERVER-57519: remove the following scope
     {
         // Ensure ShardRegistry is initialized before using the AsyncRequestsSender that relies on
@@ -181,8 +180,7 @@ std::vector<AsyncRequestsSender::Response> sendAuthenticatedCommandToShards(
     BSONObjBuilder bob(command);
     rpc::writeAuthDataToImpersonatedUserMetadata(opCtx, &bob);
     auto authenticatedCommand = bob.obj();
-    return sharding_util::sendCommandToShards(
-        opCtx, dbName, authenticatedCommand, shardIds, executor);
+    sharding_util::sendCommandToShards(opCtx, dbName, authenticatedCommand, shardIds, executor);
 }
 
 void removeTagsMetadataFromConfig(OperationContext* opCtx,
diff --git a/src/mongo/db/s/sharding_ddl_util.h b/src/mongo/db/s/sharding_ddl_util.h
index ec198cc7ad6..5a34e125924 100644
--- a/src/mongo/db/s/sharding_ddl_util.h
+++ b/src/mongo/db/s/sharding_ddl_util.h
@@ -33,7 +33,6 @@
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/executor/task_executor.h"
-#include "mongo/s/async_requests_sender.h"
 #include "mongo/s/catalog/type_collection.h"
 #include "mongo/s/request_types/sharded_ddl_commands_gen.h"
 
@@ -49,12 +48,11 @@ void linearizeCSRSReads(OperationContext* opCtx);
 /**
  * Generic utility to send a command to a list of shards. Throws if one of the commands fails.
  */
-std::vector<AsyncRequestsSender::Response> sendAuthenticatedCommandToShards(
-    OperationContext* opCtx,
-    StringData dbName,
-    const BSONObj& command,
-    const std::vector<ShardId>& shardIds,
-    const std::shared_ptr<executor::TaskExecutor>& executor);
+void sendAuthenticatedCommandToShards(OperationContext* opCtx,
+                                      StringData dbName,
+                                      const BSONObj& command,
+                                      const std::vector<ShardId>& shardIds,
+                                      const std::shared_ptr<executor::TaskExecutor>& executor);
 
 /**
  * Erase tags metadata from config server for the given namespace, using the _configsvrRemoveTags
diff --git a/src/mongo/db/s/sharding_util.cpp b/src/mongo/db/s/sharding_util.cpp
index 675f10cc521..26c8da56f8c 100644
--- a/src/mongo/db/s/sharding_util.cpp
+++ b/src/mongo/db/s/sharding_util.cpp
@@ -36,6 +36,7 @@
 
 #include "mongo/db/commands.h"
 #include "mongo/logv2/log.h"
+#include "mongo/s/async_requests_sender.h"
 #include "mongo/s/request_types/flush_routing_table_cache_updates_gen.h"
 
 namespace mongo {
@@ -54,18 +55,16 @@ void tellShardsToRefreshCollection(OperationContext* opCtx,
     sendCommandToShards(opCtx, NamespaceString::kAdminDb, cmdObj, shardIds, executor);
 }
 
-std::vector<AsyncRequestsSender::Response> sendCommandToShards(
-    OperationContext* opCtx,
-    StringData dbName,
-    const BSONObj& command,
-    const std::vector<ShardId>& shardIds,
-    const std::shared_ptr<executor::TaskExecutor>& executor) {
+void sendCommandToShards(OperationContext* opCtx,
+                         StringData dbName,
+                         const BSONObj& command,
+                         const std::vector<ShardId>& shardIds,
+                         const std::shared_ptr<executor::TaskExecutor>& executor) {
     std::vector<AsyncRequestsSender::Request> requests;
     for (const auto& shardId : shardIds) {
         requests.emplace_back(shardId, command);
     }
 
-    std::vector<AsyncRequestsSender::Response> responses;
     if (!requests.empty()) {
         // The _flushRoutingTableCacheUpdatesWithWriteConcern command will fail with a
         // QueryPlanKilled error response if the config.cache.chunks collection is dropped
@@ -94,11 +93,8 @@ std::vector<AsyncRequestsSender::Response> sendCommandToShards(
 
             auto wcStatus = getWriteConcernStatusFromCommandResult(shardResponse.data);
             uassertStatusOKWithContext(wcStatus, errorContext);
-
-            responses.push_back(std::move(response));
         }
     }
-    return responses;
 }
 
 }  // namespace sharding_util
diff --git a/src/mongo/db/s/sharding_util.h b/src/mongo/db/s/sharding_util.h
index 1a2c3c51eeb..684568b0214 100644
--- a/src/mongo/db/s/sharding_util.h
+++ b/src/mongo/db/s/sharding_util.h
@@ -34,7 +34,6 @@
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/executor/task_executor.h"
-#include "mongo/s/async_requests_sender.h"
 #include "mongo/s/shard_id.h"
 
 namespace mongo {
@@ -52,12 +51,11 @@ void tellShardsToRefreshCollection(OperationContext* opCtx,
 /**
  * Generic utility to send a command to a list of shards. Throws if one of the commands fails.
  */
-std::vector<AsyncRequestsSender::Response> sendCommandToShards(
-    OperationContext* opCtx,
-    StringData dbName,
-    const BSONObj& command,
-    const std::vector<ShardId>& shardIds,
-    const std::shared_ptr<executor::TaskExecutor>& executor);
+void sendCommandToShards(OperationContext* opCtx,
+                         StringData dbName,
+                         const BSONObj& command,
+                         const std::vector<ShardId>& shardIds,
+                         const std::shared_ptr<executor::TaskExecutor>& executor);
 
 }  // namespace sharding_util
 }  // namespace mongo
diff --git a/src/mongo/db/s/shardsvr_collmod_command.cpp b/src/mongo/db/s/shardsvr_collmod_command.cpp
deleted file mode 100644
index bd837280240..00000000000
--- a/src/mongo/db/s/shardsvr_collmod_command.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- *    Copyright (C) 2018-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::kSharding
-
-#include "mongo/db/auth/authorization_checks.h"
-#include "mongo/db/auth/authorization_session.h"
-#include "mongo/db/coll_mod_gen.h"
-#include "mongo/db/coll_mod_reply_validation.h"
-#include "mongo/db/commands.h"
-#include "mongo/db/curop.h"
-#include "mongo/db/s/collmod_coordinator.h"
-#include "mongo/db/s/sharding_state.h"
-#include "mongo/logv2/log.h"
-#include "mongo/s/chunk_manager_targeter.h"
-#include "mongo/s/grid.h"
-
-namespace mongo {
-namespace {
-
-class ShardsvrCollModCommand final : public BasicCommandWithRequestParser<ShardsvrCollModCommand> {
-public:
-    using Request = ShardsvrCollMod;
-    using Response = CollModReply;
-
-    ShardsvrCollModCommand() : BasicCommandWithRequestParser() {}
-
-    AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
-        return Command::AllowedOnSecondary::kNever;
-    }
-
-    bool supportsWriteConcern(const BSONObj& cmd) const override {
-        return true;
-    }
-
-    bool collectsResourceConsumptionMetrics() const override {
-        return true;
-    }
-
-    std::string help() const override {
-        return "Internal command, which is exported by the primary sharding server. Do not call "
-               "directly. Modifies collection.";
-    }
-
-    Status checkAuthForCommand(Client* client,
-                               const std::string& dbname,
-                               const BSONObj& cmdObj) const override {
-        const NamespaceString nss(parseNs(dbname, cmdObj));
-        return auth::checkAuthForCollMod(AuthorizationSession::get(client), nss, cmdObj, false);
-    }
-
-    bool skipApiVersionCheck() const override {
-        // Internal command (server to server).
-        return true;
-    }
-
-    bool runWithRequestParser(OperationContext* opCtx,
-                              const std::string& db,
-                              const BSONObj& cmdObj,
-                              const RequestParser& requestParser,
-                              BSONObjBuilder& result) override {
-        auto const shardingState = ShardingState::get(opCtx);
-        uassertStatusOK(shardingState->canAcceptShardedCommands());
-
-        uassert(ErrorCodes::InvalidOptions,
-                str::stream() << Request::kCommandName
-                              << " must be called with majority writeConcern, got "
-                              << opCtx->getWriteConcern().wMode,
-                opCtx->getWriteConcern().wMode == WriteConcernOptions::kMajority);
-
-        opCtx->setAlwaysInterruptAtStepDownOrUp();
-
-        // Since this operation is not directly writing locally we need to force its db
-        // profile level increase in order to be logged in "<db>.system.profile"
-        const auto& cmd = requestParser.request();
-        CurOp::get(opCtx)->raiseDbProfileLevel(
-            CollectionCatalog::get(opCtx)->getDatabaseProfileLevel(cmd.getDbName()));
-
-        auto coordinatorDoc = CollModCoordinatorDocument();
-        coordinatorDoc.setCollModRequest(cmd.getCollModRequest());
-        coordinatorDoc.setShardingDDLCoordinatorMetadata(
-            {{cmd.getNamespace(), DDLCoordinatorTypeEnum::kCollMod}});
-        auto service = ShardingDDLCoordinatorService::getService(opCtx);
-        auto collModCoordinator = checked_pointer_cast<CollModCoordinator>(
-            service->getOrCreateInstance(opCtx, coordinatorDoc.toBSON()));
-        result.appendElements(collModCoordinator->getResult(opCtx));
-        return true;
-    }
-
-    void validateResult(const BSONObj& resultObj) final {
-        StringDataSet ignorableFields({"raw", "ok", "errmsg"});
-        auto reply = Response::parse(IDLParserErrorContext("CollModReply"),
-                                     resultObj.removeFields(ignorableFields));
-        coll_mod_reply_validation::validateReply(reply);
-    }
-} shardsvrCollModCommand;
-
-}  // namespace
-}  // namespace mongo
diff --git a/src/mongo/db/s/shardsvr_collmod_participant_command.cpp b/src/mongo/db/s/shardsvr_collmod_participant_command.cpp
deleted file mode 100644
index 155d298f751..00000000000
--- a/src/mongo/db/s/shardsvr_collmod_participant_command.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- *    Copyright (C) 2018-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::kSharding
-
-#include "mongo/db/auth/authorization_session.h"
-#include "mongo/db/catalog_raii.h"
-#include "mongo/db/commands.h"
-#include "mongo/db/s/collmod_coordinator.h"
-#include "mongo/db/s/sharded_collmod_gen.h"
-#include "mongo/db/s/sharding_state.h"
-#include "mongo/db/timeseries/timeseries_collmod.h"
-#include "mongo/logv2/log.h"
-#include "mongo/s/catalog/sharding_catalog_client.h"
-#include "mongo/s/chunk_manager_targeter.h"
-
-namespace mongo {
-namespace {
-
-class ShardSvrCollModParticipantCommand final
-    : public TypedCommand<ShardSvrCollModParticipantCommand> {
-public:
-    using Request = ShardsvrCollModParticipant;
-    using Response = CollModReply;
-
-    std::string help() const override {
-        return "Internal command, which is exported by the shards. Do not call "
-               "directly. Blocks writes during collection mod.";
-    }
-
-    bool skipApiVersionCheck() const override {
-        // Internal command (server to server).
-        return true;
-    }
-
-    AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
-        return Command::AllowedOnSecondary::kNever;
-    }
-
-    class Invocation final : public InvocationBase {
-    public:
-        using InvocationBase::InvocationBase;
-
-        Response typedRun(OperationContext* opCtx) {
-            uassertStatusOK(ShardingState::get(opCtx)->canAcceptShardedCommands());
-
-            uassert(ErrorCodes::InvalidOptions,
-                    str::stream() << Request::kCommandName
-                                  << " must be called with majority writeConcern, got "
-                                  << opCtx->getWriteConcern().wMode,
-                    opCtx->getWriteConcern().wMode == WriteConcernOptions::kMajority);
-
-            opCtx->setAlwaysInterruptAtStepDownOrUp();
-
-            BSONObjBuilder builder;
-            CollMod cmd(ns());
-            cmd.setCollModRequest(request().getCollModRequest());
-            uassertStatusOK(timeseries::processCollModCommandWithTimeSeriesTranslation(
-                opCtx, ns(), cmd, &builder));
-            return CollModReply::parse(IDLParserErrorContext("CollModReply"), builder.obj());
-        }
-
-    private:
-        NamespaceString ns() const override {
-            return request().getNamespace();
-        }
-
-        bool supportsWriteConcern() const override {
-            return true;
-        }
-
-        void doCheckAuthorization(OperationContext* opCtx) const override {
-            uassert(ErrorCodes::Unauthorized,
-                    "Unauthorized",
-                    AuthorizationSession::get(opCtx->getClient())
-                        ->isAuthorizedForActionsOnResource(ResourcePattern::forClusterResource(),
-                                                           ActionType::internal));
-        }
-    };
-} shardsvrCollModParticipantCommand;
-
-}  // namespace
-}  // namespace mongo
diff --git a/src/mongo/db/timeseries/SConscript b/src/mongo/db/timeseries/SConscript
index a9cc40ef985..5d00033beaf 100644
--- a/src/mongo/db/timeseries/SConscript
+++ b/src/mongo/db/timeseries/SConscript
@@ -102,7 +102,7 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/mutable/mutable_bson',
         '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
-        '$BUILD_DIR/mongo/db/coll_mod_command_idl',
+        '$BUILD_DIR/mongo/db/commands',
         '$BUILD_DIR/mongo/db/exec/bucket_unpacker',
         '$BUILD_DIR/mongo/db/namespace_string',
         'catalog_helper',
diff --git a/src/mongo/db/timeseries/timeseries_collmod.cpp b/src/mongo/db/timeseries/timeseries_collmod.cpp
index 1e5f6f5a91b..de548b89995 100644
--- a/src/mongo/db/timeseries/timeseries_collmod.cpp
+++ b/src/mongo/db/timeseries/timeseries_collmod.cpp
@@ -69,20 +69,18 @@ std::unique_ptr<CollMod> makeTimeseriesBucketsCollModCommand(OperationContext* o
 
     auto ns =
         isCommandOnTimeseriesBucketNamespace ? origNs : origNs.makeTimeseriesBucketsNamespace();
-    CollModRequest request;
-    request.setIndex(index);
-    request.setValidator(origCmd.getValidator());
-    request.setValidationLevel(origCmd.getValidationLevel());
-    request.setValidationAction(origCmd.getValidationAction());
-    request.setViewOn(origCmd.getViewOn());
-    request.setPipeline(origCmd.getPipeline());
-    request.setRecordPreImages(origCmd.getRecordPreImages());
-    request.setChangeStreamPreAndPostImages(origCmd.getChangeStreamPreAndPostImages());
-    request.setExpireAfterSeconds(origCmd.getExpireAfterSeconds());
-    request.setTimeseries(origCmd.getTimeseries());
-    request.setDryRun(origCmd.getDryRun());
     auto cmd = std::make_unique<CollMod>(ns);
-    cmd->setCollModRequest(request);
+    cmd->setIndex(index);
+    cmd->setValidator(origCmd.getValidator());
+    cmd->setValidationLevel(origCmd.getValidationLevel());
+    cmd->setValidationAction(origCmd.getValidationAction());
+    cmd->setViewOn(origCmd.getViewOn());
+    cmd->setPipeline(origCmd.getPipeline());
+    cmd->setRecordPreImages(origCmd.getRecordPreImages());
+    cmd->setChangeStreamPreAndPostImages(origCmd.getChangeStreamPreAndPostImages());
+    cmd->setExpireAfterSeconds(origCmd.getExpireAfterSeconds());
+    cmd->setTimeseries(origCmd.getTimeseries());
+
     return cmd;
 }
 
@@ -110,9 +108,7 @@ std::unique_ptr<CollMod> makeTimeseriesViewCollModCommand(OperationContext* opCt
                 constexpr bool asArray = false;
                 std::vector<BSONObj> pipeline = {
                     timeseries::generateViewPipeline(newOptions, asArray)};
-                CollModRequest viewRequest;
-                viewRequest.setPipeline(std::move(pipeline));
-                cmd->setCollModRequest(viewRequest);
+                cmd->setPipeline(std::move(pipeline));
                 return cmd;
             }
         }
diff --git a/src/mongo/db/transaction_validation.cpp b/src/mongo/db/transaction_validation.cpp
index 648639d8599..f30d64eb205 100644
--- a/src/mongo/db/transaction_validation.cpp
+++ b/src/mongo/db/transaction_validation.cpp
@@ -57,8 +57,7 @@ const StringMap<int> retryableWriteCommands = {{"delete", 1},
                                                {"_shardsvrDropCollectionParticipant", 1},
                                                {"_shardsvrRenameCollectionParticipant", 1},
                                                {"_shardsvrRenameCollectionParticipantUnblock", 1},
-                                               {"_configsvrRenameCollectionMetadata", 1},
-                                               {"_shardsvrCollModParticipant", 1}};
+                                               {"_configsvrRenameCollectionMetadata", 1}};
 
 // Commands that can be sent with session info but should not check out a session.
 const StringMap<int> skipSessionCheckoutList = {