MM-23460: Reuse a single HTTP client across all push notifications (#14122)
Before this, for every single request we would create a new http.Client
from scratch. This was costly because every new client has internal
TCP connections which it reuses.
Therefore, originally, beyond a throughput of 800-1200 rps with a
concurrency of 50, beyond which it would run out of file descriptors.
Now it can support upto 8000-10000 rps.
An improvement by a factor of 10.
Throughput numbers:
BenchmarkPushNotification
BenchmarkPushNotification: notification_push_test.go:1478: throughput: 11445.091601 reqs/s
BenchmarkPushNotification: notification_push_test.go:1478: throughput: 9190.761518 reqs/s
BenchmarkPushNotification: notification_push_test.go:1478: throughput: 8334.394764 reqs/s
BenchmarkPushNotification-8 219 5999304 ns/op 3369224 B/op 42127 allocs/op
BenchmarkPushNotification: notification_push_test.go:1478: throughput: 9590.399780 reqs/s
BenchmarkPushNotification: notification_push_test.go:1478: throughput: 9347.137463 reqs/s
BenchmarkPushNotification: notification_push_test.go:1478: throughput: 9053.784250 reqs/s
BenchmarkPushNotification-8 223 5522636 ns/op 3368470 B/op 42034 allocs/op
BenchmarkPushNotification: notification_push_test.go:1478: throughput: 10250.783365 reqs/s
BenchmarkPushNotification: notification_push_test.go:1478: throughput: 9123.292899 reqs/s
BenchmarkPushNotification: notification_push_test.go:1478: throughput: 9173.553180 reqs/s
This is the aggregate count using benchstat.
The number is for a single run of sending 50 requests.
name time/op
PushNotification-8 5.61ms ± 7%
name alloc/op
PushNotification-8 3.36MB ± 1%
name allocs/op
PushNotification-8 42.0k ± 1%
Tested on a machine with ulimit -n = 4096.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
47e493ea82
Коммит
b754fdb3e1
@@ -333,7 +333,7 @@ func (a *App) sendToPushProxy(msg model.PushNotification, session *model.Session
|
||||
return err
|
||||
}
|
||||
|
||||
resp, err := a.HTTPService().MakeClient(true).Do(request)
|
||||
resp, err := a.Srv().pushNotificationClient.Do(request)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -1349,6 +1349,7 @@ func TestAllPushNotifications(t *testing.T) {
|
||||
assert.Equal(t, 6, numUpdateBadges)
|
||||
}
|
||||
|
||||
// Run it with | grep -v '{"level"' to prevent spamming the console.
|
||||
func BenchmarkPushNotification(b *testing.B) {
|
||||
th := SetupWithStoreMock(b)
|
||||
defer th.TearDown()
|
||||
@@ -1432,9 +1433,10 @@ func BenchmarkPushNotification(b *testing.B) {
|
||||
b.ResetTimer()
|
||||
// We have an inner loop which ranges the testdata slice
|
||||
// and we just repeat that.
|
||||
// TODO: replace 10 by b.N
|
||||
then := time.Now()
|
||||
for i := 0; i < 10; i++ {
|
||||
cnt := 0
|
||||
for i := 0; i < b.N; i++ {
|
||||
cnt++
|
||||
var wg sync.WaitGroup
|
||||
for j, data := range testData {
|
||||
wg.Add(1)
|
||||
@@ -1473,7 +1475,7 @@ func BenchmarkPushNotification(b *testing.B) {
|
||||
}
|
||||
wg.Wait()
|
||||
}
|
||||
b.Logf("time taken: %v", time.Since(then))
|
||||
b.Logf("throughput: %f reqs/s", float64(len(testData)*cnt)/time.Since(then).Seconds())
|
||||
b.StopTimer()
|
||||
time.Sleep(2 * time.Second)
|
||||
}
|
||||
|
||||
@@ -118,7 +118,8 @@ type Server struct {
|
||||
|
||||
phase2PermissionsMigrationComplete bool
|
||||
|
||||
HTTPService httpservice.HTTPService
|
||||
HTTPService httpservice.HTTPService
|
||||
pushNotificationClient *http.Client // TODO: move this to it's own package
|
||||
|
||||
ImageProxy *imageproxy.ImageProxy
|
||||
|
||||
@@ -204,6 +205,7 @@ func NewServer(options ...Option) (*Server, error) {
|
||||
})
|
||||
|
||||
s.HTTPService = httpservice.MakeHTTPService(s)
|
||||
s.pushNotificationClient = s.HTTPService.MakeClient(true)
|
||||
|
||||
s.ImageProxy = imageproxy.MakeImageProxy(s, s.HTTPService, s.Log)
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user