Changeset 738 in code for trunk

Timestamp:

Dec 2, 2021, 6:29:44 PM (4 years ago)

Author:

contact

Message:

Cancel pending commands on downstream disconnect

If a client queues a high number of commands and then disconnects,
remove all of the pending commands. This avoids unnecessarily
sending commands whose results won't be used.

Location:

trunk

Files:

• upstream.go (modified) (1 diff)
• user.go (modified) (1 diff)

trunk/upstream.go

@@ -386 +386 @@
 }
 
+func (uc *upstreamConn) cancelPendingCommandsByDownstreamID(downstreamID uint64) {
+        for cmd := range uc.pendingCmds {
+                // We can't cancel the currently running command stored in
+                // uc.pendingCmds[cmd][0]
+                for i := len(uc.pendingCmds[cmd]) - 1; i >= 1; i-- {
+                        if uc.pendingCmds[cmd][i].downstreamID == downstreamID {
+                                uc.pendingCmds[cmd] = append(uc.pendingCmds[cmd][:i], uc.pendingCmds[cmd][i+1:]...)
+                        }
+                }
+        }
+}
+
 func (uc *upstreamConn) parseMembershipPrefix(s string) (ms *memberships, nick string) {
         memberships := make(memberships, 0, 4)

trunk/user.go

@@ -663 +663 @@
 
                         u.forEachUpstream(func(uc *upstreamConn) {
+                                uc.cancelPendingCommandsByDownstreamID(dc.id)
                                 uc.updateAway()
                                 uc.updateMonitor()