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

Fix reloading message for prof_block_rate #4862

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Fix reloading message for prof_block_rate #4862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4688cf
Fix reloading log message for prof_block_rate
wallyqs Dec 7, 2023
d96fbc1
Fix some typos in tests
wallyqs Dec 7, 2023
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
4 changes: 2 additions & 2 deletions server/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2424,10 +2424,10 @@ func TestClientLimits(t *testing.T) {
}
c.applyAccountLimits()
if c.mpay != test.expect {
t.Fatalf("payload %d not as ecpected %d", c.mpay, test.expect)
t.Fatalf("payload %d not as expected %d", c.mpay, test.expect)
}
if c.msubs != test.expect {
t.Fatalf("subscriber %d not as ecpected %d", c.msubs, test.expect)
t.Fatalf("subscriber %d not as expected %d", c.msubs, test.expect)
}
})
}
Expand Down
32 changes: 16 additions & 16 deletions server/filestore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,7 +1439,7 @@ func TestFileStoreMeta(t *testing.T) {
oname := "obs22"
obs, err := fs.ConsumerStore(oname, &oconfig)
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}

ometafile := filepath.Join(fcfg.StoreDir, consumerDir, oname, JetStreamMetaFile)
Expand Down Expand Up @@ -1740,11 +1740,11 @@ func TestFileStoreSnapshot(t *testing.T) {
// Create a few consumers.
o1, err := fs.ConsumerStore("o22", &ConsumerConfig{})
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
o2, err := fs.ConsumerStore("o33", &ConsumerConfig{})
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
state := &ConsumerState{}
state.Delivered.Consumer = 100
Expand All @@ -1753,13 +1753,13 @@ func TestFileStoreSnapshot(t *testing.T) {
state.AckFloor.Stream = 22

if err := o1.Update(state); err != nil {
t.Fatalf("Unexepected error updating state: %v", err)
t.Fatalf("Unexpected error updating state: %v", err)
}
state.AckFloor.Consumer = 33
state.AckFloor.Stream = 33

if err := o2.Update(state); err != nil {
t.Fatalf("Unexepected error updating state: %v", err)
t.Fatalf("Unexpected error updating state: %v", err)
}

snapshot := func() []byte {
Expand Down Expand Up @@ -1908,7 +1908,7 @@ func TestFileStoreConsumer(t *testing.T) {

o, err := fs.ConsumerStore("obs22", &ConsumerConfig{})
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
if state, err := o.State(); err != nil || state.Delivered.Consumer != 0 {
t.Fatalf("Unexpected state or error: %v", err)
Expand All @@ -1919,11 +1919,11 @@ func TestFileStoreConsumer(t *testing.T) {
updateAndCheck := func() {
t.Helper()
if err := o.Update(state); err != nil {
t.Fatalf("Unexepected error updating state: %v", err)
t.Fatalf("Unexpected error updating state: %v", err)
}
s2, err := o.State()
if err != nil {
t.Fatalf("Unexepected error getting state: %v", err)
t.Fatalf("Unexpected error getting state: %v", err)
}
if !reflect.DeepEqual(state, s2) {
t.Fatalf("State is not the same: wanted %+v got %+v", state, s2)
Expand Down Expand Up @@ -2435,7 +2435,7 @@ func TestFileStoreConsumerRedeliveredLost(t *testing.T) {
cfg := &ConsumerConfig{AckPolicy: AckExplicit}
o, err := fs.ConsumerStore("o22", cfg)
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}

restartConsumer := func() {
Expand All @@ -2444,12 +2444,12 @@ func TestFileStoreConsumerRedeliveredLost(t *testing.T) {
time.Sleep(20 * time.Millisecond) // Wait for all things to settle.
o, err = fs.ConsumerStore("o22", cfg)
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
// Make sure we recovered Redelivered.
state, err := o.State()
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
if state == nil {
t.Fatalf("Did not recover state")
Expand Down Expand Up @@ -2500,7 +2500,7 @@ func TestFileStoreConsumerFlusher(t *testing.T) {

o, err := fs.ConsumerStore("o22", &ConsumerConfig{})
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
// Get the underlying impl.
oc := o.(*consumerFileStore)
Expand Down Expand Up @@ -2532,7 +2532,7 @@ func TestFileStoreConsumerDeliveredUpdates(t *testing.T) {
// Simple consumer, no ack policy configured.
o, err := fs.ConsumerStore("o22", &ConsumerConfig{})
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
defer o.Stop()

Expand Down Expand Up @@ -2586,7 +2586,7 @@ func TestFileStoreConsumerDeliveredAndAckUpdates(t *testing.T) {
// Simple consumer, no ack policy configured.
o, err := fs.ConsumerStore("o22", &ConsumerConfig{AckPolicy: AckExplicit})
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
defer o.Stop()

Expand Down Expand Up @@ -2676,7 +2676,7 @@ func TestFileStoreConsumerDeliveredAndAckUpdates(t *testing.T) {

o, err = fs.ConsumerStore("o22", &ConsumerConfig{AckPolicy: AckExplicit})
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
defer o.Stop()

Expand Down Expand Up @@ -2778,7 +2778,7 @@ func TestFileStoreConsumerPerf(t *testing.T) {

o, err := fs.ConsumerStore("o22", &ConsumerConfig{AckPolicy: AckExplicit})
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
// Get the underlying impl.
oc := o.(*consumerFileStore)
Expand Down
2 changes: 1 addition & 1 deletion server/jetstream_consumer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ func TestJetStreamConsumerActionsUnmarshal(t *testing.T) {

var request CreateConsumerRequest
err := json.Unmarshal(test.given, &request)
fmt.Printf("given: %v, expecetd: %v\n", test.expectErr, err)
fmt.Printf("given: %v, expected: %v\n", test.expectErr, err)
if !test.expectErr {
require_NoError(t, err)
} else {
Expand Down
2 changes: 1 addition & 1 deletion server/norace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3326,7 +3326,7 @@ func TestNoRaceJetStreamClusterInterestPolicyAckNone(t *testing.T) {
}
_, err = js.Subscribe("cluster.created", mh, opts...)
if err != nil {
t.Fatalf("Unexepected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}

msg := []byte("ACK ME")
Expand Down
2 changes: 1 addition & 1 deletion server/reload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ type profBlockRateReload struct {

func (o *profBlockRateReload) Apply(s *Server) {
s.setBlockProfileRate(o.newValue)
s.Noticef("Reloaded: block_prof_rate = %v", o.newValue)
s.Noticef("Reloaded: prof_block_rate = %v", o.newValue)
}

type leafNodeOption struct {
Expand Down
2 changes: 1 addition & 1 deletion server/routes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ func TestClientConnectToRoutePort(t *testing.T) {
for i := 0; i < total; i++ {
nc, err := nats.Connect(url)
if err != nil {
t.Fatalf("Unexepected error on connect: %v", err)
t.Fatalf("Unexpected error on connect: %v", err)
}
defer nc.Close()
if nc.ConnectedUrl() != clientURL {
Expand Down