Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver, backend: only warn if exceeding max quota

Browse Source
This commit is contained in:
Anthony Romano 2017-03-16 20:20:49 -07:00
parent 5e4b008106
commit 8a3fee15a3
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etcdserver/quota.go
View File

@ -16,7 +16,15 @@ package etcdserver
import ( import (
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/mvcc/backend" )
const (
// DefaultQuotaBytes is the number of bytes the backend Size may
// consume before exceeding the space quota.
DefaultQuotaBytes = int64(2 * 1024 * 1024 * 1024) // 2GB
// MaxQuotaBytes is the maximum number of bytes suggested for a backend
// quota. A larger quota may lead to degraded performance.
MaxQuotaBytes = int64(8 * 1024 * 1024 * 1024) // 8GB
) )
// Quota represents an arbitrary quota against arbitrary requests. Each request // Quota represents an arbitrary quota against arbitrary requests. Each request
@ -57,11 +65,10 @@ func NewBackendQuota(s *EtcdServer) Quota {
} }
if s.Cfg.QuotaBackendBytes == 0 { if s.Cfg.QuotaBackendBytes == 0 {
// use default size if no quota size given // use default size if no quota size given
return &backendQuota{s, backend.DefaultQuotaBytes} return &backendQuota{s, DefaultQuotaBytes}
} }
if s.Cfg.QuotaBackendBytes > backend.MaxQuotaBytes { if s.Cfg.QuotaBackendBytes > MaxQuotaBytes {
plog.Warningf("backend quota %v exceeds maximum quota %v; using maximum", s.Cfg.QuotaBackendBytes, backend.MaxQuotaBytes) plog.Warningf("backend quota %v exceeds maximum recommended quota %v", s.Cfg.QuotaBackendBytes, MaxQuotaBytes)
return &backendQuota{s, backend.MaxQuotaBytes}
} }
return &backendQuota{s, s.Cfg.QuotaBackendBytes} return &backendQuota{s, s.Cfg.QuotaBackendBytes}
} }

9
mvcc/backend/backend.go
View File

@ -43,15 +43,6 @@ var (
plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc/backend") plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc/backend")
) )
const (
// DefaultQuotaBytes is the number of bytes the backend Size may
// consume before exceeding the space quota.
DefaultQuotaBytes = int64(2 * 1024 * 1024 * 1024) // 2GB
// MaxQuotaBytes is the maximum number of bytes suggested for a backend
// quota. A larger quota may lead to degraded performance.
MaxQuotaBytes = int64(8 * 1024 * 1024 * 1024) // 8GB
)
type Backend interface { type Backend interface {
ReadTx() ReadTx ReadTx() ReadTx
BatchTx() BatchTx BatchTx() BatchTx