logos-messaging/logos-messaging-go
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-go.git synced 2026-08-02 15:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(filter): correct inverted idle-subscription cleanup check (#1314)

Browse Source 
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Igor Sirotin 2026-07-06 14:06:11 +01:00 committed by GitHub
parent f3fc70002f
commit b007066aa5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waku/v2/protocol/filter/subscribers_map.go
View File

@ -250,7 +250,7 @@ func (sub *SubscribersMap) cleanUp(ctx context.Context, cleanupInterval time.Dur
sub.Lock() sub.Lock()
for peerID, lastSeen := range sub.lastSeen { for peerID, lastSeen := range sub.lastSeen {
elapsedTime := time.Since(lastSeen) elapsedTime := time.Since(lastSeen)
if elapsedTime < sub.timeout { if elapsedTime > sub.timeout {
_ = sub.deleteAll(peerID) _ = sub.deleteAll(peerID)
} }

24
waku/v2/protocol/filter/subscribers_map_test.go
View File

@ -107,16 +107,20 @@ func TestRemoveBogus(t *testing.T) {
require.Error(t, err) require.Error(t, err)
} }
// TestCleanup verifies the idle-subscription cleanup lifecycle: a subscriber
// that keeps getting refreshed (e.g. via pings) survives the periodic cleanup
// while active, and is removed only once it goes idle past the timeout. This
// also guards against a regression where the idle check was inverted, deleting
// active subscribers while keeping idle ones forever.
func TestCleanup(t *testing.T) { func TestCleanup(t *testing.T) {
subs := NewSubscribersMap(2 * time.Second) subs := NewSubscribersMap(1 * time.Second)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
go subs.cleanUp(ctx, 500*time.Millisecond) go subs.cleanUp(ctx, 100*time.Millisecond)
peerId := createPeerID(t) peerId := createPeerID(t)
subs.Set(peerId, PUBSUB_TOPIC, []string{"topic1", "topic2"}) subs.Set(peerId, PUBSUB_TOPIC, []string{"topic1", "topic2"})
hasSubs := subs.Has(peerId) hasSubs := subs.Has(peerId)
@ -125,10 +129,18 @@ func TestCleanup(t *testing.T) {
_, exists := subs.Get(peerId) _, exists := subs.Get(peerId)
require.True(t, exists) require.True(t, exists)
time.Sleep(2 * time.Second) // Keep the subscriber active for well over the timeout by refreshing it
// periodically. It must never be cleaned up while active.
for i := 0; i < 15; i++ {
time.Sleep(100 * time.Millisecond)
subs.Refresh(peerId)
require.True(t, subs.Has(peerId), "active subscriber was removed while being refreshed")
}
hasSubs = subs.Has(peerId) // Stop refreshing; once idle past the timeout it must be removed.
require.False(t, hasSubs) require.Eventually(t, func() bool {
return !subs.Has(peerId)
}, 3*time.Second, 100*time.Millisecond, "idle subscriber was not cleaned up")
_, exists = subs.Get(peerId) _, exists = subs.Get(peerId)
require.False(t, exists) require.False(t, exists)