Merge '59962ffd3df' into 'master'

[psmdb-bot]

Merge Info

• Target Branch: master
• Target Branch SHA: 8bdd75650937f1240aa23fc00a9ca7f95ce17b6c
• Merge Commit: 59962ffd3dfd37f2d5bcac7ebf3b9e196b7703cf

Merge Context

• Number of merged commits: 63
• Auto-merged files: 14

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

• .bazelrc

• MODULE.bazel.lock

• README.third_party.md

• bazel/config/BUILD.bazel

• bazel/resmoke/resmoke.bzl

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

• sbom.json

• src/mongo/db/BUILD.bazel

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

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

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

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

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

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

Merged with strategy: ort

Show details

Commit	Summary
59962ffd3dfd37f2d5bcac7ebf3b9e196b7703cf	Import wiredtiger: 0a51d5301503eb715b53aa12dae721846ef89fb3 from branch mongodb-master (#59021)
ff622631a9f8bbb22c0548202b0739203fbd86fc	SERVER-130700 Cap per-pass span of time-based disagg oplog truncation (#58047)
47881b6e3e09c17c093dbe84e13263fc548062c0	SERVER-130783 Remove feature flag for SPM-4756 (#58566)
4299f64d15be03e2c40a47237d434bb059d7b6bf	SERVER-131432 Accept CollectionUUIDMismatch error from system.sessions during CheckMetadataConsistencyInBackground testing (#58603)
b638b6e8fe246a96dff7721712dc4a44f7ba1d8c	SERVER-131598 Ensure that resharding pipeline states are left consistent after hitting an exception (#58930)
6f1203062f47a0a23ca0ec9a6d5af8d5e640bed4	SERVER-131596 Avoid mongos segfault disposing sharded merge cursor with detached OpCtx (#58875)
2481269cc9acb7393930f37d5abded88b14f1d8c	SERVER-127575 don't count derived predicates in cardinality estimations (#57824)
0ec4a35d62136cf046ca77a88526a86d29e1af67	SERVER-131387 Adapt query tests using moveChunkNotRefreshRecipient (#58851)
9eda0508e2e242c3b153af4a84ba3a6ca8935547	SERVER-131080 Add SBE StreamingAggStage (#57074)
8e3581e49aa99bebd07ed97cb4630efe5b1f3c3c	SERVER-131723: Set memlock ulimit for Antithesis mongo containers (#58969)
310ea4c7f46b027f3b158fe309f0c4145fd7133c	SERVER-131581: Increase heartbeatIntervalMillis in Antithesis fixture config (#58933)
a62edd9cb1ba3f7116fb52532ad3e05795e5ca8d	SERVER-131681 Move opCtx-coupled IFR context code out of server_base (#58951)
fd864f3a9f70cf1b804c2ac7c8294e021d61b6c0	SERVER-131700 Relax mongot fixture teardown (#58971)
bc39b3face3f567c79259d73789cf3c07c22ac7f	SERVER-131711: Reduce resmoke jobs for replica_sets_reconfig_terminate_primary priority_ports on {A,UB}SAN to fix memory-pressure timeout (#58979)
69ce480c43f7e6e120ca79c693aee956c31ea9a2	SERVER-131103 add RHEL10 390x/ppc support (#58856)
590aa79cad29dddccc44c8b34feff4b2d3f5d3cb	SERVER-131638 Fix host metrics test for batched idLookup (#58974)
b19ac578ec8403b42538a7f41b97612898a4d25f	SERVER-131396 Propagate stepdown data to CheckMetadataConsistencyInBackground for MalformedTimeseriesBucketsCollection skip (all suites) (#58842)
ac7eeb58aa41c3d9cf15cc9c4a9e5d9d696eca4f	SERVER-131557 Add Storage Space Used for Query Spilling metric (no implementation) (#58801)
7a8988a9914bbba381209293a3a8233dc9ed5c90	SERVER-130312: Start spans for egress commands (#58927)
adef6f5d87a32f57714b4e9e65793c7d1da3b8af	SERVER-127486 Harden GeometryContainer ops against geo colls with strict polygons (#58436)
e9f67ddd6b530fadb3b9dac9bf1679cbfc438bba	SERVER-130126 Reapply "Implement quiesce mode for DSC" (#57738) (#58871)
509c7028d5db0b725ff6978fab8102415a8af8b8	SERVER-131388 Adapt transaction tests using moveChunkNotRefreshRecipient (#58841)
bd4ad7199b07880ff1287084fc7ecc907713df31	SERVER-126257 Remove the redo mechanism that disabled PDIB resume on tearable side writes (#58836)
1b48c97c9923853d5dc06ced74d903ff04763d7e	SERVER-130444: Switch persistent sample _id to BSON identity (#57823)
aa6797c1d4ac07293a355b78e7ce806dcb58a6aa	SERVER-124340: Use random sampling as default for persistent stats read and write path (#58700)
ef5dcb48743196c2a2b5d00c905ca4529970bea7	SERVER-128638 Cleaning up IndexInfo (#58577)
ab110e93392d95cdb1faf6bd35ade062b4fa968c	SERVER-131409 Apply views in DocumentSourceLookup recursively when rebuilding pipeline (#58739)
3f36242d8cebc070146fa4cd28fd81ce05ef98e1	SERVER-131330: Move document hash (h) under SingleOpSizeMetadata (#58823)
3609f167530f3de3216e357d0f23223bc817c2e0	SERVER-131553 Remove command-only check from gen_dts (#58796)
8d14e838febc4ddc4e327e9c76181c44c0f5df4c	SERVER-131683: Remove conflict marker in metrics_installer.h (#58952)
163c929d229e7063e40af39c138e0b076b1cbe1f	SERVER-131292: add cstring to cspell.json and make that file explicitly unowned (#58433)
204ce9c690fd58fed708764a6365f9a142452836	SERVER-121385: Add test coverage to ensure rejected commands are rejected correctly in dsc (#58578)
e5f837c926e9b2c4b2130080f320eb56ba71cdf5	SERVER-111072 Auto-generated SBOM files [master] (#58618)
4c4a0b729f055e198afece70b640158145dfaea0	SERVER-131563 ExpressionObject local memory bound (#58929)
66563216014dcab8d1cd258f821b66fdc7c929d6	SERVER-130316 Create a feature flag for historical metadata cleanup (#58947)
40e712a1d859e7cf804b1094a09e5c37406f85ea	SERVER-131538 Add internalQueryEnablePersistentNDVStats knob to gate persistent NDV stats (#58953)
ddc7c64b6d9d65ee9eecb7706c3e147f06641b1d	SERVER-128617 Remove moveRawOwnedFromStack (#57366)
deaf4ed528e78f822c4c1e8d8d45adc6709d9bc8	SERVER-131134 Keep extended cursor lifetime for express reads (#58221)
2bc37e940fd004f6a959b234fc2e11943ceae105	SERVER-131386 Adapt sharding tests using moveChunkNotRefreshRecipient (#58876)
4543659ad628ec4957a1dc4f5743445b9139c5d7	SERVER-131628: Revert "SERVER-113969 Allow findAndModify with sort on unsharded timeseries collections (#54863)" (#58866)
a1a4175b1dc3ba82b742d852b165a86aa34e079a	SERVER-131673 Disable featureFlagExtensionsApiSignatureValidation in no_passthrough (#58940)
0e534fd45bf6408e6ad73dec50cfe6dd5c217de9	SERVER-131340: Support "bazel coverage" on resmoke targets (#58701)
eca223376adbf92633f732e5d24002ec748e4303	SERVER-131400: add Promise tracking to asio networking baton (#58686)
7cedc78aab4bf405c13e675590c5c805347974fc	SERVER-130811 Consolidate golden join tests and run on evg (#58629)
d2325f31c409a9e9df54ceaf798edd39441640b3	SERVER-131299 Reduce disabled write-throttler read-path overhead (#58497)
d30d60eb272791e19bb3bae511bf69ae30cfc326	SERVER-130688 Deduplicate maxEstimatedScanBytes rejection metrics for rooted $or subplanning (#58285)
9a5a91c52f8ededa23b160b1240284f78984ba7c	SERVER-131503 Delay tasserts for PostReshardingCollectionPlacement only when it is actually being used (#58862)
0a2992101e4b602f96d53adf902b95d2896ce4d3	SERVER-131664 disable tsan runs for change stream fsm tests (#58921)
29dbdf776db4be217e5cd05675e3b4ebbcbd2f8c	SERVER-131556 Handle EBUSY in accumulateCollectionIndexSize() (#58830)
410e418c027fdf96864f831995c1dfd7370d88f3	SERVER-130894 Introduce knob to control join plan cache size (#58010)
5213eda553abe834c7ec24020ae4087ded28255e	SERVER-131466 Handle query shapes larger than BSONObjMaxUserSize in registering and executing query stats (#58713)
256f0646330d9812170a79b9912626a46929ec2f	SERVER-130746 Introduce passthroughs for QEMP batch 1 IFR testing (#58717)
569ce042a38b6b98cbaf324056993b3314c27c11	SERVER-131382: Reduce instruction count handling traces on ingress (#58520)
e6bb96d7d10a8c4219f509c32f2008586723fe32	SERVER-131304 Cleanup closed tickets in with_mongot_extension.yml (#58869)
dc3d315a92366826702cec74d488f8f4c6fc5fcf	SERVER-120440 Replica set write block readme updates (#58358)
d1bf655bff327b89d8dd780501dcd8b05363c870	SERVER-130820: Assign ownership of agg_configurable_memory_limits.js to QE (#58368)
6bbc74144b92824782eef0d5630f9d97736e6e27	SERVER-131654 Tolerate calling _shardsvrCheckMetadataConsistencyParticipant without secondaryCheckMode (#58910)
59907c1f34efcc4a47863834415a50349c082695	SERVER-131177 Use non-throwing FieldPath validation in addPathsFromIndexKeyPattern (#58372)
a09de5fb270532ba78767879cf4efaf136610d38	SERVER-131464 bump tag in order to fix nighly build runs for list-append (#58861)
4d73d13d16a6140a54a15139a9ef3af1d4b747b9	SERVER-131574 Disable test case in join_costing_invariants.js (#58835)
b8a093a3188f1e3660353ee64fd965c85412dfe2	SERVER-131647 Update TODO for SERVER-131045 (#58912)
e9da4562ce83695da3e50f3be4056208cb160c4c	SERVER-130940 Prevent creation of new temporary collection with the same UUID in renameCollectionAcrossDatabases (#58502)
2a62f06250c4476c7600fce907efb8956a003ff8	SERVER-131608 network errors to resmoke retry allowlist (#58864)

Merge Description

Summary

Upstream merge (base c48b8d1 → merge 59962ff) into the PSMDB master fork branch. The main functional change reworks how WiredTiger statistics errors are classified when computing index/ident storage sizes: getStatisticsValue now routes cursor-open failures through wtRCToStatus() (yielding NoSuchKey/BadValue/ObjectIsBusy instead of the old blanket CursorNotFound), and the KV engine and util callers were updated to treat NoSuchKey as "missing file → 0", ObjectIsBusy as a transient/retryable busy state, and to surface other errors. A new WTIndexStorageSizeReturnBusy failpoint was added to simulate the busy path. Other changes are build/infrastructure: LLVM source-based coverage plumbing in the Bazel resmoke rule, a coverage remote-download tweak in .bazelrc, a new rhel10_ppc64le_gcc_linkstatic config_setting_group, a valgrind.h version relabel (commit SHA → 3.17.0), BUILD.bazel dependency/source list adjustments, a resmoke replica-set heartbeat interval bump, removal of an unused constant, and WiredTiger public-header documentation-comment updates. sbom.json and MODULE.bazel.lock also carry the routine SBOM/lockfile refreshes.

Auto-Merged Files

File Path	Description
.bazelrc	Replaces coverage --remote_download_outputs=all with coverage --remote_download_regex=.*coverage.*\.dat$ (plus an explanatory comment) so that under remote execution only coverage report files are pulled back rather than every instrumented output.
MODULE.bazel.lock	Regenerated bzlmod lockfile: bzlTransitiveDigest values for the bazel_features_deps and setup_mongo_python_toolchains module extensions change from IrYH+a7... to hKYNVSGE.... This file is a merge conflict (both modified) and must be regenerated per the MODULE.bazel.lock conflict hint.
README.third_party.md	Changes the recorded version for the valgrind.h third-party entry from the commit SHA 093bef43d69236287ccc748591c9560a71181b0a to the release label 3.17.0.
bazel/config/BUILD.bazel	Adds a new rhel10_ppc64le_gcc_linkstatic selects.config_setting_group matching linux + ppc64le + gcc + rhel10 + linkstatic_enabled.
bazel/resmoke/resmoke.bzl	Adds C++ (LLVM source-based) coverage support to the resmoke test rule. Loads find_cpp_toolchain/use_cpp_toolchain; in _resmoke_test_impl it sets COVERAGE_GCOV_PATH and LLVM_COV from the resolved cc toolchain, and injects a launcher snippet that, when COVERAGE_DIR is set, exports LLVM_PROFILE_FILE using continuous (%c) per-module (%m) profiling. Adds instrumented_files_info to the returned providers, a _coverage_dso_transition that appends the llvm_coverage_dso feature to server_deps only when collecting coverage, new _cc_toolchain/_lcov_merger/_collect_cc_coverage rule attrs, and declares cpp/coverage fragments plus use_cpp_toolchain(). The cc_toolchain files are added to runfiles via transitive_files. Also drops server_deps_attr from the py_test deps and removes several explanatory comments. (Adjacent Percona/fork lines untouched by this diff.)
buildscripts/resmokelib/testing/fixtures/replicaset.py	Changes the ReplicaSetFixture repl config heartbeatIntervalMillis setting from 1000 to 1800.
sbom.json	Routine SBOM refresh: bumps version and metadata.timestamp, bumps the Endor Labs tool service version (v1.7.1053 → v1.7.1060), and relabels the valgrind component version/bom-ref/purl/dependency refs from the commit SHA to 3.17.0. This file is a merge conflict (both modified) and must be resolved per the sbom.json conflict hint (keep Percona's supplier URL and remove the metadata.tools section).
src/mongo/db/BUILD.bazel	Adds ifr_context_decoration.cpp to the source list of the affected mongo_cc_library target.
src/mongo/db/index_builds/BUILD.bazel	Removes the //src/mongo/db/index_builds/primary_driven:tearable_side_write_redo_state dependency from a mongo_cc_library target.
src/mongo/db/repl/replication_coordinator_impl.cpp	Removes the now-unused anonymous-namespace constant kQuiesceModeShutdownMessage.
src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp	Adds the WTIndexStorageSizeReturnBusy failpoint and reworks the error handling in getIndexStorageSize: the failpoint can inject an ObjectIsBusy status; an ObjectIsBusy status is now returned to the caller for retry; a NoSuchKey status is treated as "no on-disk checkpoint yet" and skipped (continue). The previous CursorNotFound + getMetadata()==NoSuchKey ambiguity check was replaced by this direct status-code handling.
src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp	getStatisticsValue_DoNotUse now builds its error via wtRCToStatus(ret, session, ...) instead of hard-coding ErrorCodes::CursorNotFound when cursor open fails. getIdentSize and getEphemeralIdentSize were updated to treat NoSuchKey (missing file) and ObjectIsBusy (transiently held data handle) as ident-gone → return 0, replacing the previous CursorNotFound check.
src/mongo/db/storage/wiredtiger/wiredtiger_util_test.cpp	Updates expected error codes to match the new mapping: GetStatisticsValueMissingTable now expects NoSuchKey (was CursorNotFound) and GetStatisticsValueStatisticsDisabled now expects BadValue (was CursorNotFound).
src/third_party/wiredtiger/src/include/wiredtiger.h.in	Documentation-comment only changes in the generated WiredTiger public header: expands the overwrite config description to document layered-follower WT_CURSOR::remove tombstone behavior, and adds/clarifies @param and field comments on the WT_PAGE_LOG callbacks and the page-log args structs (complete_checkpoint, get_complete_checkpoint, put/get/discard args, and cache_put/has/del/available).

Review Notes

The provided merge_commit (59962ff) is the incoming upstream tip; its sbom.json still shows MongoDB's supplier URL (https://mongodb.com) and retains the metadata.tools (Endor Labs) section. Both MODULE.bazel.lock and sbom.json are 'both modified' conflicts and require the standard Percona resolution: for sbom.json keep Percona's supplier url (https://percona.com) and remove the metadata.tools section (serialNumber/version are release-time concerns); for MODULE.bazel.lock remove conflict markers and regenerate with bazel query //... >/dev/null last. The substantive change to double-check is the WiredTiger error-code reclassification (CursorNotFound → NoSuchKey/BadValue/ObjectIsBusy) since callers now branch on the new codes — verify no other PSMDB callers of getStatisticsValue/getIdentSize still rely on CursorNotFound. All C++ diffs applied cleanly without conflict markers; verify a build/unit-test run of the wiredtiger storage tests.

Agent Stats

Agent: claude_cli (version 2.1.215 (Claude Code))

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

Conflict Context

• Base Commit: c48b8d1873efa5297e9d4bca894df85a4e1bffa4
• Ours Commit: 8bdd75650937f1240aa23fc00a9ca7f95ce17b6c
• Theirs Commit: 59962ffd3dfd37f2d5bcac7ebf3b9e196b7703cf

Conflicted Files

Path	Conflict Type
MODULE.bazel.lock	both modified
sbom.json	both modified

Conflict details

Their Commits

Path	Commit	Message
MODULE.bazel.lock	69ce480c43f7e6e120ca79c693aee956c31ea9a2	SERVER-131103 add RHEL10 390x/ppc support (#58856)
sbom.json	e5f837c926e9b2c4b2130080f320eb56ba71cdf5	SERVER-111072 Auto-generated SBOM files [master] (#58618)

Solutions

Solution 1

Summary

Resolve conflicts for merge commit '59962ffd3df' into master

By: psmdb-bot[bot] <2942401+psmdb-bot[bot]@users.noreply.github.com>

Resolved Files

• MODULE.bazel.lock

• sbom.json

Unresolved Files

All conflicts have been resolved.

Modified Files

No additional files were modified.

Review Notes

Resolved conflicts in sbom.json and MODULE.bazel.lock. For sbom.json,
kept Percona's serialNumber/version and supplier URL
(https://percona.com) and removed the MongoDB-generated metadata.tools
section per the conflict hints. For MODULE.bazel.lock, removed the
conflict markers by accepting one side and regenerated the file with
'bazel query //...' as instructed.

Resolved:
sbom.json
MODULE.bazel.lock

Note: commit created by mergai

---

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 all sign our Contributor License Agreement before we can accept your contribution.
0 out of 50 committers have signed the CLA.

❌ mike-nugent-mongodb
❌ amnestorov
❌ csirianni
❌ tevoinea-mdb
❌ sroches
❌ allisoneaston
❌ atesteve
❌ Max-Verbinnen
❌ nicola-cab
❌ aligusnet
❌ mongodb-sage-bot[bot]
❌ dhsegel
❌ mattBoros
❌ galon1
❌ bshteinfeld
❌ kyleburgess2025
❌ hgu77
❌ alyacb
❌ dgoffredo
❌ smcclure15
❌ leemaguire
❌ brettnawrocki
❌ evanbergeron
❌ tymos2000
❌ fotiniAlvanaki
❌ mongo-pr-bot[bot]
❌ ruchitharajaghatta
❌ parker-felix
❌ gitpushjoe
❌ elise-yz
❌ finleylau
❌ ayesha-ilm
❌ shinyeet
❌ SidarthK
❌ awang01810
❌ streams1
❌ seristof
❌ joanbm-mongodb
❌ Chunbin-lin
❌ Bradshawz
❌ wbuerger46
❌ kyra-rk
❌ Trevor159
❌ madelinezec
❌ aditya8061
❌ jseyster
❌ jiechenbo
❌ dalessan
❌ psmdb-bot[bot]
❌ wt-vendoring-bot[bot]

---

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 could not be auto-fixed; it needs manual attention.

Bucket (d) — flaky/environmental failure. //src/mongo/otel/traces/span:span_telemetry_context_impl_test crashed with a Segmentation fault during test startup (log shows 'Running 5 tests in 1 suites [ 0 of 1 ]' immediately followed by 'Segmentation fault (core dumped)'), with no assertion mismatch. The test and its entire linked dependency closure are byte-for-byte unchanged by this merge, so no source defect was introduced that I can fix without chasing a flake.

Unresolved:

• src/mongo/otel/traces/span/span_telemetry_context_impl_test.cpp: The test binary segfaulted before any test assertion ran (crash at '0 of 1'), not a logic failure. This test's sources (span_telemetry_context_impl.cpp/.h and the test itself) and all of its BUILD deps (span_telemetry_context -> server_base, otel_base, opentelemetry-cpp/api; plus stdx) are unchanged between the merge base (c48b8d1) and the merge commit (59962ff), and unchanged between the target-branch tip (8bdd756) and HEAD. The merge did modify sibling files span.cpp/span.h/span_names.h/span_test.cpp, but those belong to the separate ':span' library and are NOT linked by span_telemetry_context_impl_test. With no merge-introduced change in the failing target's code path, a startup segfault points to an infrastructure/environmental flake (resource pressure / harness), not a code regression. Editing source or disabling the test to make CI green would be inappropriate per the flake-handling guidance.

Verification steps: (1) git diff --stat <base> <merge> and <ours-tip> HEAD for span_telemetry_context_impl.cpp, .h and _test.cpp — all empty (no changes). (2) Confirmed the failing target's deps are unchanged by the merge: src/mongo/otel/telemetry_context., src/mongo/platform/random., src/mongo/stdx/, and src/third_party/opentelemetry-cpp/ all show empty diff stats across the merge. (3) The merge did touch src/mongo/otel/traces/span/{span.cpp,span.h,span_names.h,span_test.cpp} but per BUILD.bazel these are in the ':span' library/':span_test', not in ':span_telemetry_context'/':span_telemetry_context_impl_test'. (4) Failure signature is a Segmentation fault at test-binary startup (log line: 'test_wrapper.sh: line 79: 1696 Segmentation fault (core dumped)') with no ASSERT/EXPECT diff. Recommendation: re-run the suite; if it reproduces deterministically on a clean re-run, capture the core dump / stack (note the ConcurrentSetSpanAndGetSpan TSAN test spawns threads and is the most load-sensitive of the five) and re-open as a genuine defect. No source was modified.

[igorsol]

/fast-forward

[psmdb-bot]

Fast-forward merge completed successfully.

Merged mergai/master-59962ffd3df/main into master at commit 4ed587d.