Merge #7959: fix race that could fail to persist a ban

f4ac02e fix race that could fail to persist a ban (Kaz Wesley)
9 years ago · 03cf6e8675
parent 86b800c6a2 f4ac02ee7c
commit 03cf6e8675
1 changed files with 3 additions and 2 deletions
--- a/src/net.cpp
+++ b/src/net.cpp
@ -2634,9 +2634,10 @@ void DumpBanlist()

    CBanDB bandb;
    banmap_t banmap;
+    CNode::SetBannedSetDirty(false);
    CNode::GetBanned(banmap);
-    if (bandb.Write(banmap))
-        CNode::SetBannedSetDirty(false);
+    if (!bandb.Write(banmap))
+        CNode::SetBannedSetDirty(true);

    LogPrint("net", "Flushed %d banned node ips/subnets to banlist.dat  %dms\n",
        banmap.size(), GetTimeMillis() - nStart);