lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

types/logger: fix deadlock in the burst case. 

Fixes #365.

Signed-off-by: David Anderson <danderson@tailscale.com>
pull/366/head
David Anderson 2020-05-09 02:52:03 +00:00
parent ccbd0937d0
commit 48b1e85e8a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
types/logger/logger.go
View File

@ -72,7 +72,6 @@ func RateLimitedFn(logf Logf, f float64, b int, m int) Logf {
if ok { if ok {
msgCache.MoveToFront(rl.ele) msgCache.MoveToFront(rl.ele)
if rl.lim.Allow() { if rl.lim.Allow() {
mu.Lock()
rl.msgBlocked = false rl.msgBlocked = false
mu.Unlock() mu.Unlock()
logf(format, args...) logf(format, args...)

6
types/logger/logger_test.go
View File

@ -41,13 +41,15 @@ func TestRateLimiter(t *testing.T) {
want := []string{ want := []string{
"boring string with constant formatting (constant)", "boring string with constant formatting (constant)",
"templated format string no. 0", "templated format string no. 0",
"boring string with constant formatting (constant)",
"templated format string no. 1",
"Repeated messages were suppressed by rate limiting. Original message: boring string with constant formatting (constant)", "Repeated messages were suppressed by rate limiting. Original message: boring string with constant formatting (constant)",
"Repeated messages were suppressed by rate limiting. Original message: templated format string no. 1", "Repeated messages were suppressed by rate limiting. Original message: templated format string no. 2",
"Make sure this string makes it through the rest (that are blocked) 4", "Make sure this string makes it through the rest (that are blocked) 4",
"4 shouldn't get filtered.", "4 shouldn't get filtered.",
} }
lg := RateLimitedFn(logTester(want), 1, 1, 50) lg := RateLimitedFn(logTester(want), 1, 2, 50)
var prefixed Logf var prefixed Logf
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
lg("boring string with constant formatting %s", "(constant)") lg("boring string with constant formatting %s", "(constant)")