Merge #822: [Core]: fix restart hanging during wallet-repair

37a934c [Core]: fix restart hanging during wallet-repair

Author: crowning-

src/httpserver.cpp

@@ -152,8 +152,9 @@ class WorkQueue
     void WaitExit()
     {
         boost::unique_lock<boost::mutex> lock(cs);
-        while (numThreads > 0)
+        while (numThreads > 0){
             cond.wait(lock);
+        }
     }
 
     /** Return current depth of queue */
@@ -476,7 +477,12 @@ void StopHTTPServer()
     LogPrint("http", "Stopping HTTP server\n");
     if (workQueue) {
         LogPrint("http", "Waiting for HTTP worker threads to exit\n");
+#ifndef WIN32
+        // ToDo: Disabling WaitExit() for Windows platforms is an ugly workaround for the wallet not
+        // closing during a repair-restart. It doesn't hurt, though, because threadHTTP.timed_join
+        // below takes care of this and sends a loopbreak.
         workQueue->WaitExit();
+#endif        
         delete workQueue;
     }
     if (eventBase) {
@@ -492,6 +498,7 @@ void StopHTTPServer()
 #else
         if (!threadHTTP.timed_join(boost::posix_time::milliseconds(2000))) {
 #endif
+
             LogPrintf("HTTP event loop did not exit within allotted time, sending loopbreak\n");
             event_base_loopbreak(eventBase);
             threadHTTP.join();

src/init.cpp

@@ -205,7 +205,6 @@ void PrepareShutdown()
     /// module was initialized.
     RenameThread("dash-shutoff");
     mempool.AddTransactionsUpdated(1);
-
     StopHTTPRPC();
     StopREST();
     StopRPC();
@@ -218,15 +217,13 @@ void PrepareShutdown()
     StopNode();
 
     // STORE DATA CACHES INTO SERIALIZED DAT FILES
-
     CFlatDB<CMasternodeMan> flatdb1("mncache.dat", "magicMasternodeCache");
     flatdb1.Dump(mnodeman);
     CFlatDB<CMasternodePayments> flatdb2("mnpayments.dat", "magicMasternodePaymentsCache");
     flatdb2.Dump(mnpayments);
     CFlatDB<CGovernanceManager> flatdb3("governance.dat", "magicGovernanceCache");
     flatdb3.Dump(governance);
 
-    StopTorControl();
     UnregisterNodeSignals(GetNodeSignals());
 
     if (fFeeEstimatesInitialized)
@@ -298,8 +295,8 @@ void Shutdown()
     if(!fRestartRequested){
         PrepareShutdown();
     }
-
-   // Shutdown part 2: delete wallet instance
+   // Shutdown part 2: Stop TOR thread and delete wallet instance
+    StopTorControl();
 #ifdef ENABLE_WALLET
     delete pwalletMain;
     pwalletMain = NULL;

src/torcontrol.cpp

@@ -687,10 +687,15 @@ void InterruptTorControl()
 
 void StopTorControl()
 {
+    // timed_join() avoids the wallet not closing during a repair-restart. For a 'normal' wallet exit
+    // it behaves for our cases exactly like the normal join()
     if (base) {
-        torControlThread.join();
+#if BOOST_VERSION >= 105000
+        torControlThread.try_join_for(boost::chrono::seconds(1));
+#else
+        torControlThread.timed_join(boost::posix_time::seconds(1));
+#endif
         event_base_free(base);
         base = 0;
     }
 }
-