Resolve conflicts for merge 'ff39f35e4cb' into 'master'

[psmdb-bot]

Merge Info

• Target Branch: master
• Target Branch SHA: e7eab3c1b195fad5cd1be2f519836be10530d34d
• Merge Commit: ff39f35e4cba1f65d72c42102cc4ddca8a8a2429

Merge Context

• Number of merged commits: 59
• Auto-merged files: 17

Important Files Modified

• src/mongo/db/storage/storage_engine.h

• src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp

Auto-Merged Files

• BUILD.bazel

• bazel/resmoke/resmoke.bzl

• buildscripts/resmokelib/testing/fixtures/replicaset.py

• buildscripts/resmokelib/testing/fixtures/shardedcluster.py

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

• src/mongo/base/error_codes.yml

• src/mongo/db/BUILD.bazel

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

• src/mongo/db/repl/replication_coordinator_impl.cpp

• src/mongo/db/storage/kv/kv_engine.h

• src/mongo/db/storage/storage_engine.h

• src/mongo/db/storage/storage_engine_impl.cpp

• src/mongo/db/storage/storage_engine_impl.h

• src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp

• src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h

• src/mongo/rpc/BUILD.bazel

• src/mongo/shell/servers.js

Merged with strategy: ort

Show details

Commit	Summary
ff39f35e4cba1f65d72c42102cc4ddca8a8a2429	Import wiredtiger: 38c058b832db0ae9e6ed50ae8068bbf17e0518d1 from branch mongodb-master (#58639)
d2147646ae0c99821ff1d0f2b6b9ba4e773ffc27	SERVER-131428 Fix DeadlineMonitor hang when first task has an infinite deadline (#58598)
b66c157229cd7e420f78daddd2caa410afb1226d	SERVER-131511: Remove source graph (#58734)
dbd4712b28c9f7ec355054992c0aae1a3afde091	SERVER-131419 Validate FTDC BSON in testing/debug environments (#58683)
6f088e98b9d159dc58f40c0aff2ab9cd66878552	SERVER-131368 Replace with_mongot_extension suites with with_mongot_extension_vectorSearch_disabled (#58511)
5c9d8d2019d43e11c6f077b23eb2065cf4b9c897	SERVER-130643 Support oplog application of batched container writes (#58546)
eeb4553f8ab7609a1b7b441c5bf6055fadd5c5a6	SERVER-123418 Limit pool-flush suppression in finishRefresh to confirmed rate-limiter signals (#58382)
785ccb1510f55cc2e50f7176f8408e623c7cd98b	SERVER-131281 Migrate search sequence token mocked tests to e2e suites (#58418)
d8c8fc5b24696f8f96f606b71de74dfc08c0422a	SERVER-131283 Fix range_deleter_does_not_block_stepdown_with_prepare_conflict.js to wait after classification scan (#58441)
b896d14d79fb4bb1946dba35edce8348d16bf4d1	SERVER-131391: Do not check FCV when attaching telemetry context on egress messages (#58544)
9f7c2ac308c70f2b50aebe56f4b876a27cc1e6a5	SERVER-131305 Reset reply builder on IFR flag retry to prevent partial reply leakage across IFR retries (#58457)
374cd3b4701a11c40ede0aae691a1158cb85d323	SERVER-131077 Guard MaxKey orphans correctly from range-deletion tasks that lack key pattern field (#58580)
d4f8d01522a7c50609ccd7f78f66068a0b0443e7	SERVER-131380 Prevent resharding from starting during an FCV transition (#58561)
9d490ec622ea4ecd8dfec15caca16516cfa7ea00	SERVER-129432: Add not-null check before dereferencing (#58551)
9f2512e2259ee589f26bd7e9cfe4841f725d5bcc	SERVER-131280: Add bazel targets for security resmoke suites (#58408)
77275ca8caa928c4be7ac2691da66348e161cae4	SERVER-130571: Limit use of $_internalIndexKey to internal clients only (#58406)
5b682a9aa955da61c42b43cb542104daa210ad47	SERVER-131385 Add helpers for causing StaleConfig errors (#58575)
ad84999c41b73a7a548bdc30ac3772cc4d463525	SERVER-130128 Add more test exercising deferred xferMods behavior in chunk migration (#58210)
44c12a41a405543d7d5b8866121e52065060c009	SERVER-131294 Pass ARS strong reference to callbacks (#58600)
25fc9cefb744282e81149db37ad1232452b352c2	SERVER-131271 Re-dispatch $searchBeta as $search (#58630)
07c8efabdc59eecd161ac640190a6bc14a12cf23	SERVER-131351 Add new core passthrough suite for explain V3 format (#58548)
da3160f3bfbbde35f477a352b87b1dad994ad06d	SERVER-131468 Increase reshardingDocumentValidationMaxCollectionSizeBytes to 100GB (#58657)
89e9186def6156a0d23258d6971bc865e3cff5d2	SERVER-122777 Disable $bit* expressions in SBE by default and add knob to limit their memory use (#58171)
072f406de1f12065bfbfd8cabe471903c53ac1b1	SERVER-131433: Set heartbeatIntervalMillis below electionTimeoutMillis in Antithesis fixture config (#58601)
974c60524105b958aca048d8566a83fc5eed8d37	SERVER-131042 Enable metadata consistency check in setfcv_aborts_reshard_collection.js (#58294)
21a2b376462e373c901442fba0b2b589603e0b44	Revert "SERVER-124340: Use random sampling as default for persistent stats read and write path (#56834)" (#58637)
7a60cf6fd404789bc73c6c92023d397f70cb4a31	SERVER-129443 Revert incorrect vector::reserve() in planner_ixselect.cpp (#58339)
600c1fcdb1057a38bdcab65b3fbb2b7603f33f90	Revert "SERVER-131287 Migrate unionWith/lookup mocked tests to e2e suites (#58448)" (#58656)
3721d5af6cd81c38badc165948bb05a4640a3a88	SERVER-131142 Fill in storage engine API to demote to follower (#58518)
229aac1f42a3a11a5143cc5ac618b1ea32745662	SERVER-126908 Secondary reports last installed checkpoint timestamp in heartbeat response (#58451)
c7df126da49462080c9fe834de1b34f1ac4f34d6	SERVER-131221: Add bazel targets for index-builds resmoke suites (#58381)
c5adfaa1036e951a9cc42fdba40c790230b55b8f	SERVER-130864 Code should not assume that kLastLTS != kLastContinuous (#57982)
1539c7c78ac56300b4fc801ce4d45c9a8efec717	SERVER-131339: Use custom py_binary for resmoke (#58579)
f58a4ed1b5b458cacaf6516eba383ae697eb288b	SERVER-120978 Always advance lastOp before waiting for majority in setFCV (#58469)
54a9af36c40c85d885d0be61119cef6d5e29a770	SERVER-127981 getShardIdsForRange [MinKey, MaxKey] fast path missing early return, re-scans all chunks (#57785)
2d17f7ca10fde04fccef404ecc5cddd6902c6d53	SERVER-131436 CMC on secondaries: read at a consistent timestamp when comparing catalogs (#58619)
a93bbd5dea5081ecfb3a8d60911379deb4133788	SERVER-130240 Add IFR wire install metrics (#58283)
0ad618d254678c676d50a61553fc3e0579ebcfdb	SERVER-131327 checkMetadataConsistency may return MissingShardKeyIndex false positive when migrating the first chunk to a shard (#58521)
c89e545ad2d4163f482bfc3149e5923b29b52de0	SERVER-121084 Handle empty string meta fields in $match optimizations for timeseries (#58491)
09a085bbe281d9c508b0ebc2f7e2ad3b059c1dfe	SERVER-131259 Install query settings command hooks in crud_bm fixture (#58394)
9877a9efb1416516abcbb85e1bf6a23da7d38ad6	SERVER-130878 Add with_mongot_extension_search_disabled suites (#58260)
1b339c31efff9366dee4e575c9175fd20ea38232	SERVER-131396 Propagate stepdown data to CheckMetadataConsistencyInBackground for MalformedTimeseriesBucketsCollection skip (#58559)
513dfe2def37018dc402b9210332ffbb0b7760df	SERVER-131174 Skip query knob PBTs on checkMetadataConsistency (#58627)
66c18a58dfeb37ba4274d2088c3337de84135e3d	SERVER-131454: Remove the retry on bazel test when running resmoke tests (#58569)
1c3e8ef6c7095291aae974e0f4c15c6a064c50f2	SERVER-125631 Remove multiversion check in failcommand_failpoint.js test for failCommandsExcept once v8.0/8.3 backports done (#58468)
df335d6ad29fe87f0666a82e4e6427b4a7a491a1	SERVER-131399 Advance optime on nodes before waiting for it (#58474)
5bd7a092d9acab7f84b836276810ae841e1881f8	SERVER-110427 Update profiling data (#58604)
b162f6f44a77040026db3b97852ae6870bc6e534	SERVER-131336 Add src/mongo/db/topology/README_sharded_cluster_topology.md (#58522)
73967662a594b55bcd7aaa5c3eb05166e3ff9eef	SERVER-131441 Fix DDL fuzzer compilation (#58624)
309f64e2f7a3632dc48f9a48a72233463e13d788	SERVER-131260 Delete QueryLifespan copy operations (#58395)
aefec410944dda902e988f0f3ed061b72617e662	SERVER-125921 Ensure collMod abort always resumes migrations and releases critical sections (#58080)
89e3f5599c838bedb178565af4f86cca982f0893	SERVER-131247 Relax error message matching in shard identity test (#58398)
3254e3bcef5ce46d6749e63a8abbf5f9aa75c894	SERVER-123943: Use RAII guard for isRawDataOperation temporary overrides (#58341)
d93080d2fcf99387a8b77573b5f7a8e7df18b83c	SERVER-131319 Retry auto-compact operation replica set write block testing and exclude this testing from multiversion suites (#58486)
c01ca9ab285b9e4431038e9e86bc8a3267166294	SERVER-130900 Route $_internalSearchIdLookup through the SBE single-document lookup executor (#58107)
d27e6cb851981c724c346280b6d03e87bbe11e2b	SERVER-131329 Tag query_settings_knob_validation_pbt.js as config_shard_incompatible (#58484)
dac597a4a78a98fa249385f6844015c338b761e9	SERVER-130974 Handle move semantics in ScopedReadConcern (#58099)
4c35d2863af1cb66af777e7eeaf6ef5a4e081ad1	SERVER-131287 Migrate unionWith/lookup mocked tests to e2e suites (#58448)
309027d9364bc003842115f6d84aa6324460c812	SERVER-130103: Remove SecurityToken support from op_msg.h/cpp (#57040)

Merge Description

Summary

Upstream merge of MongoDB changes into the PSMDB master branch. The most substantial change reworks the Bazel resmoke test rule to run the resmoke shim as a py_binary wrapped by a new private _resmoke_test rule instead of a plain py_test. The storage engine 'demote' API is renamed from demoteFromLeader() to demoteToFollower() across the KVEngine/StorageEngine hierarchy and given a real WiredTiger implementation, and the replication heartbeat handler gains an OperationContext parameter. Additional smaller changes include two new network error codes, test fixture/option tweaks, and several BUILD.bazel dependency adjustments. The only merge conflict, in bazel/resmoke/resmoke.bzl, was resolved by taking upstream's enterprise test-data dependency list.

Auto-Merged Files

File Path	Description
BUILD.bazel	Removes the 'scip-clang' and 'scip-src' sh_binary targets (each was a run_under_working_dir.sh wrapper around @scip-clang//file / @scip-src//file).
bazel/resmoke/resmoke.bzl	This was the one conflicting file (both modified); the conflict was resolved cleanly with no markers remaining. Changes: the resmoke suite target is no longer a py_test — the load switches from py_test to py_binary, and resmoke_suite_test now emits a py_binary named '_bin' (tagged manual) which is wrapped by a new private _resmoke_test rule (with _resmoke_test_impl) that reimplements py_test behavior (expanding $(location)->$(rootpath), make-variables, args/env, code-coverage hooks) around the resmoke binary. The old DEPS_PATH env computation (deps_path / the installed_dist_test/skip_deps_for_cquery select) is removed. Test data deps gain '//jstests/auth:all_javascript_files' and the enterprise audit entries '//src/mongo/db/modules/enterprise/jstests/audit/lib:all_javascript_files' and ':localKey' (the latter two being the content of the resolved conflict, taken from upstream).
buildscripts/resmokelib/testing/fixtures/replicaset.py	In the Antithesis (NOOP_MONGO_D_S_PROCESSES) branch, adds repl_config['settings']['heartbeatIntervalMillis'] = 1000 so that heartbeatIntervalMillis stays strictly below the electionTimeoutMillis of 2000.
buildscripts/resmokelib/testing/fixtures/shardedcluster.py	Drops the setdefault for the 'reshardingDocumentValidationMaxCollectionSizeBytes' (1GiB) mongod parameter, leaving only the 'reshardingDocumentVerification' = True default; the accompanying comment is updated to match.
jstests/core/catalog/views/views_all_commands.js	Adds the 'uses_explain' tag to the test's @tags list.
src/mongo/base/error_codes.yml	Adds two new error codes: 515 ConnectionClosedByPeer and 516 ConnectionEstablishmentTimeout, both categorized as NetworkError and RetriableError. Also removes a stray blank line near WriteConflictRetryLimitExceeded.
src/mongo/db/BUILD.bazel	Adds '//src/mongo/db/query/query_settings:query_settings_command_hooks' to the deps of a mongo_cc_benchmark target.
src/mongo/db/pipeline/BUILD.bazel	Replaces the dependency on '//src/mongo/db/exec/single_doc_lookup:express_single_document_lookup_executor' with ':sbe_single_document_lookup_executor' in a library target, and adds the sbe_single_document_lookup_executor dep to a mongo_cc_unit_test target.
src/mongo/db/repl/replication_coordinator_impl.cpp	ReplicationCoordinatorImpl::processHeartbeatV1 gains a leading 'OperationContext* opCtx' parameter.
src/mongo/db/storage/kv/kv_engine.h	Expands the promoteToLeader() doc comment to note it invariants on failure and is not idempotent, and adds a new virtual demoteToFollower() method (default empty) documented as the inverse of promoteToLeader().
src/mongo/db/storage/storage_engine.h	Renames the pure-virtual demoteFromLeader() to demoteToFollower() and updates the doc comments (now stating the calls invariant on failure and are not idempotent, replacing the previous 'must be safe to call even if not a leader' wording).
src/mongo/db/storage/storage_engine_impl.cpp	Renames StorageEngineImpl::demoteFromLeader() to demoteToFollower(); instead of being a no-op it now delegates to _engine->demoteToFollower().
src/mongo/db/storage/storage_engine_impl.h	Renames the override demoteFromLeader() to demoteToFollower().
src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp	Two changes: in WiredTigerKVEngineBase::getFromIdent the std::memcpy is now guarded by 'if (v.size() > 0)' to avoid undefined behavior when memcpy'ing from a null/zero-length value; and a new WiredTigerKVEngine::demoteToFollower() is added that reconfigures the connection with 'disaggregated=(role="follower")'.
src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h	Declares the new 'void demoteToFollower() final;' override alongside promoteToLeader().
src/mongo/rpc/BUILD.bazel	Removes '//src/mongo/rpc/metadata:security_token_metadata_test.cpp' from the srcs of a mongo_cc_unit_test target.
src/mongo/shell/servers.js	Removes the _removeSetParameterIfBeforeVersion call for 'reshardingDocumentValidationMaxCollectionSizeBytes' (9.0.0), consistent with dropping that set parameter.

Review Notes

Only bazel/resmoke/resmoke.bzl had a real conflict (both modified); it is resolved with all conflict markers removed and upstream's enterprise audit test-data dependencies (audit/lib:all_javascript_files and audit/lib:localKey) accepted. The demoteFromLeader -> demoteToFollower rename is an API change spanning storage_engine.h, storage_engine_impl.{h,cpp}, kv_engine.h and the WiredTiger engine — reviewers should confirm no remaining callers reference the old demoteFromLeader name. Likewise processHeartbeatV1 gained an OperationContext* parameter, so verify all call sites/overrides were updated (only the signature line appears in this file's diff). No PSMDB-specific customizations were removed by this merge.

Agent Stats

Agent: claude_cli (version 2.1.211 (Claude Code))

Model	Input	Output	Cached	Thoughts	Tool	Total
claude-haiku-4-5-20251001	603	14
claude-opus-4-8	10	5074

Conflict Context

• Base Commit: b608b7554ca0d5b8b136682998b46edc0a743cb1
• Ours Commit: e7eab3c1b195fad5cd1be2f519836be10530d34d
• Theirs Commit: ff39f35e4cba1f65d72c42102cc4ddca8a8a2429

Conflicted Files

Path	Conflict Type
bazel/resmoke/resmoke.bzl	both modified

Conflict details

Their Commits

Path	Commit	Message
bazel/resmoke/resmoke.bzl	9f2512e2259ee589f26bd7e9cfe4841f725d5bcc	SERVER-131280: Add bazel targets for security resmoke suites (#58408)
bazel/resmoke/resmoke.bzl	1539c7c78ac56300b4fc801ce4d45c9a8efec717	SERVER-131339: Use custom py_binary for resmoke (#58579)

Solutions

Solution 1

Summary

Resolved the merge conflict in bazel/resmoke/resmoke.bzl by keeping Percona's removal of the MongoDB enterprise module jstests data dependencies. Percona (HEAD) deliberately removed all //src/mongo/db/modules/enterprise/jstests/... entries because PSMDB does not ship MongoDB's enterprise module. Upstream (theirs) only added new audit/lib entries to that same enterprise list, which are irrelevant to PSMDB, so they were dropped along with the rest.

By: Agent (claude_cli v2.1.211 (Claude Code))

Resolved Files

File Path

Resolution

bazel/resmoke/resmoke.bzl

In the resmoke_suite_test data dependency list, HEAD removed the whole block of enterprise module jstests references (encryptdb, external_auth, hot_backups, live_restore) since PSMDB has no enterprise module. Upstream added additional audit/lib entries to that block. Kept Percona's resolution: removed all enterprise entries, leaving the surrounding entries (search_mocked/ssl and schemastore.org) intact and contiguous. All conflict markers removed.

Unresolved Files

All conflicts have been resolved.

Modified Files

No additional files were modified.

Review Notes

The conflict was solely about the MongoDB enterprise module jstests data deps. Percona intentionally omits these because the enterprise module is not part of PSMDB, so the upstream-added audit/lib entries were also dropped. No functional PSMDB code is affected.

Agent Stats

Agent: claude_cli (version 2.1.211 (Claude Code))

Model	Input	Output	Cached	Thoughts	Tool	Total
claude-haiku-4-5-20251001	603	16
claude-opus-4-8	8	2347

---

note created with mergai 0.1.dev1+gaa14b121b

[it-percona-cla]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

---

psmdb-bot[bot] seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}