Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIXED] Request or NextMsg with Context may return message after being canceled #387

Merged
merged 3 commits into from
Aug 27, 2018
Merged

[FIXED] Request or NextMsg with Context may return message after being canceled #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc5dcc7
Check if context canceled before waiting for Msg
wallyqs Aug 26, 2018
44b4b38
Remove wait for in context test, no longer needed
wallyqs Aug 26, 2018
ccf165c
Remove select and just check if context canceled
wallyqs Aug 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ func (nc *Conn) RequestWithContext(ctx context.Context, subj string, data []byte
if nc == nil {
return nil, ErrInvalidConnection
}
// Check whether the context is done already before making
// the request.
if ctx.Err() != nil {
return nil, ctx.Err()
}

nc.mu.Lock()
// If user wants the old style.
Expand Down Expand Up @@ -116,6 +121,9 @@ func (s *Subscription) NextMsgWithContext(ctx context.Context) (*Msg, error) {
if s == nil {
return nil, ErrBadSubscription
}
if ctx.Err() != nil {
return nil, ctx.Err()
}

s.mu.Lock()
err := s.validateNextMsgState()
Expand All @@ -124,7 +132,6 @@ func (s *Subscription) NextMsgWithContext(ctx context.Context) (*Msg, error) {
return nil, err
}

// snapshot
mch := s.mch
s.mu.Unlock()

Expand Down
11 changes: 0 additions & 11 deletions test/context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package test

import (
"context"
"errors"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -137,16 +136,6 @@ func testContextRequestWithTimeoutCanceled(t *testing.T, nc *nats.Conn) {
// Cancel the context already so that rest of requests fail.
cancelCB()

// Wait for context to be eventually canceled.
waitFor(t, 1*time.Millisecond, 50*time.Millisecond, func() error {
select {
case <-ctx.Done():
return nil
default:
return errors.New("Timeout waiting for context to be canceled")
}
})

// Context is already canceled so requests should immediately fail.
_, err = nc.RequestWithContext(ctx, "fast", []byte("world"))
if err == nil {
Expand Down