SERVER-65502 Address SERVER-60824 TODOs

4 files changed, 0 insertions, 13 deletions

diff --git a/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml b/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml
index 01d83a673f4..2bbfaf7866e 100644
--- a/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml
@@ -52,8 +52,6 @@ selector:
   # Expects to see IXSCAN over _id (cluster key).
   - jstests/core/**/find_and_modify_hint.js
   - jstests/core/**/covered_index_sort_2.js
-  # TODO (SERVER-60824): Resolve sort exceeded memory limit.
-  - jstests/core/**/sortg.js
   # Expects duplicate key error to have _id index use specified.
   - jstests/core/**/uniqueness.js
   # Expects to see the usage of _id_ index by using $indexStats.
diff --git a/buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml b/buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml
index 5f20e5c1035..8c0b15ccf1c 100644
--- a/buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml
@@ -5,12 +5,6 @@ selector:
   - jstests/sharding/**/*.js
   exclude_files:
   - jstests/sharding/**/libs/**/*.js
-  # TODO (SERVER-60824): Support non-blocking sort() for resharding cloner.
-  - jstests/sharding/test_resharding_test_fixture_shutdown_retry_needed.js
-  - jstests/sharding/resharding_collection_cloner_resuming.js
-  - jstests/sharding/reshard_collection_failover_shutdown_basic.js
-  # TODO (SERVER-60824): Support non-blocking sort() to prevent 'Sort exceeded memory limit'.
-  - jstests/sharding/shard6.js
   # Expects hint(_id) to yield an index scan instead of a table scan.
   - jstests/sharding/shard2.js
   # Expects the collection creation options not to change.
diff --git a/jstests/noPassthrough/timeseries_internal_bounded_sort_spilling.js b/jstests/noPassthrough/timeseries_internal_bounded_sort_spilling.js
index 0014dc64d95..2910df3b953 100644
--- a/jstests/noPassthrough/timeseries_internal_bounded_sort_spilling.js
+++ b/jstests/noPassthrough/timeseries_internal_bounded_sort_spilling.js
@@ -46,9 +46,6 @@ assert.commandWorked(
     }
     assert.gt(buckets.aggregate([{$count: 'n'}]).next().n, 1, 'Expected more than one bucket');
 }
-// Create an index: we'll need this to scan the buckets in time order.
-// TODO SERVER-60824 use the $natural / _id index instead.
-assert.commandWorked(coll.createIndex({t: 1}));
 
 const unpackStage = getAggPlanStage(coll.explain().aggregate(), '$_internalUnpackBucket');
 
diff --git a/src/mongo/db/s/resharding/resharding_data_copy_util.cpp b/src/mongo/db/s/resharding/resharding_data_copy_util.cpp
index 19ad0fdbbd4..9622a39abd4 100644
--- a/src/mongo/db/s/resharding/resharding_data_copy_util.cpp
+++ b/src/mongo/db/s/resharding/resharding_data_copy_util.cpp
@@ -170,8 +170,6 @@ Value findHighestInsertedId(OperationContext* opCtx, const CollectionPtr& collec
 
 boost::optional<Document> findDocWithHighestInsertedId(OperationContext* opCtx,
                                                        const CollectionPtr& collection) {
-    // TODO SERVER-60824: Remove special handling for empty collections once non-blocking sort is
-    // enabled on clustered collections.
     if (collection && collection->isEmpty(opCtx)) {
         return boost::none;
     }