sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #6465: fix: avoid potential divide-by-zero in network hashrate stats calculation

Browse Source 
40070c0337 stats: don't report `network.*hashesPerSecond` if it's zero (Kittywhiskers Van Gogh)
b39c6b9909 fix: avoid potential divide-by-zero in H/s stats calculation (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  It was reported that on occasion, `network.*hashesPerSecond` would report NaN gauge values, which would be dismissed as malformed reporting by Grafana (see below). Those gauges use a simplified version ([source](1ecfb891bc/src/init.cpp (L851-L864))) of `GetNetworkHashPS` ([source](1ecfb891bc/src/rpc/mining.cpp (L61))), crucially, without a check meant to avoid divide-by-zeros ([source](1ecfb891bc/src/rpc/mining.cpp (L89-L91))).

  <details>

  <summary>Error log (courtesy of PastaPastaPasta):</summary>

  ```
  [...]
  graphite-1             | 7 Dec 21:18:05 - DEBUG: Bad line: -nan,g in msg "network.terahashesPerSecond:-nan|g"
  graphite-1             | 7 Dec 21:18:05 - DEBUG: Bad line: -nan,g in msg "network.petahashesPerSecond:-nan|g"
  graphite-1             | 7 Dec 21:18:05 - DEBUG: Bad line: -nan,g in msg "network.exahashesPerSecond:-nan|g"
  graphite-1             | 7 Dec 21:18:10 - DEBUG: Bad line: -nan,g in msg "network.hashesPerSecond:-nan|g"
  graphite-1             | 7 Dec 21:18:10 - DEBUG: Bad line: -nan,g in msg "network.terahashesPerSecond:-nan|g"
  graphite-1             | 7 Dec 21:18:10 - DEBUG: Bad line: -nan,g in msg "network.petahashesPerSecond:-nan|g"
  graphite-1             | 7 Dec 21:18:10 - DEBUG: Bad line: -nan,g in msg "network.exahashesPerSecond:-nan|g"
  graphite-1             | 7 Dec 21:18:15 - DEBUG: Bad line: -nan,g in msg "network.hashesPerSecond:-nan|g"
  [...]
  ```

  </details>

  This has been resolved by adding that check, alongside encapsulating the logic in a lambda and not reporting the gauge values if the estimated hashes per second reported is zero, due to the unlikelihood of it being correct.

  ## Breaking Changes

  None expected.

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)**
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 40070c0337
  knst:
    utACK 40070c0337

Tree-SHA512: 64bcca0f51a8bebb090613d3495ddba481ea6464f9f4a6791d830593fd1401c890eba65869f8719c6c6033a3346af11f16855a95fec5f42722b26a12b9f8b3c9
This commit is contained in:
pasta 2024-12-09 14:44:57 -06:00
commit c5889443ed
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/init.cpp
View File

@ -848,25 +848,30 @@ static void PeriodicStats(NodeContext& node)
LogPrintf("%s: GetUTXOStats failed\n", __func__); LogPrintf("%s: GetUTXOStats failed\n", __func__);
} }
// short version of GetNetworkHashPS(120, -1);
CBlockIndex *tip = chainman.ActiveChain().Tip(); CBlockIndex *tip = chainman.ActiveChain().Tip();
CBlockIndex *pindex = tip; double nNetworkHashPS = [&]() {
int64_t minTime = pindex->GetBlockTime(); // Short version of GetNetworkHashPS(120, -1);
int64_t maxTime = minTime; CBlockIndex *pindex = tip;
for (int i = 0; i < 120 && pindex->pprev != nullptr; i++) { int64_t minTime = pindex->GetBlockTime();
pindex = pindex->pprev; int64_t maxTime = minTime;
int64_t time = pindex->GetBlockTime(); for (int i = 0; i < 120 && pindex->pprev != nullptr; i++) {
minTime = std::min(time, minTime); pindex = pindex->pprev;
maxTime = std::max(time, maxTime); int64_t time = pindex->GetBlockTime();
} minTime = std::min(time, minTime);
arith_uint256 workDiff = tip->nChainWork - pindex->nChainWork; maxTime = std::max(time, maxTime);
int64_t timeDiff = maxTime - minTime; }
double nNetworkHashPS = workDiff.getdouble() / timeDiff; if (minTime == maxTime) return 0.0;
arith_uint256 workDiff = tip->nChainWork - pindex->nChainWork;
int64_t timeDiff = maxTime - minTime;
return workDiff.getdouble() / timeDiff;
}();
::g_stats_client->gaugeDouble("network.hashesPerSecond", nNetworkHashPS); if (nNetworkHashPS > 0.0) {
::g_stats_client->gaugeDouble("network.terahashesPerSecond", nNetworkHashPS / 1e12); ::g_stats_client->gaugeDouble("network.hashesPerSecond", nNetworkHashPS);
::g_stats_client->gaugeDouble("network.petahashesPerSecond", nNetworkHashPS / 1e15); ::g_stats_client->gaugeDouble("network.terahashesPerSecond", nNetworkHashPS / 1e12);
::g_stats_client->gaugeDouble("network.exahashesPerSecond", nNetworkHashPS / 1e18); ::g_stats_client->gaugeDouble("network.petahashesPerSecond", nNetworkHashPS / 1e15);
::g_stats_client->gaugeDouble("network.exahashesPerSecond", nNetworkHashPS / 1e18);
}
// No need for cs_main, we never use null tip here // No need for cs_main, we never use null tip here
::g_stats_client->gaugeDouble("network.difficulty", (double)GetDifficulty(tip)); ::g_stats_client->gaugeDouble("network.difficulty", (double)GetDifficulty(tip));