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.

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

Report an error if we fail to load an account on a stream assignment. #2076

Merged
merged 1 commit into from
Apr 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions server/jetstream_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,7 @@ var (
jsClusterNoPeersErr = &ApiError{Code: 400, Description: "no suitable peers for placement"}
jsServerNotMemberErr = &ApiError{Code: 400, Description: "server is not a member of the cluster"}
jsNoMessageFoundErr = &ApiError{Code: 404, Description: "no message found"}
jsNoAccountErr = &ApiError{Code: 503, Description: "account not found"}
)

// For easier handling of exports and imports.
Expand Down
14 changes: 12 additions & 2 deletions server/jetstream_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -1807,18 +1807,28 @@ func (js *jetStream) streamAssignment(account, stream string) (sa *streamAssignm
func (js *jetStream) processStreamAssignment(sa *streamAssignment) bool {
js.mu.RLock()
s, cc := js.srv, js.cluster
accName, stream := sa.Client.serviceAccount(), sa.Config.Name
js.mu.RUnlock()

if s == nil || cc == nil {
// TODO(dlc) - debug at least
return false
}

acc, err := s.LookupAccount(sa.Client.serviceAccount())
acc, err := s.LookupAccount(accName)
if err != nil {
// If we can not lookup our account send this result back to the metacontroller leader.
result := &streamAssignmentResult{
Account: accName,
Stream: stream,
Response: &JSApiStreamCreateResponse{ApiResponse: ApiResponse{Type: JSApiStreamCreateResponseType}},
}
result.Response.Error = jsNoAccountErr
s.sendInternalMsgLocked(streamAssignmentSubj, _EMPTY_, nil, result)

// TODO(dlc) - log error
return false
}
stream := sa.Config.Name

js.mu.Lock()
if cc.meta == nil {
Expand Down
20 changes: 20 additions & 0 deletions server/jetstream_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5284,6 +5284,26 @@ func TestJetStreamClusterServerLimits(t *testing.T) {
}
}

func TestJetStreamClusterAccountLoadFailure(t *testing.T) {
c := createJetStreamClusterWithTemplate(t, jsClusterLimitsTempl, "R3L", 3)
defer c.shutdown()

// Client based API
nc, js := jsClientConnect(t, c.leader())
defer nc.Close()

// Remove the "ONE" account from non-leader
s := c.randomNonLeader()
s.mu.Lock()
s.accounts.Delete("ONE")
s.mu.Unlock()

_, err := js.AddStream(&nats.StreamConfig{Name: "F", Replicas: 3})
if err == nil || !strings.Contains(err.Error(), "account not found") {
t.Fatalf("Expected an 'account not found' error but got %v", err)
}
}

// Support functions

// Used to setup superclusters for tests.
Expand Down