Repository navigation
fix(stats): wrong inputValue gauge, counter data race, and null-tip crash - #8119
Conversation
|
Warning Review limit reachedYou've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. Next included review available in 1 minute. View limit details
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. |
|
✅ Final review complete — no blockers (commit 419cbb6) · triage: normal · Phase 2 only (queue backlog) |
thepastaclaw
left a comment
There was a problem hiding this comment.
Final validation — Phase 2 only (queue backlog)
The reviewed commit correctly addresses the reported stats issues: it reconstructs input value from outputs plus base fees, reuses cached sigops, makes sender counters atomic, gates disabled-client work, and protects periodic chain-state access against a null tip. Static inspection found no actionable in-scope defects; lint, cppcheck, and formatting checks pass, while source-build jobs remain queued and the milestone policy failure is unrelated to code.
Review provenance
Source: reviewer 1: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 2: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); reviewer 3: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 4: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)
- Triage:
normalbygpt-6.1-sol(effort low) — The change spans metric calculations, atomic counters, chain-state locking, startup null handling, and functional tests, warranting ordinary review without changing a critical surface. - Phase 1 reviewers: not run (skipped for throughput: 15 PRs queued, above the 10 limit)
- Second Phase-2 pass: on this first full review every Phase-2 reviewer also ran a second, independent time, and the verifier weighed both sets
- Fresh verifier:
gpt-6.1-sol— final-verifier; agentsol-verifier - Phase 2 reviewers:
gpt-6.1-sol— general (completed, effort high); agentphase2-reviewer,gpt-6.1-sol— dash-core-commit-history (completed, effort high); agentphase2-reviewer,gpt-6.1-sol— general (completed, effort high); agentphase2-reviewer,gpt-6.1-sol— dash-core-commit-history (completed, effort high); agentphase2-reviewer
|
Approved; simple, contained |
| ::g_stats_client->gauge("utxoset.blockHeight", maybe_stats->nHeight, 1.0f); | ||
| if (maybe_stats->total_amount.has_value()) { | ||
| ::g_stats_client->gauge("utxoset.totalAmount", (double)maybe_stats->total_amount.value() / (double)COIN, 1.0f); | ||
| { |
There was a problem hiding this comment.
why this stats are not gated by if (::g_stats_client->active()) { as other?
…nd null-tip crash 419cbb6 fix(stats): wrong inputValue gauge, counter data race, and null-tip crash (pasta) Pull request description: ## Issue being fixed or feature implemented The `transactions.inputValue` metric subtracts modified fees from outputs, producing an incorrect input total. Immediate stats sends can also race while updating plain counters, and periodic collection can dereference an absent chain tip during startup or reindexing. Transaction and block statistics additionally perform unnecessary work when collection is disabled. ## What was done? Compute input value as outputs plus the actual base fee, reuse the mempool entry's sigop count, and gate transaction and ConnectTip statistics on an active client. Make RawSender success/failure counters atomic and load them explicitly for logging. Guard the periodic collector's tip before flushing or collecting UTXO statistics, and protect its chain-state calculations with `cs_main`. The existing DisconnectTip statistics behavior is unchanged. ## How Has This Been Tested? On macOS arm64, with a debug/werror build and functional-test datadirs on a RAM disk: - Extended the existing `feature_stats.py` connection scenario to reindex with periodic statistics and check an emitted difficulty metric, then spend a known MiniWallet input after fee prioritization and compare the actual UDP inputValue packet with its value. On unchanged develop, the packet is `transactions.inputValue:49999948000|c` instead of `transactions.inputValue:50000000000|c`. - `make -j4`; `src/test/test_dash --run_test=mempool_tests,validation_tests`. - RAM-disk functional runner: `-j1 --timeout-factor=2 feature_stats.py`. - Repository-enabled Python flake8 checks, whitespace lint and `git diff --check`. The Python lint mypy step reports three existing errors in unchanged files with mypy 2.4.1. The null-tip startup condition is not deterministically reproduced; reindex with periodic statistics provides smoke coverage. Counter safety and disabled-client guards were checked by source inspection; no TSAN run was performed. ## Breaking Changes None. The emitted inputValue metric now reflects the actual spent input value. ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone 🤖 Generated with [Claude Code](https://claude.com/claude-code) Top commit has no ACKs. Tree-SHA512: 72e0fff72cee1bb7177184f3ce5cfce86e7a4858d71f5d13122e70584b20e2c1f6b33163a01f037f354be809d040d33ca2fd410a9f81d55ee2714f68c7be360c (cherry picked from commit f9c3e7d)
b534385 chore: prepare v24.0.2 release (pasta) 70e06ae Merge #8117: fix: races in watch-connection seed, partial sig-share batches, and ChainLock shutdown (merge-script) d50ea34 Merge #8115: fix: free pooled secure allocations with their allocated size (merge-script) 824e58a Merge #8113: fix(wallet): schedule CoinJoin auto-denomination per wallet and guard an empty round list (merge-script) 068529f Merge #8112: fix: answer govsync only to the requesting peer and index replayed orphan votes (merge-script) 484ec63 Merge #8119: fix(stats): wrong inputValue gauge, counter data race, and null-tip crash (merge-script) 28d5711 Merge #8120: fix(utils): accept -printcrashinfo in dash-cli and dash-tx (merge-script) 578b914 Merge bitcoin-core/gui#770: Revert "gui: provide wallet controller context to wallet actions" (Konstantin Akimov) d6902fa Merge bitcoin-core/gui#765: Fix wallet list hover crash on shutdown (Konstantin Akimov) Pull request description: ## Issue being fixed or feature implemented Backports and release prep for v24.0.2, on top of `v24.0.x` at 137d999 (v24.0.1). One PR carries both, so the release branch gets a single merge. Two fixes are the reason for the release: - **Memory leak (#8115).** Since v24.0.0 a node's locked-memory use grows for as long as it runs. On `v24.0.x` BLS still uses relic, where a G2 element is 296 bytes; the pooled secure allocator frees such an allocation with one chunk fewer than it allocated. The batch-verification weighting added in v24.0.0 makes one such allocation per verified message, so the pool keeps growing until restart. On develop (blst, 288-byte elements) the same code path does not leak, which is why #8115 describes the bug as latent. - **macOS crash on close (#8073's bitcoin-core/gui#765 and gui#770).** On macOS the menu bar stays usable after the main window is hidden for shutdown. `File > Open Wallet`, `Close Wallet` and the other wallet items then call the wallet controller after it has been deleted. The rest are small fixes that were already merged on develop and are low risk to carry. ## What was done? ### Picked In develop merge order. The Dash PRs are picked from their develop merge commits with `git cherry-pick -m1 -x`; the two GUI backports are picked with `-x` from the commits #8073 merged, like earlier partial picks on this branch. - bitcoin-core/gui#765 Fix wallet list hover crash on shutdown, and bitcoin-core/gui#770, which reverts its first commit (from #8073). Together they leave one change: `appMenuBar->clear()` when shutdown starts. - #8120 fix(utils): accept -printcrashinfo in dash-cli and dash-tx - #8119 fix(stats): wrong inputValue gauge, counter data race, and null-tip crash - #8112 fix: answer govsync only to the requesting peer and index replayed orphan votes - #8113 fix(wallet): schedule CoinJoin auto-denomination per wallet and guard an empty round list - #8115 fix: free pooled secure allocations with their allocated size - #8117 fix: races in watch-connection seed, partial sig-share batches, and ChainLock shutdown Then one commit, `chore: prepare v24.0.2 release`: - `configure.ac`: `_CLIENT_VERSION_BUILD` 1 → 2. - `doc/release-notes.md`: v24.0.2 notes. The v24.0.1 notes are archived verbatim to `doc/release-notes/dash/release-notes-24.0.1.md` and added to "Older releases". - `contrib/flatpak/org.dash.dash-core.metainfo.xml`: `24.0.2` entry dated 2026-11-13. The date needs changing if the tag is cut on another day. - `doc/man/*.1`: version string only. `-printcrashinfo` (#8120) is a hidden option, so no help text changed. ### Adaptations Every pick changes the same lines as its develop counterpart except: - **#8073:** only the two GUI commits are taken. The other two backports in that PR (bitcoin#28629, partial bitcoin#28639) are test and refactor changes for code `v24.0.x` doesn't need. - **#8112:** `test/functional/feature_governance.py` differs on `v24.0.x` (no pruned node from #7860). The `v24.0.x` file is kept and only #8112's additions are applied: the imports it needs, `GovernanceSyncPeer`, `check_govsync_is_peer_local()` and its call. The source change is identical. - **#8113:** one line of the new unit test. `v24.0.x` has the five-argument `CWallet` constructor and `CreateMockWalletDatabase()`, so the second wallet is built the way the fixture in the same file builds the first. The source change is identical. - **#8117:** in `src/llmq/utils.cpp` the neighbouring includes differ; the pick removes `<atomic>` and adds nothing. The source change is otherwise identical. ### Not picked - #8111 (check every BIP39 checksum bit): it can refuse a mnemonic that v24.0.1 accepts, so it should come with a major or minor release and a release note, not a patch release. - #8118 (RPC argument and locking fixes): changes RPC error behaviour and needs a hand-port to `rpc/masternode.cpp`. - #8122 (CacheMultiMap): the use-after-free can't be reached on `v24.0.x`, and the capacity part is hardening with no behaviour change. - #8047 (index startup after an unclean stop): on `v24.0.x` a synced node never records the uncommitted tip it handles, and the governance index it mainly covers doesn't exist here. - #8092 (wording): changes two translatable strings. - #8101, #8102, #8098, #8095 with #8121, #8116 with #7815, #8085: unchanged from the v24.0.1 decision in #8128. - Features, refactors, Bitcoin Core backports, CI and test-only changes merged since the branch point. #8103 (EvoDB left ahead of the coins DB after a reindex) is a candidate that is still open on develop. If it merges before this PR does, its pick will be added here. ## How Has This Been Tested? Linux x86_64, depends build with `--enable-debug --enable-werror`, GUI enabled. Head is b534385. - `dashd`, `dash-qt`, `test_dash` and `test_dash-qt` build cleanly; `dashd -version` reports `v24.0.2`. - `test_dash` (1106 cases), `test_dash-qt` and `test/util/test_runner.py` pass. That includes the picked unit tests: `allocator_tests/mt_pooled_secure_allocator_reuses_all_chunks` (#8115), `coinjoin_tests/coinjoin_maintenance_runs_for_every_wallet` (#8113) and the orphan-vote case in `governance_vote_processing_tests` (#8112). - The full functional suite (`test_runner.py -j14`): 312 passed, 12 skipped, 1 failed. The skipped ones are the usual environment-dependent tests (`feature_bind_port_*`, `rpc_bind.py --ipv6`, `interface_usdt_*`, previous-release compatibility and `feature_unsupported_utxo_db.py`). The run includes the scenarios the picks add or extend: `feature_governance.py` (#8112), `feature_stats.py` (#8119) and `interface_bitcoin_cli.py` (#8120). - The failure was `feature_llmq_is_cl_conflicts.py`, in `mine_cycle_quorum`: the node logs show the block for the final commitments being built about 40 ms before the second quorum's final commitment reached the mining node, so that quorum was not mined. It is a timing race in the test helper under load, in code none of the picks touch (develop reworked those waits in #7892). Run again on its own four times in parallel, it passed all four. - **Leak, end to end.** A regtest script (not part of the tree) mines a single-member InstantSend quorum, sends InstantSend-locked transactions and reads `getmemoryinfo` `locked.used` on each node every 50 locks. - The published v24.0.1 Linux binary: the four non-masternode nodes go from 39,568 bytes to 467,664 bytes over 600 locks, and are still growing at the end. - This branch: the same nodes stay at 20,096 bytes for all 600 locks. - The man pages were regenerated with `contrib/devtools/gen-manpages.py` from this build. They are byte-identical to the committed ones except for the `lock` debug category in `dashd.1` and `dash-qt.1`, which only an `--enable-debug` build lists. - The archived v24.0.1 notes are byte-identical to the previous `doc/release-notes.md`. Not tested: the macOS shutdown crash itself. The GUI change is the upstream one-liner and was built and run through `test_dash-qt` on Linux only. ## Breaking Changes None. No consensus change, and no change to which P2P messages a node accepts or how it scores peers. A node that syncs governance from a v24.0.2 node receives the same inventories as before; other peers of that node no longer receive them. ## Checklist: - [x] I have performed a self-review of my own code - [x] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(if you have permission to set one)_ 🤖 Generated with [Claude Code](https://claude.com/claude-code) Top commit has no ACKs. Tree-SHA512: 6d9861f4a8c2341889bb0ce5dd500a7083ea59395777a21c5e5d01e70ec8e8b489cf6425bc26ca79f15b1919610ceab10baada361043322dc689b7dfcae7cb5d
Issue being fixed or feature implemented
The
transactions.inputValuemetric subtracts modified fees from outputs, producing an incorrect input total. Immediate stats sends can also race while updating plain counters, and periodic collection can dereference an absent chain tip during startup or reindexing. Transaction and block statistics additionally perform unnecessary work when collection is disabled.What was done?
Compute input value as outputs plus the actual base fee, reuse the mempool entry's sigop count, and gate transaction and ConnectTip statistics on an active client. Make RawSender success/failure counters atomic and load them explicitly for logging. Guard the periodic collector's tip before flushing or collecting UTXO statistics, and protect its chain-state calculations with
cs_main.The existing DisconnectTip statistics behavior is unchanged.
How Has This Been Tested?
On macOS arm64, with a debug/werror build and functional-test datadirs on a RAM disk:
feature_stats.pyconnection scenario to reindex with periodic statistics and check an emitted difficulty metric, then spend a known MiniWallet input after fee prioritization and compare the actual UDP inputValue packet with its value. On unchanged develop, the packet istransactions.inputValue:49999948000|cinstead oftransactions.inputValue:50000000000|c.make -j4;src/test/test_dash --run_test=mempool_tests,validation_tests.-j1 --timeout-factor=2 feature_stats.py.git diff --check. The Python lint mypy step reports three existing errors in unchanged files with mypy 2.4.1.The null-tip startup condition is not deterministically reproduced; reindex with periodic statistics provides smoke coverage. Counter safety and disabled-client guards were checked by source inspection; no TSAN run was performed.
Breaking Changes
None. The emitted inputValue metric now reflects the actual spent input value.
Checklist:
🤖 Generated with Claude Code