Always shutdown the miner executor on exit (hyperledger#4353)

Signed-off-by: Fabio Di Fabio <[email protected]>
garyschulte · Sep 7, 2022 · 83408a2 · 83408a2
1 parent ef409e3
commit 83408a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Bug Fixes
 - Accept wit/80 from Nethermind [#4279](https://github.com/hyperledger/besu/pull/4279)
+- Properly shutdown the miner executor, to avoid waiting 30 seconds when stopping [#4353](https://github.com/hyperledger/besu/pull/4353)
 
 
 ## 22.7.1

diff --git a/.../src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java b/.../src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java
@@ -95,11 +95,10 @@ public void start() {
   @Override
   public void stop() {
     synchronized (this) {
-      if (state != State.RUNNING) {
-        return;
+      if (state == State.RUNNING) {
+        haltCurrentMiningOperation();
       }
       state = State.STOPPED;
-      haltCurrentMiningOperation();
       executor.shutDown();
     }
   }