Resolve semantic conflicts for merge '03913d95ace' into 'master'

[psmdb-bot]

Merge Info

• Target Branch: master
• Target Branch SHA: 53f88a4bc714b63eb1aa478bd799b389aea39878
• Merge Commit: 03913d95ace6873f6cdd9513d984d16ce3453cff

Merge Context

• Number of merged commits: 48
• Auto-merged files: 8

Important Files Modified

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

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

Auto-Merged Files

• buildscripts/resmokelib/core/programs.py

• src/mongo/db/auth/security_file.cpp

• src/mongo/db/curop_test.cpp

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

• src/mongo/db/op_debug.cpp

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

• src/mongo/db/shard_role/shard_catalog/collection_catalog_helper.cpp

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

Merged with strategy: ort

Show details

Commit	Summary
03913d95ace6873f6cdd9513d984d16ce3453cff	Revert "SERVER-124383: Consult persistence provider in primary-driven index build checks (#52532)" (#59137)
fe82f6afeb60d1e5ef4d08389d0d3373b6bd5aca	SERVER-129267: Ensure DDLs bump the current collectionVersion (#58143)
12f316663ed1c50ab1185d29addded4c06701161	SERVER-131811 Intentionally leak OTEL static sync primitives (#59095)
34c7f865648174254f3936d43ba6e9e9b9f5aabb	Revert "SERVER-131370 Acquire critical section of the temporary resharding collection in DDLs (#58633)" (#59108)
f84183e6c1f55aa323e23f4e6c41e9f6eecf2162	SERVER-124383: Consult persistence provider in primary-driven index build checks (#52532)
d30b6b9b1f5bae2d6c35f2e422fcb144b7c179bc	SERVER-131704: rapidyaml_builds: add PEP 503 simple-index regenerator (#58976)
b482f65b801670a874d8b2326043c6cfbf84cfc6	SERVER-131302 Do not throw if reopening an archived bucket returns an exception (#58890)
fff5731508a1acac63fe8c66ece12639cac3c1b1	SERVER-109491 Report LDAPOperationStats correctly in profiler and slow query output (#56491)
c13e26499975c0fd36f6f52693293f030f4784b7	SERVER-131746: Add support for multi-key/value ci oplog entry (#59025)
446357072071db2c52c4f35e486a6eea8a5a4483	SERVER-131592 Skip updating _sizeInfo when the persistence provider uses replicated size and count (#58924)
78bf45c3ec89652169becf4bc883efcdf3ceac8e	SERVER-131450 Disallow V3 explain for rooted $or queries (#58936)
3de4e0e37893de9dbd153ffd8d4156a46f8048f3	SERVER-131833 Use SBE RAII factory methods in sbe values (block_test - ts_block_test) (#57462)
968e13ea92aa65ab88bd5875f8279ea87bb2a8d1	SERVER-130446 Add page number to persistent sample _id (#58635)
dfc37d709b7f0bd8d44ad70316939434d456e6bd	SERVER-131737 Remove stale sharded explain exclusions (#59072)
3a2bd182fac784da4cda4c367edd72339b7bb0bd	SERVER-131808: Add tests for making sure user-provided internal-only fields do not leak (#59068)
f82218cda1e043190aefc1f5a8f9b653dd369648	SERVER-130445: Adding clustered collection support on write path (#58100)
f243c09d22b5ccdd4c3badfd6c630adc78a63149	SERVER-130680 Add otel metrics for otel span rate limiting (#58017)
56d7912e94b86ba7791c80a3070366fdbc8a740d	SERVER-123798 Assign repl team as codeowners for replica set stepdown/kill-primary suites (#58558)
cd9d2cd6a636f351a17062fd7eb640a6ea98e72d	SERVER-131694 Authoritative metadata cloning DDL should clone to shards that only owned chunks historically (#59034)
d8ee8066a329d07e28c2ba98037c7ce1d13548b5	SERVER-128184 Validate IP address in authenticationRestrictions for user/role commands (#56358)
9027e93df18bbe778d45c4fa2ba4a39e2e94057b	SERVER-128000 Remove logs of SASL payload during egress (#55119)
6b29ece426453b58d94b7398fd60e094ff5098fa	SERVER-128001 Remove keyfile failed-to-parse log (#55257)
c237690bb8e94f0c6fd2e0b897df3a76d1fc7e76	SERVER-131804: Improve get_binary_version_output to always resolve paths against the augmented PATH (#59055)
6a9701993e4751b2e8a531ae1a722ede69fc3dd3	SERVER-131661: Move change_stream_metrics_util file to libs directory (#58916)
35066d7040845f44ae530d1296ab40b1864244ab	SERVER-131463: Add bazel targets for cluster-scalability resmoke suites (#58640)
195d1431c225917d9db57d88c80879c5a7625340	SERVER-131549 Don't batch updateLookup events while awaiting inserts (#58784)
4bd1535ad38dd4389a28b92fc062426f9280c361	SERVER-131793: Fix race between step-up skipped records check and secondary collection scan in index_stepup_abort_skipped_records.js (#59054)
c16374b2dbab5c02ae967a23aab6f485cf1769bc	SERVER-131067 Rewrite internal_search_id_lookup_chunk_migration.js without mongotmock (#58988)
f142a2358f076f52bbb3d729f63f12ffb2057210	SERVER-131664 Disable sanitizer runs for DSC fsm change stream tests (#59046)
dceab84ec3b87f352b96d52b43b30a70eeb1669b	SERVER-131789: Exclude end2end burn in test on mongodb-mongo-master-nightly (#59050)
17103c77ca4a874f954edc91987e6c4c02aeb0dc	SERVER-131778: Add requires_persistence tag to persisted_view_on_missing_stage.js (#59045)
65009a0b1b6b0a7630cb37775064b04a0ac69f7f	SERVER-131335 Add serverStatus metrics for pathArrayness non leading filter optimization (#58298)
4b6d9abdb75dc232193f18c70679ae1a200fb021	SERVER-131624: Support multiple --suite args in resmoke test-discovery (#58858)
3400d290530c6d38940d9a69b1d03ce75c15a890	SERVER-131370 Acquire critical section of the temporary resharding collection in DDLs (#58633)
c35c9f5f44bf5aedab055c852d68e3a09fccf311	SERVER-131471: Add comments to exclude streams variants from release branches (#58710)
de59bb98e2718b8963a0ac45967d83c8513c6373	SERVER-131337 Dispatch to extension stage's DocsNeededBounds request via $_internalDRM (#58573)
14b4075ca1aeae22cb912200c400a0e77260374f	SERVER-131068 Restore standalone shard-filtering test coverage (#58977)
3b24929edab9b41543f91253b7887d8d9df983d1	SERVER-131738 Re-enable unionWith_lookup_nested_deep.js in with_mongot_extension suites (#59020)
1f14239571955345dd3deb9208859d1059e5ff31	SERVER-128365 Support join predicate field renames (#57910)
da815a79cd8b37c5d628c2f0884b022fa5583d36	SERVER-131455 Fix HistoricalCatalogIdTracker incorrect results after FCBIS (#58667)
281158640567c3e75cb0abf1962a1a0c21b13667	SERVER-110427 Update profiling data (#59016)
55c106b5f41da165e72bcfcbc9cbc731e2987c17	SERVER-131662 moveChunk may not wait for orphan deletion with _waitForDelete: true (#58914)
86a35f6b55d6c808299fdbd5239e2806335dfddc	SERVER-131667: Allow setting resource metrics from strings (#58925)
eebe422b6a62007d7fd73b7cdc95d41e5dfc80e7	SERVER-130623 use unint64_t to represent the state instead of a struct to avoid padding (#58915)
850bb42a71deeaa9a6b51efcc55da9261025a827	Revert "SERVER-127413 SERVER-127412" (#58216)
4002c003c00682780a61457657ed47df6bcd2685	SERVER-131537 Correct FTDC README inaccuracies (#58791)
f1f40f66d13437540e0c3f4e3eaad0632660dbf7	SERVER-128674 Prevent new IndexTypes from being used as shard key indexes by default (#58485)
b79fd73434bbbe9092de3d48cf96de3962d74d99	SERVER-129873 Support operation_timeout_ms in WTRU (#58757)

Merge Description

Summary

Merge of upstream mongodb-master into the fork. The incoming changes touch a handful of files: op_debug now reports LDAP operation stats as a distinct top-level "LDAPOperations" object (with a matching new unit test in curop_test.cpp), the security key-file parser no longer leaks the key contents in its error message, the resmoke binary-version helper resolves binaries via shutil.which against the augmented PATH, two BUILD.bazel files gain new dependencies, collection catalog initialization now passes an explicit InitMode::kStartup, and the WiredTiger record store now derives tracksSizeAdjustments from provider.shouldUseReplicatedFastCount() instead of always true.

Auto-Merged Files

File Path	Description
buildscripts/resmokelib/core/programs.py	In get_binary_version_output, the Windows-specific logic that appended a ".exe" extension when the binary had none is replaced. It now imports shutil and resolves the binary with shutil.which(binary_path, path=env_vars["PATH"]) or binary_path, so a bare name like mongod is located against the augmented PATH (multiversion and install directories).
src/mongo/db/auth/security_file.cpp	In stripString, the UnsupportedFormat uassert message for an invalid character in the key file no longer appends the offending string contents; it now only names the file ("invalid char in key file " << filename), avoiding leaking key file data in the error.
src/mongo/db/curop_test.cpp	Adds a new test, CurOpTest.AppendReportsUserAcquisitionAndLDAPOperationStatsAsDistinctObjects, which records a user-cache acquisition (kCache) and an LDAP bind (kBind), calls OpDebug::append, and asserts that the resulting BSON contains both a non-empty "authorization" object and a distinct "LDAPOperations" object (with LDAPNumberOfReferrals and bindStats fields).
src/mongo/db/index_builds/BUILD.bazel	Two mongo_cc_library targets add the dependency "//src/mongo/db/query/plan_cache:join_plan_cache" to their deps lists.
src/mongo/db/op_debug.cpp	In OpDebug::append, the LDAP operation stats builder is now constructed as a subobject b.subobjStart("LDAPOperations") rather than a standalone builder. In OpDebug::appendStaged, the LDAP operation stats reporting is split out of the user-cache acquisition callback into its own addIfNeeded("LDAPOperations", ...) stage, making it a separate top-level field.
src/mongo/db/pipeline/BUILD.bazel	A mongo_cc_library target adds the dependency "//src/mongo/db/query:await_data_state" to its deps list.
src/mongo/db/shard_role/shard_catalog/collection_catalog_helper.cpp	Both calls to catalog::initializeCollectionCatalog (in startUpCollectionCatalogDeferred and startUpStorageEngineAndCollectionCatalog) now pass an additional argument catalog::InitMode::kStartup.
src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp	In WiredTigerKVEngine::getRecordStore, the tracksSizeAdjustments field is changed from a hardcoded true to !provider.shouldUseReplicatedFastCount() for both the Oplog::Params and the non-oplog record store params (the oplog params block is also reformatted). Behavior is now conditional on whether replicated fast count is in use.

Review Notes

All listed files auto-merged cleanly (ort strategy); the changes above are upstream-only additions relative to the diff base and do not appear to touch Percona-specific code. The wiredtiger_kv_engine.cpp change depends on a provider.shouldUseReplicatedFastCount() API introduced upstream — verify that symbol resolves in the merged tree. The op_debug.cpp change is a functional change to profiler/log output format (LDAPOperations becomes its own top-level object); confirm no fork tooling parses the old nested layout.

Agent Stats

Agent: claude_cli (version 2.1.218 (Claude Code))

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

Solutions

Solution 1

Summary

Root-cause bucket (a): upstream commit da815a7 (SERVER-131455) changed catalog::initializeCollectionCatalog to require an InitMode argument, dropping the old 2-arg overload. The Percona-specific FCBIS code (initial_syncer_fcb.cpp) still called the removed 2-arg signature, so I adapted the call site to the new API instead of resurrecting the removed overload.

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

Resolved Files

File Path	Resolution
src/mongo/db/repl/initial_sync/initial_syncer_fcb.cpp	Updated the initializeCollectionCatalog call at line 1578 to pass catalog::InitMode::kStorageChange. This path runs after reinitializeStorageEngine switches the storage location (a storage change during File-Copy-Based Initial Sync), which is exactly the scenario the new kStorageChange mode was introduced for in SERVER-131455 to reset the HistoricalCatalogIdTracker.

Unresolved Files

All conflicts have been resolved.

Modified Files

No additional files were modified.

Review Notes

The build only reported initial_syncer_fcb.cpp:1578. I searched the whole tree with initializeCollectionCatalog\( and confirmed every other call site (storage_engine_test.cpp, catalog_control.cpp, collection_catalog_helper.cpp, feature_compatibility_version_test.cpp) already passes an InitMode, so this was the only stale caller. I chose kStorageChange (rather than kRollback/kStartup) because the FCBIS flow here calls reinitializeStorageEngine to swap dbpath to a new location — a storage change — matching the intent of the upstream fix whose title is literally 'Fix HistoricalCatalogIdTracker incorrect results after FCBIS'. Worth a quick confirmation that kStorageChange (which resets the catalogIdTracker) is desired here rather than preserving tracker history.

Agent Stats

Agent: claude_cli (version 2.1.218 (Claude Code))

Model	Input	Output	Cached	Thoughts	Tool	Total
claude-haiku-4-5-20251001	603	18
claude-opus-4-8	26	4306

---

note created with mergai 0.1.dev1+g07faa5a05

[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.}

[psmdb-bot]

The build-and-test check was fixed in commit a8e7d233c834. See the PR description for details.