Skip to content

Merge '66da8344e9f' into 'master'#331

Open
mergai-bot[bot] wants to merge 44 commits into
masterfrom
mergai/master-66da8344e9f/main
Open

Merge '66da8344e9f' into 'master'#331
mergai-bot[bot] wants to merge 44 commits into
masterfrom
mergai/master-66da8344e9f/main

Conversation

@mergai-bot

@mergai-bot mergai-bot Bot commented Jul 3, 2026

Copy link
Copy Markdown

Merge Info

Merge Context

  • Number of merged commits: 43
  • Auto-merged files: 15

Auto-Merged Files

  • jstests/core/catalog/views/views_all_commands.js

  • jstests/libs/write_concern_all_commands.js

  • jstests/replsets/all_commands_downgrading_to_upgraded.js

  • jstests/replsets/db_reads_while_recovering_all_commands.js

  • jstests/sharding/all_commands_direct_shard_connection_auth.js

  • jstests/sharding/database_versioning_all_commands.js

  • jstests/sharding/read_write_concern_defaults_application.js

  • jstests/sharding/safe_secondary_reads_drop_recreate.js

  • jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js

  • jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js

  • src/mongo/db/BUILD.bazel

  • src/mongo/db/pipeline/BUILD.bazel

  • src/mongo/db/storage/BUILD.bazel

  • src/mongo/dbtests/BUILD.bazel

  • src/third_party/wiredtiger/src/include/wiredtiger.h.in

Merged with strategy: ort

Show details
Commit Summary
66da8344e9facf4ae5b9e617b008ab43b8fac9d2 SERVER-129824 Clean up orphaned index entries when resuming PDIB (#57085)
62bc7ac2916cf32b8d94d3433316a22af9d1fa7c SERVER-128718 Refine SizeCountCheckpointBuffer testing (#57234)
43c06114f681cf01a2bee27902076b990b8d7509 SERVER-130040: Remove dead DocumentSourceInternalSearchIdLookUp::createFromBson() (#57203)
e3582d072fdc6d4980eead30e4b86b5164d0a05d SERVER-116135 - Use sparse indexes in SBE lookup (#56732)
02fecf0688bdc7a26340d53def774fb5c198be9e SERVER-130075 Register metric names for change stream lag, batch timing, and cursor option histograms (#57069)
88cf578c340d8c5a37ab3e739ba82f8a37608fbd SERVER-96888 Enable feature flag for Symmetric FCV (#56681)
de850c23e66329ea62ef314ddeb2b56b4ae8e97b SERVER-129231 Implement movePrimary in the DDL fuzzer (#56930)
5981a12e9cab74bba72fa0983411c1d236c07133 SERVER-119941 Document the new sharding protocol for authoritative shards in the README (#57166)
dc528659be3d7d6c004af78dadfdda07b1e956f5 SERVER-130152: Assign default-owned buildscripts/ resmoke files to @10gen/devprod-test-infrastructure (#57093)
c7bbff159f82b6190a2c196c83b7027289bde799 SERVER-127994 Add FTDC metrics for max key orphan and zone scans (#57199)
14cec85c0d440094999831764a715538c2560fe9 SERVER-130284 Kill dangling cursors on random_moveChunk_constraint_validation.js (#57253)
1eb0fbf57ed65cdba19f308605138fe88344dc15 SERVER-129833 Use Resharding::isEnabledWithPinnedVersion in data replication components (#56723)
edfa346257bd48ab1da2cfca803bd953b6be55e5 SERVER-129233 Add invariant checks for DDL fuzzer (#56905)
239ff9a2e56d5551b1e463c470192701f8dd45d8 SERVER-106235: Enable feature flag gFeatureFlagExpressionMemoryTracking (#57055)
ee37c3ea99bff952f2cc93b7512d7c99edf0a87f SERVER-130272 Complete TODO listed in SERVER-127444 (#57262)
51357376dac8b45f5950d9e14a71feb84793d593 SERVER-127979 Drop legacy shard catalog collections when upgrading (#57232)
48753c03ada5a3fbb32b442b13b404d0af781f88 Revert "SERVER-115714 Consider collection sizes before switching to CBR (#57226)
9a683f32de0ce84fe46eac199b38ea735bdf55ac SERVER-105418 Support on-CPU profiling for performance microbenchmarks (#56182)
d7a93ce7c70f4d2baf9134ca925e6a5eb46f309d SERVER-129194 Playbook and internal commands to resolve collection metadata inconsistency (#57002)
e7a246e4326beb4d79066f6ccaeddb0e31fe68bb SERVER-130304 Fix move_primary_with_crud.js on causal consistency suites (#57264)
f5ad55806dbabaadc1a9970f17e02b7f54c5a760 SERVER-122427 SERVER-124110 add unit tests ensuring a single refresh occurs for convoy problem fetching database or collection metadata (#56637)
80a9b69092564b0eb0c2befc60a449265065e790 Import wiredtiger: 87ac286e1493c1c9894e8d9092c04c9eefdf6e7e from branch mongodb-master (#57161)
eb31e4fb15ca2cc8e84efab99c1b4bf2d488b321 SERVER-127213 New command for committing a moveRange in the global catalog (#57004)
1a599bd3dc6b1a4b422676be63cc3509d3442780 SERVER-129192 - Add percentile wait-time metrics for Execution Control queues (#56785)
12d6146a2bf4893baa9c3814300dfa9f747f9fbc SERVER-128739 Add tests for fixedBucketing during failed FCV transitions (#57143)
2898316bb2cd27c91dbd19cead902c49a7817284 SERVER-129017 Limit memory usage of ExpressionArray in classic engine (#57041)
e7cd3d4346c1604ac7ee4ee6a5f6c127448dc560 SERVER-125911 Classic collscan: support non-contiguous RecordId ranges (#50948)
d410daf8dca57e28fe473ef87d8d990227adc9b4 SERVER-126100 Test user-Triggerable tassert for endOfTransaction (#57003)
cad190314aca67502c8ab44b367ac0fa16f5e8a6 SERVER-129007 Limit memory usage of $concat in classic engine (#57012)
218a15ae71ef0fd1d8734d825be43fb08cd1a097 SERVER-129322 SERVER-123313 CreateCollectionCoordinator should not run legacy refresh under authoritative path (#56287)
fbd91ebc93a3d203eddf39cc33d0c9299f65c4d7 SERVER-110427 Update profiling data (#57245)
d8f1cee41898004efb3d41898824047f29c7b1a5 SERVER-129825 Wire memory tracker into ExpressionNary::optimize() constant folding (#57061)
b4f4a80a0198ddbdaaf70576769806a22e6d8c2a SERVER-130089 Re-enable transaction_crud_ddl_isolation.js with Authoritative Shards (#57148)
60605261ef08044dd18fc4d9df8d5a0ee2e272a2 SERVER-124366 Delete _internalClearCollectionShardingMetadata command (#57147)
8a0f4f44bfb1c2a70dff5e5f2e115c7d8c8371fe SERVER-128361 Refactor agg_join_model to extract all join predicates then apply them (#55590)
690a0c792639753094708b32a4d68827527baaef SERVER-97985 Enable authoritative shards feature flag (#56993)
5cd47701b4d44cd2348b30144a05a84d0235476f SERVER-129313 Add FSM testing for aborting index builds when replica set write block is enabled (#56910)
6b0a7c8de3379e91b2aaca32ee4ed8d375298a65 SERVER-130195 Fix livelock on drainMigrationsPendingRecovery (#57188)
75c66a58b0fcc92be8c80b4f5461c0c7ab25633f SERVER-125407 update leaf.svg (#57243)
b655d2fbd09caf0842d20c979003f6241c892776 SERVER-129945 Remove mutex for resetting the flushed deltas for replicated size and count metadata checkpoint (#56880)
b76aec07ba468d219d4a6b250048eddde70185e3 SERVER-129745 MozJS WASM: fix copyProps() in child realm setup to include Array/Set/Map/RegExp extensions (#56813)
81d91f614cd4199d4bd4b3b5364d041653aa299a SERVER-128879 paliCompleteCheckpoint can race before an encryptor is ready (#56886)
414f08ee3e8156ffbc57218f601bdc9bb72809b4 SERVER-130137 Propagate router metadata elision decision to shards (#57107)

Merge Description

Summary

Merge of upstream MongoDB changes into the fork. The visible incoming changes are: (1) across the various all-commands test catalogs, the internal command _internalClearCollectionShardingMetadata entry is removed and a new _configsvrCommitMoveRange entry (marked as an internal/primary-only command) is added; (2) several BUILD.bazel files gain new source files for a new classic multi-range clustered scan execution stage and its test, a WiredTiger checkpointer unit test, and additional test dependencies for the pipeline unit test; (3) the generated WiredTiger public header renumbers its connection statistic constants to make room for a new WT_STAT_CONN_CACHE_SHARED_DSK_BYTES_DUPLICATE statistic.

Auto-Merged Files

File Path Description
jstests/core/catalog/views/views_all_commands.js Removes the _internalClearCollectionShardingMetadata command entry (was skipped as an internal command) and adds a new _configsvrCommitMoveRange entry skipped as an internal command.
jstests/libs/write_concern_all_commands.js In both the wcCommandsTests and wcTimeseriesCommandsTests catalogs, removes the _internalClearCollectionShardingMetadata internal-command entry and adds a new _configsvrCommitMoveRange internal-command entry.
jstests/replsets/all_commands_downgrading_to_upgraded.js Removes the _internalClearCollectionShardingMetadata internal-command entry and adds a new _configsvrCommitMoveRange internal-command entry.
jstests/replsets/db_reads_while_recovering_all_commands.js Removes the _internalClearCollectionShardingMetadata (internal command) entry and adds a new _configsvrCommitMoveRange entry skipped as primary-only.
jstests/sharding/all_commands_direct_shard_connection_auth.js Removes the _internalClearCollectionShardingMetadata internal-command entry and adds a new _configsvrCommitMoveRange internal-command entry.
jstests/sharding/database_versioning_all_commands.js In the mongod test cases, removes the _internalClearCollectionShardingMetadata internal-command entry and adds a new _configsvrCommitMoveRange internal-command entry.
jstests/sharding/read_write_concern_defaults_application.js Removes the _internalClearCollectionShardingMetadata internal-command entry and adds a new _configsvrCommitMoveRange internal-command entry.
jstests/sharding/safe_secondary_reads_drop_recreate.js Removes the _internalClearCollectionShardingMetadata internal-command entry and adds a new _configsvrCommitMoveRange entry skipped as primary-only.
jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js Removes the _internalClearCollectionShardingMetadata internal-command entry and adds a new _configsvrCommitMoveRange entry skipped as primary-only.
jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js Removes the _internalClearCollectionShardingMetadata internal-command entry and adds a new _configsvrCommitMoveRange entry skipped as primary-only.
src/mongo/db/BUILD.bazel Adds //src/mongo/db/exec/classic:multi_range_clustered_scan.cpp to the source list of a mongo_cc_library target.
src/mongo/db/pipeline/BUILD.bazel Adds two dependencies to a mongo_cc_unit_test target: //src/mongo/db/memory_tracking and //src/mongo/unittest:server_parameter_guard.
src/mongo/db/storage/BUILD.bazel Adds checkpointer_test.cpp to the srcs and :checkpointer to the deps of the db_storage_test mongo_cc_unit_test target.
src/mongo/dbtests/BUILD.bazel Adds query_stage_multi_range_clustered_scan.cpp to the srcs of the dbtests mongo_cc_binary target.
src/third_party/wiredtiger/src/include/wiredtiger.h.in Introduces a new connection statistic macro WT_STAT_CONN_CACHE_SHARED_DSK_BYTES_DUPLICATE (1345, 'cache: shared disk bytes saved by sharing duplicate disk images') and renumbers all subsequent WT_STAT_CONN_* constants by one to accommodate it. This is a generated header; the change is purely the added stat plus the mechanical renumbering.

Review Notes

All changes auto-merged cleanly with no conflicts. The jstests changes are consistent across all all-commands catalogs (drop _internalClearCollectionShardingMetadata, add _configsvrCommitMoveRange), matching an upstream command-registry change. The BUILD.bazel additions correspond to new upstream source/test files (multi_range_clustered_scan stage, checkpointer_test) — verify those referenced files exist after the merge so the build targets resolve. The wiredtiger.h.in change is a generated-header renumbering; confirm it stays in sync with the corresponding WiredTiger stat source. None of these diffs touch Percona-specific customizations.

Agent Stats

Agent: claude_cli (version 2.1.199 (Claude Code))

Model Input Output Cached Thoughts Tool Total
claude-haiku-4-5-20251001 603 17
claude-opus-4-8 5357 3163

note created with mergai 0.1.dev1+g6435390b9

aditya8061 and others added 30 commits July 1, 2026 00:49
…57107)

GitOrigin-RevId: 4e83499bbb1304adf3ee56f62a098f03846a2500
…ready (#56886)

GitOrigin-RevId: bc00fe9f98ad1e46987bf467a1e7b354d4f226da
…lude Array/Set/Map/RegExp extensions (#56813)

GitOrigin-RevId: 1bccebbd0c1f1a31129a44f7111805e668adfc33
…cated size and count metadata checkpoint (#56880)

GitOrigin-RevId: e413083c6f634bbcaba626efbc5ff4e784d1f60a
GitOrigin-RevId: 9c2c6e9b7b541df64eecfdf6c85a52cb2c47e80f
GitOrigin-RevId: 352d791941bd5dbde210acb4a15ea48f1e22d5c8
…set write block is enabled (#56910)

GitOrigin-RevId: 28b9b9d49e103e8398d269dc6d48f9a8ffddcfc4
GitOrigin-RevId: 869737f764642fc754edbed13162223bcd6de529
…then apply them (#55590)

GitOrigin-RevId: 12591d7d484c9f813c94957d40b21d0ed9674c5a
… (#57147)

GitOrigin-RevId: 4b535aa105d4bc940aa46a6fe0cef01a8869e110
…itative Shards (#57148)

GitOrigin-RevId: 2ee491e210b70b0980018c5f03b1971875088179
…stant folding (#57061)

GitOrigin-RevId: c90792086eca84f2b454a0ce8c742ed6f840778c
Co-authored-by: mongo-pr-bot[bot] <230616009+mongo-pr-bot[bot]@users.noreply.github.com>
GitOrigin-RevId: 6255bff772c9151b92a02e4b5d2cf8cec4897570
…n legacy refresh under authoritative path (#56287)

GitOrigin-RevId: c0ae3147b14ed7a7f3cb3c06df73efad19d5338c
GitOrigin-RevId: 8f4ff3c45980f9f54d6ddb40edea6d96af814af5
…003)

GitOrigin-RevId: 0213d0ba6eb810af4ab51e03288d2a8632fd146a
…s (#50948)

GitOrigin-RevId: 58a67c40bb8bbffd91566b8635b04ab0ee558065
… (#57041)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
GitOrigin-RevId: 28ce04bc6b0af5990f5f02ac99bd22605684bc60
…tions (#57143)

GitOrigin-RevId: a1fea0611593baf8003d6cbd380034912a6e9ab2
…l queues (#56785)

GitOrigin-RevId: 67e3e174dff6da7a2d21245ba5a7d6421d5a83b0
…talog (#57004)

GitOrigin-RevId: d42560565f06f0da6d579023c418e7be6ea5fa95
…ch mongodb-master (#57161)

Co-authored-by: wt-vendoring-bot <wt-vendoring-bot@mongodb.com>
GitOrigin-RevId: c6403c5548ed6c3a3fc7800d110807cc24eca530
…occurs for convoy problem fetching database or collection metadata (#56637)

GitOrigin-RevId: 8356f942b797047801bd31d3d70e2c3eb41fc641
…tes (#57264)

GitOrigin-RevId: b37cbec0b28b2c7e8cd5f8e1e79052422986b02a
…tadata inconsistency (#57002)

GitOrigin-RevId: 68c5569f88c0468acaf4cda4bf270f7345f13d23
…s (#56182)

GitOrigin-RevId: a693ea948394e720caf9b53503aed27238e200e7
…BR (#57226)

GitOrigin-RevId: 6cf2fe2e58b8385afcc65e1a123698a3ec6bb7ea
…57232)

GitOrigin-RevId: a252832cf795953698f63a3c3de164517ff3674c
GitOrigin-RevId: 2abb23b84b1c3867166e08cf0999890258760545
…ng (#57055)

Co-authored-by: mongodb-sage-bot[bot] <247496174+mongodb-sage-bot[bot]@users.noreply.github.com>
GitOrigin-RevId: 6a49975bbe19bdab2d05df0f7b80262efcb98f25
jordiolivares and others added 14 commits July 1, 2026 14:26
GitOrigin-RevId: 890ffbf9720f6fedae0593423991e4613a1ea226
…ication components (#56723)

GitOrigin-RevId: a17e1e35f2f2472b75a2e073eba287938f5f5cfe
…lidation.js (#57253)

GitOrigin-RevId: c83f692ec609ebda1bc04a2a52baec3e89ecf774
…199)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
GitOrigin-RevId: 3f8b8efb0b5d8f1a719a5877a2c4b09afb374765
…0gen/devprod-test-infrastructure (#57093)

GitOrigin-RevId: c6fa397eb467636b13bb09ddb176d8e4cb949052
…ards in the README (#57166)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
GitOrigin-RevId: ff2834674a0ca16abd695bc4111df665dfef5c5a
GitOrigin-RevId: bd6947073717de7d9ebebe626f936dfd08290f07
GitOrigin-RevId: 05652d122659adbf23d831375d380343710f7a49
…ng, and cursor option histograms (#57069)

GitOrigin-RevId: 6290715928d1e0cd10978f74467f1b966f4c6079
Co-authored-by: Prabhas Penumatsa <prabhas.penumatsa@mongodb.com>
GitOrigin-RevId: a070235efad4c4c987d272604f6e28352793dd43
…teFromBson() (#57203)

Co-authored-by: mongodb-sage-bot[bot] <247496174+mongodb-sage-bot[bot]@users.noreply.github.com>
GitOrigin-RevId: 25c9f1250c61f799e0f35848909626fab1acea32
GitOrigin-RevId: 32db4dc7eaba4f09f3977fa2cdddb5f0ed87539d
…085)

GitOrigin-RevId: e1123ff0e2a4eb1fcddd9ab0b0ed6a657a0b2bd0
Note: commit created by mergai
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.