Merge #12842: Prevent concurrent savemempool

laanwj · laanwj · commit 2e15fa16cd3b · 2018-10-24T15:20:33.000+02:00
585b47c rpc: Prevent concurrent savemempool (João Barbosa) Pull request description: Follow up of #12172, this change prevents calling `savemempool` RPC concurrently. Tree-SHA512: 4759a7107658a9794f5c6ab7e3e3002276abadd64996010be67a2791914d284db6fe0377c071a8d6a42387bfb0178f219b73aeec077ce5c4fe5c634a30b3e081
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4766,6 +4766,9 @@ bool DumpMempool()
     std::map<uint256, CAmount> mapDeltas;
     std::vector<TxMempoolInfo> vinfo;
 
+    static Mutex dump_mutex;
+    LOCK(dump_mutex);
+
     {
         LOCK(mempool.cs);
         for (const auto &i : mempool.mapDeltas) {

Original file line number	Diff line number	Diff line change
`@@ -4766,6 +4766,9 @@ bool DumpMempool()`
`4766`	`4766`	`std::map<uint256, CAmount> mapDeltas;`
`4767`	`4767`	`std::vector<TxMempoolInfo> vinfo;`
`4768`	`4768`
	`4769`	`+ static Mutex dump_mutex;`
	`4770`	`+ LOCK(dump_mutex);`
	`4771`	`+`
`4769`	`4772`	`{`
`4770`	`4773`	`LOCK(mempool.cs);`
`4771`	`4774`	`for (const auto &i : mempool.mapDeltas) {`