Allow shutdown during LoadMempool, dump only when necessary

jonasschnelli · furszy · commit e60da988df03 · 2021-01-18T09:36:00.000-03:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -155,6 +155,7 @@ CClientUIInterface uiInterface;  // Declared but not defined in guiinterface.h
 //
 
 volatile bool fRequestShutdown = false;
+std::atomic<bool> fDumpMempoolLater(false);
 
 void StartShutdown()
 {
@@ -245,7 +246,8 @@ void PrepareShutdown()
     DumpBudgets(g_budgetman);
     DumpMasternodePayments();
     UnregisterNodeSignals(GetNodeSignals());
-    DumpMempool();
+    if (fDumpMempoolLater)
+        DumpMempool();
 
     // After everything has been shut down, but before things get flushed, stop the
     // CScheduler/checkqueue threadGroup
@@ -703,6 +705,7 @@ void ThreadImport(std::vector<fs::path> vImportFiles)
     }
 
     LoadMempool();
+    fDumpMempoolLater = !fRequestShutdown;
 }
 
 /** Sanity checks
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4146,6 +4146,8 @@ bool LoadMempool(void)
             } else {
                 ++skipped;
             }
+            if (ShutdownRequested())
+                return false;
         }
         std::map<uint256, CAmount> mapDeltas;
         file >> mapDeltas;

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ CClientUIInterface uiInterface; // Declared but not defined in guiinterface.h`
`155`	`155`	`//`
`156`	`156`
`157`	`157`	`volatile bool fRequestShutdown = false;`
	`158`	`+std::atomic<bool> fDumpMempoolLater(false);`
`158`	`159`
`159`	`160`	`void StartShutdown()`
`160`	`161`	`{`
`@@ -245,7 +246,8 @@ void PrepareShutdown()`
`245`	`246`	`DumpBudgets(g_budgetman);`
`246`	`247`	`DumpMasternodePayments();`
`247`	`248`	`UnregisterNodeSignals(GetNodeSignals());`
`248`		`- DumpMempool();`
	`249`	`+ if (fDumpMempoolLater)`
	`250`	`+ DumpMempool();`
`249`	`251`
`250`	`252`	`// After everything has been shut down, but before things get flushed, stop the`
`251`	`253`	`// CScheduler/checkqueue threadGroup`
`@@ -703,6 +705,7 @@ void ThreadImport(std::vector<fs::path> vImportFiles)`
`703`	`705`	`}`
`704`	`706`
`705`	`707`	`LoadMempool();`
	`708`	`+ fDumpMempoolLater = !fRequestShutdown;`
`706`	`709`	`}`
`707`	`710`
`708`	`711`	`/** Sanity checks`
Original file line number	Diff line number	Diff line change
`@@ -4146,6 +4146,8 @@ bool LoadMempool(void)`
`4146`	`4146`	`} else {`
`4147`	`4147`	`++skipped;`
`4148`	`4148`	`}`
	`4149`	`+ if (ShutdownRequested())`
	`4150`	`+ return false;`
`4149`	`4151`	`}`
`4150`	`4152`	`std::map<uint256, CAmount> mapDeltas;`
`4151`	`4153`	`file >> mapDeltas;`