Skip to content

Commit 28cb136

Browse files
committed
fix(push): fix tests
1 parent 11ecbaf commit 28cb136

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

commands_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2948,7 +2948,8 @@ var _ = Describe("Commands", func() {
29482948

29492949
res, err = client.HPTTL(ctx, "myhash", "key1", "key2", "key200").Result()
29502950
Expect(err).NotTo(HaveOccurred())
2951-
Expect(res[0]).To(BeNumerically("~", 10*time.Second.Milliseconds(), 1))
2951+
// overhead of the push notification check is about 1-2ms for 100 commands
2952+
Expect(res[0]).To(BeNumerically("~", 10*time.Second.Milliseconds(), 2))
29522953
})
29532954

29542955
It("should HGETDEL", Label("hash", "HGETDEL"), func() {

redis.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,9 +1103,9 @@ func (c *baseClient) processPushNotifications(ctx context.Context, cn *pool.Conn
11031103
// Use WithReader to access the reader and process push notifications
11041104
// This is critical for hitless upgrades to work properly
11051105
// NOTE: almost no timeouts are set for this read, so it should not block
1106-
// longer than necessary, 50us should be plenty of time to read if there are any push notifications
1107-
// on the socket
1108-
return cn.WithReader(ctx, 50*time.Microsecond, func(rd *proto.Reader) error {
1106+
// longer than necessary, 10us should be plenty of time to read if there are any push notifications
1107+
// on the socket. Even if it was not enough time, the next read will just read the push notifications again.
1108+
return cn.WithReader(ctx, 10*time.Microsecond, func(rd *proto.Reader) error {
11091109
// Create handler context with client, connection pool, and connection information
11101110
handlerCtx := c.pushNotificationHandlerContext(cn)
11111111
return c.pushProcessor.ProcessPendingNotifications(ctx, handlerCtx, rd)

0 commit comments

Comments
 (0)