Byron Hambly
ce1af8625a
Merge c981771bc3 into merged_master (Bitcoin PR bitcoin/bitcoin#28224 )
2025-11-06 09:46:14 +02:00
Byron Hambly
b843409fbf
Merge 0655e9dd92 into merged_master (Bitcoin PR bitcoin/bitcoin#27071 )
2025-08-07 13:42:28 +02:00
Byron Hambly
d9e1e28421
Merge 04265ba937 into merged_master (Bitcoin PR bitcoin/bitcoin#26331 )
2025-08-06 20:35:14 +02:00
Byron Hambly
e9d955b25a
Merge 38f4b0d9d1 into merged_master (Bitcoin PR bitcoin/bitcoin#28562 )
2025-08-06 15:55:32 +02:00
Byron Hambly
70ba481063
Merge 6f882e6f86 into merged_master (Bitcoin PR bitcoin/bitcoin#28331 )
2025-08-06 15:02:59 +02:00
Byron Hambly
7fc909ab98
Merge e7b0004b37 into merged_master (Bitcoin PR bitcoin/bitcoin#27596 )
...
ELEMENTS TODO assumeutxo for liquidv1
2025-08-06 14:33:15 +02:00
Byron Hambly
61847fc900
Merge 1e9d367d0d into merged_master (Bitcoin PR bitcoin/bitcoin#28423 )
2025-07-21 14:48:23 +02:00
Byron Hambly
4d42d5c175
Merge adc0921ea1 into merged_master (Bitcoin PR bitcoin/bitcoin#28101 )
2025-07-21 11:58:07 +02:00
Byron Hambly
61fd69938d
Merge 578f50fc48 into merged_master (Bitcoin PR bitcoin/bitcoin#28448 )
2025-07-21 10:56:52 +02:00
Byron Hambly
798875ed2d
Merge 579c49b3a6 into merged_master (Bitcoin PR bitcoin/bitcoin#28428 )
2025-07-21 10:11:15 +02:00
Byron Hambly
bd65b886f1
Merge 67cd78dbc2 into merged_master (Elements PR #1451 )
2025-07-10 12:09:50 +02:00
Byron Hambly
2ddc85a420
Merge 209032c107 into merged_master (Elements PR #1461 )
2025-07-10 11:28:00 +02:00
Byron Hambly
bef3aeb383
Merge ecab855838 into merged_master (Bitcoin PR bitcoin/bitcoin#28195 )
2025-07-07 09:45:43 +02:00
Byron Hambly
461e9aa5fb
Merge 5175ae482e into merged_master (Bitcoin PR bitcoin/bitcoin#28354 )
2025-07-05 16:06:42 +02:00
Byron Hambly
810f21f296
Merge 1c1a02bbd2 into merged_master (Bitcoin PR bitcoin/bitcoin#28341 )
2025-07-05 15:44:27 +02:00
Byron Hambly
ff69178c92
Merge 5ce200dda2 into merged_master (Bitcoin PR bitcoin/bitcoin#27480 )
2025-07-05 15:08:27 +02:00
Byron Hambly
5095c672a5
Merge 1fa6411dde into merged_master (Bitcoin PR bitcoin/bitcoin#28165 )
2025-07-05 11:14:50 +02:00
Byron Hambly
6c55760a2d
Merge 7ef2d4ee4d into merged_master (Bitcoin PR bitcoin/bitcoin#28244 )
2025-07-04 17:24:18 +02:00
Byron Hambly
4cc9a6cc6b
Merge cd43a8444b into merged_master (Bitcoin PR bitcoin/bitcoin#27460 )
2025-07-04 09:05:08 +02:00
Byron Hambly
5ee80641fe
Merge b565485c24 into merged_master (Bitcoin PR bitcoin/bitcoin#28186 )
2025-07-03 20:58:01 +02:00
Byron Hambly
81083d47bf
Merge 624333455a into merged_master (Bitcoin PR bitcoin/bitcoin#26296 )
2025-07-03 20:38:42 +02:00
Byron Hambly
fa82d71f38
Merge da3816e4e8 into merged_master (Bitcoin PR bitcoin/bitcoin#27832 )
2025-07-03 15:25:04 +02:00
Byron Hambly
3f7c76218c
Merge 272c4f3f10 into merged_master (Bitcoin PR bitcoin/bitcoin#28148 )
2025-07-03 12:29:13 +02:00
Byron Hambly
aacc36f977
Merge c97270d722 into merged_master (Bitcoin PR bitcoin/bitcoin#27499 )
2025-07-03 09:45:27 +02:00
Byron Hambly
e17c92ebb1
Merge 01e5d6b105 into merged_master (Bitcoin PR bitcoin/bitcoin#28048 )
2025-07-01 13:08:16 +02:00
Byron Hambly
61ecd1fa45
Merge e253568da8 into merged_master (Bitcoin PR bitcoin/bitcoin#28053 )
2025-07-01 11:52:36 +02:00
Byron Hambly
f61ec91393
Merge ef29d5d7e2 into merged_master (Bitcoin PR bitcoin/bitcoin#27607 )
2025-07-01 11:32:01 +02:00
Byron Hambly
a8a9ae2ae1
Merge 75135c673e into merged_master (Bitcoin PR bitcoin/bitcoin#27861 )
2025-07-01 10:39:46 +02:00
Byron Hambly
e999ab6070
Merge caff95a023 into merged_master (Bitcoin PR bitcoin/bitcoin#27896 )
2025-06-28 11:08:01 +02:00
Byron Hambly
15054b1586
Merge 6a473373d4 into merged_master (Bitcoin PR bitcoin/bitcoin#27862 )
2025-06-27 21:53:34 +02:00
Byron Hambly
38c95b75e9
Merge e4bbfb2d49 into merged_master (Bitcoin PR bitcoin/bitcoin#27632 )
2025-06-27 15:10:29 +02:00
Byron Hambly
68031c5f6e
Merge f80db62b2d into merged_master (Bitcoin PR bitcoin/bitcoin#27622 )
2025-06-27 14:54:38 +02:00
Byron Hambly
30814e6064
Merge c92fd63886 into merged_master (Bitcoin PR bitcoin/bitcoin#27708 )
2025-06-27 14:01:27 +02:00
Byron Hambly
758d0321a8
Merge 71300489af into merged_master (Bitcoin PR bitcoin/bitcoin#26261 )
2025-06-25 13:04:33 +02:00
Byron Hambly
edc585d157
Merge 9564f98fee into merged_master (Bitcoin PR bitcoin/bitcoin#27636 )
2025-06-25 11:40:46 +02:00
Byron Hambly
fe4599e9f0
Merge 66b08e7822 into merged_master (Bitcoin PR bitcoin/bitcoin#27302 )
2025-06-24 14:25:07 +02:00
merge-script
8614ff46c9
Merge bitcoin/bitcoin#30435 : init: change shutdown order of load block thread and scheduler
...
5fd4836019 init: change shutdown order of load block thread and scheduler (Martin Zumsande)
Pull request description:
This avoids situations during a reindex, in which the shutdown doesn't finish since `LimitValidationInterfaceQueue()` is called by the load block thread when the scheduler is already stopped, in which case it would block indefinitely. This can lead to intermittent failures in `feature_reindex.py` (#30424 ), which I could locally reproduce with
```diff
diff --git a/src/validation.cpp b/src/validation.cpp
index 74f0e4975c..be1706fdaf 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3446,6 +3446,7 @@ static void LimitValidationInterfaceQueue(ValidationSignals& signals) LOCKS_EXCL
AssertLockNotHeld(cs_main);
if (signals.CallbacksPending() > 10) {
+ std::this_thread::sleep_for(std::chrono::milliseconds(50));
signals.SyncWithValidationInterfaceQueue();
}
}
```
It has also been reported by users running `reindex-chainstate` (#23234 ).
I thought for a bit about potential downsides of changing this order, but couldn't find any.
Fixes #30424
Fixes #23234
ACKs for top commit:
maflcko:
review ACK 5fd4836019
hebasto:
re-ACK 5fd4836019 .
tdb3:
ACK 5fd4836019
BrandonOdiwuor:
Code Review ACK 5fd4836019
Tree-SHA512: 3b8894e99551c5d4392b55eaa718eee05841a7287aeef2978699e1d633d5234399fa2f5a3e71eac1508d97845906bd33e0e63e5351855139e7be04c421359b36
2025-06-24 10:25:22 +01:00
Byron Hambly
86d9d9f1fc
Merge 4d13fe47be into merged_master (Bitcoin PR bitcoin/bitcoin#25977 )
2025-06-23 15:29:05 +02:00
Byron Hambly
73663a4c89
Merge 4e8a7654f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25193 )
2025-06-20 16:01:14 +02:00
Byron Hambly
b1d470027d
Merge c2f2abd0a4 into merged_master (Bitcoin PR bitcoin/bitcoin#27125 )
2025-06-20 10:46:05 +02:00
Byron Hambly
cbd7b123d9
Merge fc06881f13 into merged_master (Bitcoin PR bitcoin/bitcoin#27491 )
2025-06-19 16:08:36 +02:00
Pablo Greco
ea75778bf3
Use 1/0 instead of bool in args help, so it matches real parsing
2025-06-18 09:46:22 -07:00
Byron Hambly
e22e1b9509
Merge ccd4db7d62 into merged_master (Bitcoin PR bitcoin/bitcoin#27570 )
2025-05-16 10:32:57 +02:00
Byron Hambly
5ac82e15a9
Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419 )
2025-05-09 11:47:45 +02:00
Byron Hambly
e23e51f9ef
Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254 )
2025-04-12 12:19:09 +02:00
Thomas Trevethan
ab8e2637b1
Merge b7edd55c22 into merged_master (Bitcoin PR bitcoin/bitcoin#26899 )
2025-04-11 14:48:37 +01:00
Byron Hambly
59a4dcb178
Merge cbfbf46e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25781 )
2025-04-10 09:10:09 +02:00
Byron Hambly
7787be135b
Merge f50fb178c3 into merged_master (Bitcoin PR bitcoin/bitcoin#27235 )
2025-04-10 07:55:55 +02:00
Byron Hambly
28ddb39e46
Merge 40d0b0a524 into merged_master (Bitcoin PR bitcoin/bitcoin#27239 )
2025-04-10 07:04:03 +02:00
Byron Hambly
ff8ae274d7
Merge 99b64eec1b into merged_master (Bitcoin PR bitcoin/bitcoin#27232 )
2025-04-10 06:39:41 +02:00