highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-09 09:51:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#24168: Fix some race conditions in BanMan::DumpBanlist()

Browse Source 
99a6b699cd Fix race condition for SetBannedSetDirty() calls (Hennadii Stepanov)
83c7646715 Avoid calling BanMan::SweepBanned() twice in a row (Hennadii Stepanov)
33bda6ab87 Fix data race condition in BanMan::DumpBanlist() (Hennadii Stepanov)
5e20e9ec38 Prevent possible concurrent CBanDB::Write() calls (Hennadii Stepanov)

Pull request description:

  This PR split from bitcoin/bitcoin#24097 with some additions. This makes the following switch from `RecursiveMutex` to `Mutex` a pure refactoring.

  See details in commit messages.

ACKs for top commit:
  w0xlt:
    reACK 99a6b69
  shaavan:
    ACK 99a6b699cd

Tree-SHA512: da4e7268c7bd3424491f446145f18af4ccfc804023d0a7fe70e1462baab550a5e44f9159f8b9f9c7820d2c6cb6447b63883616199e4d9d439ab9ab1b67c7201b
This commit is contained in:
MarcoFalke
2022-01-31 08:55:33 +01:00
parent 4efdbabd70 99a6b699cd
commit eacc0e87f8
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/banman.cpp
View File

@ -7,6 +7,7 @@
#include <netaddress.h> #include <netaddress.h>
#include <node/ui_interface.h> #include <node/ui_interface.h>
#include <sync.h>
#include <util/system.h> #include <util/system.h>
#include <util/time.h> #include <util/time.h>
#include <util/translation.h> #include <util/translation.h>
@ -39,18 +40,23 @@ BanMan::~BanMan()
void BanMan::DumpBanlist() void BanMan::DumpBanlist()
{ {
SweepBanned(); // clean unused entries (if bantime has expired) static Mutex dump_mutex;
LOCK(dump_mutex);
if (!BannedSetIsDirty()) return;
int64_t n_start = GetTimeMillis();
banmap_t banmap; banmap_t banmap;
GetBanned(banmap); {
if (m_ban_db.Write(banmap)) { LOCK(m_cs_banned);
SweepBanned();
if (!BannedSetIsDirty()) return;
banmap = m_banned;
SetBannedSetDirty(false); SetBannedSetDirty(false);
} }
int64_t n_start = GetTimeMillis();
if (!m_ban_db.Write(banmap)) {
SetBannedSetDirty(true);
}
LogPrint(BCLog::NET, "Flushed %d banned node addresses/subnets to disk %dms\n", banmap.size(), LogPrint(BCLog::NET, "Flushed %d banned node addresses/subnets to disk %dms\n", banmap.size(),
GetTimeMillis() - n_start); GetTimeMillis() - n_start);
} }