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

Cherry-picks for 2.10.16-RC.1 #5445

Merged
merged 3 commits into from
May 17, 2024
Merged

Cherry-picks for 2.10.16-RC.1 #5445

merged 3 commits into from
May 17, 2024

Conversation

wallyqs
Copy link
Member

@wallyqs wallyqs commented May 17, 2024 •
edited

kozlovic and others added 3 commits May 17, 2024 08:46
@kozlovic @wallyqs
[FIXED] Clustering: fixed data race when negotiating cluster name
d3d4b32 
Added a test that demonstrated the following data race:
```
==================
WARNING: DATA RACE
Write at 0x00c00030cbf8 by goroutine 206:
  github.com/nats-io/nats-server/v2/server.(*client).processRouteConnect()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/route.go:2747 +0x2ac
  github.com/nats-io/nats-server/v2/server.(*client).processConnect()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/client.go:2147 +0xdec
  github.com/nats-io/nats-server/v2/server.(*client).parse()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/parser.go:942 +0xe90
  github.com/nats-io/nats-server/v2/server.(*client).readLoop()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/client.go:1389 +0x13a4
  github.com/nats-io/nats-server/v2/server.(*Server).createRoute.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/route.go:1803 +0x38
  github.com/nats-io/nats-server/v2/server.(*Server).startGoRoutine.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/server.go:3805 +0x58

Previous read at 0x00c00030cbf8 by goroutine 199:
  github.com/nats-io/nats-server/v2/server.(*Server).isClusterNameDynamic()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/server.go:978 +0x164
  github.com/nats-io/nats-server/v2/server.(*client).processRouteConnect()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/route.go:2741 +0x170
  github.com/nats-io/nats-server/v2/server.(*client).processConnect()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/client.go:2147 +0xdec
  github.com/nats-io/nats-server/v2/server.(*client).parse()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/parser.go:942 +0xe90
  github.com/nats-io/nats-server/v2/server.(*client).readLoop()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/client.go:1389 +0x13a4
  github.com/nats-io/nats-server/v2/server.(*Server).createRoute.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/route.go:1803 +0x38
  github.com/nats-io/nats-server/v2/server.(*Server).startGoRoutine.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/server.go:3805 +0x58

Goroutine 206 (running) created at:
  github.com/nats-io/nats-server/v2/server.(*Server).startGoRoutine()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/server.go:3803 +0x160
  github.com/nats-io/nats-server/v2/server.(*Server).createRoute()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/route.go:1803 +0xa38
  github.com/nats-io/nats-server/v2/server.(*Server).startRouteAcceptLoop.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/route.go:2527 +0x48
  github.com/nats-io/nats-server/v2/server.(*Server).acceptConnections.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/server.go:2745 +0x70
  github.com/nats-io/nats-server/v2/server.(*Server).startGoRoutine.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/server.go:3805 +0x58

Goroutine 199 (running) created at:
  github.com/nats-io/nats-server/v2/server.(*Server).startGoRoutine()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/server.go:3803 +0x160
  github.com/nats-io/nats-server/v2/server.(*Server).createRoute()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/route.go:1803 +0xa38
  github.com/nats-io/nats-server/v2/server.(*Server).startRouteAcceptLoop.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/route.go:2527 +0x48
  github.com/nats-io/nats-server/v2/server.(*Server).acceptConnections.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/server.go:2745 +0x70
  github.com/nats-io/nats-server/v2/server.(*Server).startGoRoutine.func1()
      /Users/ik/dev/go/src/github.com/nats-io/nats-server/server/server.go:3805 +0x58
==================
```

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
@derekcollison @wallyqs
Fix for lex block start on comments to return to lex block start
4b7b8d4 
Signed-off-by: Derek Collison <derek@nats.io>
@derekcollison @wallyqs
Update NATS client
120055a 
Signed-off-by: Derek Collison <derek@nats.io>
@wallyqs wallyqs requested a review from a team as a code owner May 17, 2024 15:47
@derekcollison
Copy link
Member

We need to pull in all 3 for lexer fixes.

derekcollison
derekcollison approved these changes May 17, 2024
View reviewed changes
Copy link
Member

@derekcollison derekcollison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wallyqs wallyqs merged commit f519a53 into release/v2.10.16 May 17, 2024
3 of 4 checks passed
@wallyqs wallyqs deleted the downstream/v2.10.16 branch May 17, 2024 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derekcollison derekcollison derekcollison approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@wallyqs @derekcollison @kozlovic