mirror of
https://github.com/gogrlx/nats-server.git
synced 2026-04-02 03:38:42 -07:00
[FIXED] Account resolver lock inversion
There was a lock inversion but low risk since it happened during server initialization. Still fixed it and added the ordering in locksordering.txt file. Also fixed multiple lock inversions that were caused by tests. Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
This commit is contained in:
@@ -2734,25 +2734,6 @@ func TestJetStreamClusterFlowControlRequiresHeartbeats(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
var jsClusterAccountLimitsTempl = `
|
||||
listen: 127.0.0.1:-1
|
||||
server_name: %s
|
||||
jetstream: {max_mem_store: 256MB, max_file_store: 2GB, store_dir: '%s'}
|
||||
|
||||
cluster {
|
||||
name: %s
|
||||
listen: 127.0.0.1:%d
|
||||
routes = [%s]
|
||||
}
|
||||
|
||||
no_auth_user: js
|
||||
|
||||
accounts {
|
||||
$JS { users = [ { user: "js", pass: "p" } ]; jetstream: {max_store: 1MB, max_mem: 0} }
|
||||
$SYS { users = [ { user: "admin", pass: "s3cr3t!" } ] }
|
||||
}
|
||||
`
|
||||
|
||||
func TestJetStreamClusterMixedModeColdStartPrune(t *testing.T) {
|
||||
// Purposely make this unbalanced. Without changes this will never form a quorum to elect the meta-leader.
|
||||
c := createMixedModeCluster(t, jsMixedModeGlobalAccountTempl, "MMCS5", _EMPTY_, 3, 4, false)
|
||||
@@ -5552,10 +5533,8 @@ func TestJetStreamClusterConsumerOverrides(t *testing.T) {
|
||||
o := mset.lookupConsumer("m")
|
||||
require_True(t, o != nil)
|
||||
|
||||
o.mu.RLock()
|
||||
st := o.store.Type()
|
||||
n := o.raftNode()
|
||||
o.mu.RUnlock()
|
||||
require_True(t, n != nil)
|
||||
rn := n.(*raft)
|
||||
rn.RLock()
|
||||
|
||||
Reference in New Issue
Block a user