Destroy an idle PeerDigest after its CachePeer disappears (#1372)

Delaying this destruction until the next peerDigestCheck() event results
in accumulation of PeerDigests (and related objects) during frequent
reconfigurations.

diff --git a/src/CachePeer.cc b/src/CachePeer.cc
index 1a5ea04bc28824578748cecc6268db5d2970a059..01db8ab24eaf2cf83467bb24853642dae49b78df 100644 (file)
--- a/src/CachePeer.cc
+++ b/src/CachePeer.cc
@@ -13,6 +13,7 @@
 #include "neighbors.h"
 #include "NeighborTypeDomainList.h"
 #include "pconn.h"
+#include "PeerDigest.h"
 #include "PeerPoolMgr.h"
 #include "SquidConfig.h"
 #include "util.h"
@@ -40,7 +41,9 @@ CachePeer::~CachePeer()
     aclDestroyAccessList(&access);
 
 #if USE_CACHE_DIGESTS
-    cbdataReferenceDone(digest);
+    void *digestTmp = nullptr;
+    if (cbdataReferenceValidDone(digest, &digestTmp))
+        peerDigestNotePeerGone(static_cast<PeerDigest *>(digestTmp));
     xfree(digest_url);
 #endif
 

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index e8648c6d5adc52e4eb52cd4ae08ba6c15694b838..45f9e0715050c886b95a808e32506cba5f9c3831 100644 (file)
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -167,6 +167,8 @@ peerDigestDestroy(PeerDigest * pd)
 
 PeerDigest::~PeerDigest()
 {
+    if (times.next_check && eventFind(peerDigestCheck, this))
+        eventDelete(peerDigestCheck, this);
     delete cd;
     // req_result pointer is not owned by us
 }