qt: Fix shutdown when waitfor* cmds are called from RPC console

hebasto · hebasto · commit 368530de424f · 2020-04-08T17:59:53.000+03:00
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -30,6 +30,7 @@
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
 #include <noui.h>
+#include <rpc/server.h>
 #include <ui_interface.h>
 #include <uint256.h>
 #include <util/system.h>
@@ -311,6 +312,11 @@ void BitcoinApplication::requestShutdown()
     // Request node shutdown, which can interrupt long operations, like
     // rescanning a wallet.
     m_node.startShutdown();
+    // Stop RPC for clean shutdown if waitfor* commands are executed.
+    if (gArgs.GetBoolArg("-server", false)) {
+        InterruptRPC();
+        StopRPC();
+    }
     // Unsetting the client model can cause the current thread to wait for node
     // to complete an operation, like wait for a RPC execution to complete.
     window->setClientModel(nullptr);
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
@@ -15,11 +15,13 @@
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 
+#include <cassert>
 #include <memory> // for unique_ptr
 #include <unordered_map>
 
 static RecursiveMutex cs_rpcWarmup;
 static std::atomic<bool> g_rpc_running{false};
+static std::atomic<bool> g_rpc_stopped{true};
 static bool fRPCInWarmup GUARDED_BY(cs_rpcWarmup) = true;
 static std::string rpcWarmupStatus GUARDED_BY(cs_rpcWarmup) = "RPC server started";
 /* Timer-creating functions */
@@ -285,21 +287,28 @@ void StartRPC()
 {
     LogPrint(BCLog::RPC, "Starting RPC\n");
     g_rpc_running = true;
+    g_rpc_stopped = false;
     g_rpcSignals.Started();
 }
 
 void InterruptRPC()
 {
+    // This function could be called twice if the GUI has been started with -server=1.
+    if (!g_rpc_running) return;
     LogPrint(BCLog::RPC, "Interrupting RPC\n");
     // Interrupt e.g. running longpolls
     g_rpc_running = false;
 }
 
 void StopRPC()
 {
+    // This function could be called twice if the GUI has been started with -server=1.
+    assert(!g_rpc_running);
+    if (g_rpc_stopped) return;
     LogPrint(BCLog::RPC, "Stopping RPC\n");
     deadlineTimers.clear();
     DeleteAuthCookie();
+    g_rpc_stopped = true;
     g_rpcSignals.Stopped();
 }
 
