Commit e9b9566
committed
Merge bitcoin/bitcoin#31046: init: Some small chainstate load improvements
31cc500 init: Return fatal failure on snapshot validation failure (Martin Zumsande)
8f1246e init: Improve chainstate init db error messages (TheCharlatan)
cd09304 init: Remove incorrect comment about shutdown condition (MarcoFalke)
635e9f8 init: Remove misleading log line when user chooses not to retry (TheCharlatan)
720ce88 init: Improve comment describing chainstate load retry behaviour (Martin Zumsande)
baea842 init: Remove unneeded argument for mempool_opts checks (stickies-v)
Pull request description:
These are mostly followups from #30968, making the code, log lines, error messages, and comments more consistent.
The last commit is an attempt at improving the error reporting when loading the chainstate. It aims to more cleanly distinguish between errors arising from a specific database, and errors where the culprit may be less clear.
ACKs for top commit:
achow101:
ACK 31cc500
mzumsande:
Code Review / lightly tested ACK 31cc500
BrandonOdiwuor:
Code Review ACK 31cc500.
stickies-v:
ACK 31cc500
Tree-SHA512: 59fba4845ee45a3d91bf55807ae6b1c81458463b96bf664c8b1badfac503f6b01efd52a915fc399294e68a3f69985362a5a10a3844fa23f7707145ebe9ad349bFile tree
3 files changed
+27
-21
lines changed- src
- node
- test/functional
3 files changed
+27
-21
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1062 | 1062 | | |
1063 | 1063 | | |
1064 | 1064 | | |
1065 | | - | |
1066 | | - | |
1067 | | - | |
| 1065 | + | |
1068 | 1066 | | |
1069 | 1067 | | |
1070 | 1068 | | |
| |||
1173 | 1171 | | |
1174 | 1172 | | |
1175 | 1173 | | |
1176 | | - | |
| 1174 | + | |
1177 | 1175 | | |
1178 | 1176 | | |
1179 | 1177 | | |
| |||
1253 | 1251 | | |
1254 | 1252 | | |
1255 | 1253 | | |
1256 | | - | |
| 1254 | + | |
1257 | 1255 | | |
1258 | 1256 | | |
1259 | 1257 | | |
| |||
1634 | 1632 | | |
1635 | 1633 | | |
1636 | 1634 | | |
1637 | | - | |
| 1635 | + | |
1638 | 1636 | | |
1639 | 1637 | | |
1640 | 1638 | | |
1641 | | - | |
1642 | 1639 | | |
1643 | 1640 | | |
1644 | 1641 | | |
| |||
1658 | 1655 | | |
1659 | 1656 | | |
1660 | 1657 | | |
1661 | | - | |
1662 | 1658 | | |
1663 | 1659 | | |
1664 | 1660 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
50 | 55 | | |
51 | 56 | | |
52 | 57 | | |
| |||
107 | 112 | | |
108 | 113 | | |
109 | 114 | | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
114 | 124 | | |
115 | 125 | | |
116 | 126 | | |
| |||
236 | 246 | | |
237 | 247 | | |
238 | 248 | | |
239 | | - | |
| 249 | + | |
240 | 250 | | |
241 | 251 | | |
242 | 252 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
| 103 | + | |
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | | - | |
| 109 | + | |
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| |||
0 commit comments