gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

incorporating review comments.

Browse Source 
Signed-off-by: Matthias Hanel <mh@synadia.com>
This commit is contained in:
Matthias Hanel
2021-09-21 17:13:53 -04:00
parent 9911b37b0c
commit 29a6367889
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/jetstream.go
View File

@@ -49,14 +49,14 @@ type JetStreamConfig struct {
}
type JetStreamStats struct {
Memory uint64 `json:"memory"`
Store uint64 `json:"storage"`
MemoryReserveUsed uint64 `json:"reserved_memory_used,omitempty"`
StoreReserveUsed uint64 `json:"reserved_storage_used,omitempty"`
Accounts int `json:"accounts,omitempty"`
API JetStreamAPIStats `json:"api"`
ReservedMemory uint64 `json:"reserved_memory,omitempty"`
ReservedStore uint64 `json:"reserved_storage,omitempty"`
Memory uint64 `json:"memory"`
Store uint64 `json:"storage"`
ReservedMemoryUsed uint64 `json:"reserved_memory_used,omitempty"`
ReserveStoreUsed uint64 `json:"reserved_storage_used,omitempty"`
Accounts int `json:"accounts,omitempty"`
API JetStreamAPIStats `json:"api"`
ReservedMemory uint64 `json:"reserved_memory,omitempty"`
ReservedStore uint64 `json:"reserved_storage,omitempty"`
}
type JetStreamAccountLimits struct {
@@ -1301,17 +1301,17 @@ func (a *Account) UpdateJetStreamLimits(limits *JetStreamAccountLimits) error {
js.releaseResources(&jsaLimits)
js.reserveResources(limits)
if jsaLimits.MaxMemory >= 0 && limits.MaxMemory < 0 {
// we had a reserve and am now dropping it
// we had a reserve and are now dropping it
atomic.AddInt64(&js.memTotalRes, -jsa.memTotal)
} else if jsaLimits.MaxMemory < 0 && limits.MaxMemory >= 0 {
// we had no reserve and am now adding it
// we had no reserve and are now adding it
atomic.AddInt64(&js.memTotalRes, jsa.memTotal)
}
if jsaLimits.MaxStore >= 0 && limits.MaxStore < 0 {
// we had a reserve and am now dropping it
// we had a reserve and are now dropping it
atomic.AddInt64(&js.storeTotalRes, -jsa.storeTotal)
} else if jsaLimits.MaxStore < 0 && limits.MaxStore >= 0 {
// we had no reserve and am now adding it
// we had no reserve and are now adding it
atomic.AddInt64(&js.storeTotalRes, jsa.storeTotal)
}
js.mu.Unlock()
@@ -1691,8 +1691,8 @@ func (js *jetStream) usageStats() *JetStreamStats {
stats.API.Errors = (uint64)(atomic.LoadInt64(&js.apiErrors))
stats.Memory = (uint64)(atomic.LoadInt64(&js.memTotal))
stats.Store = (uint64)(atomic.LoadInt64(&js.storeTotal))
stats.MemoryReserveUsed = (uint64)(atomic.LoadInt64(&js.memTotalRes))
stats.StoreReserveUsed = (uint64)(atomic.LoadInt64(&js.storeTotalRes))
stats.ReservedMemoryUsed = (uint64)(atomic.LoadInt64(&js.memTotalRes))
stats.ReserveStoreUsed = (uint64)(atomic.LoadInt64(&js.storeTotalRes))
return &stats
}

10
server/monitor_test.go
View File

@@ -3928,7 +3928,7 @@ func checkForJSClusterUp(t *testing.T, servers ...*Server) {
})
}
func TestMonitorJsz2(t *testing.T) {
func TestMonitorJsz(t *testing.T) {
readJsInfo := func(url string) *JSInfo {
t.Helper()
body := readBody(t, url)
@@ -4240,11 +4240,11 @@ func TestMonitorJszAccountReserves(t *testing.T) {
memory = info.Memory
store = info.Store
}
if info.MemoryReserveUsed != memory {
t.Fatalf("expected %d bytes reserved memory used, got %d bytes", memory, info.MemoryReserveUsed)
if info.ReservedMemoryUsed != memory {
t.Fatalf("expected %d bytes reserved memory used, got %d bytes", memory, info.ReservedMemoryUsed)
}
if info.StoreReserveUsed != store {
t.Fatalf("expected %d bytes reserved store used, got %d bytes", store, info.StoreReserveUsed)
if info.ReserveStoreUsed != store {
t.Fatalf("expected %d bytes reserved store used, got %d bytes", store, info.ReserveStoreUsed)
}
}