Skip to content

Commit

Permalink
[v2.11] Fix meta step down panic on empty object (#5993)
Browse files Browse the repository at this point in the history
Side effect from #5956 some
clients/natscli send empty objects to trigger the meta leader step down.
derekcollison authored Oct 11, 2024
2 parents d18f743 + 8c1079e commit 702f5d0
Showing 2 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion server/jetstream_api.go
Original file line number Diff line number Diff line change
@@ -2833,7 +2833,7 @@ func (s *Server) jsLeaderStepDownRequest(sub *subscription, c *client, _ *Accoun
var preferredLeader string
var resp = JSApiLeaderStepDownResponse{ApiResponse: ApiResponse{Type: JSApiLeaderStepDownResponseType}}

if isJSONObjectOrArray(msg) {
if !isEmptyRequest(msg) {
var req JSApiLeaderStepdownRequest
if err := json.Unmarshal(msg, &req); err != nil {
resp.Error = NewJSInvalidJSONError(err)
15 changes: 15 additions & 0 deletions server/jetstream_test.go
Original file line number Diff line number Diff line change
@@ -6712,6 +6712,21 @@ func TestJetStreamSystemLimitsPlacement(t *testing.T) {
t.Fatalf("unexpected memory stream create success, maxBytes=%d, replicas=%d",
si.Config.MaxBytes, si.Config.Replicas)
}

t.Run("meta info placement in request", func(t *testing.T) {
nc, err = nats.Connect(largeSrv.ClientURL(), nats.UserInfo("admin", "s3cr3t!"))
require_NoError(t, err)
defer nc.Close()

var resp JSApiLeaderStepDownResponse
ncResp, err := nc.Request(JSApiLeaderStepDown, []byte("{}"), 3*time.Second)
require_NoError(t, err)
err = json.Unmarshal(ncResp.Data, &resp)
require_NoError(t, err)
require_True(t, resp.Error == nil)
require_True(t, resp.Success)

})
}

func TestJetStreamStreamLimitUpdate(t *testing.T) {

0 comments on commit 702f5d0

Please sign in to comment.