From c9782c2dcd0ceb60e923e1aab84a790f9bad342d Mon Sep 17 00:00:00 2001
From: Fabio Di Fabio <fabio.difabio@consensys.net>
Date: Wed, 7 Sep 2022 12:38:27 +0200
Subject: [PATCH] Always shutdown the executor

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
---
 CHANGELOG.md                                                 | 1 +
 .../ethereum/blockcreation/AbstractMiningCoordinator.java    | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9d928f07ad..6083a09b44b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,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/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java
index a54b1e8c109..e6baf7fa103 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java
+++ b/ethereum/blockcreation/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();
     }
   }