forked from TrueCloudLab/frostfs-node
[#426] engine: Support duration metrics
With `enable metrics` option, engine will collect durations for all public methods. Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
parent
bc6e7a823b
commit
980b774af2
12 changed files with 169 additions and 0 deletions
|
@ -38,6 +38,10 @@ func (r *ListContainersRes) Containers() []*container.ID {
|
||||||
|
|
||||||
// ContainerSize returns sum of estimation container sizes among all shards.
|
// ContainerSize returns sum of estimation container sizes among all shards.
|
||||||
func (e *StorageEngine) ContainerSize(prm *ContainerSizePrm) *ContainerSizeRes {
|
func (e *StorageEngine) ContainerSize(prm *ContainerSizePrm) *ContainerSizeRes {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(estimateContainerSizeDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
return &ContainerSizeRes{
|
return &ContainerSizeRes{
|
||||||
size: e.containerSize(prm.cid),
|
size: e.containerSize(prm.cid),
|
||||||
}
|
}
|
||||||
|
@ -70,6 +74,10 @@ func (e *StorageEngine) containerSize(id *container.ID) (total uint64) {
|
||||||
|
|
||||||
// ListContainers returns unique container IDs presented in the engine objects.
|
// ListContainers returns unique container IDs presented in the engine objects.
|
||||||
func (e *StorageEngine) ListContainers(_ *ListContainersPrm) *ListContainersRes {
|
func (e *StorageEngine) ListContainers(_ *ListContainersPrm) *ListContainersRes {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(listContainersDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
return &ListContainersRes{
|
return &ListContainersRes{
|
||||||
containers: e.listContainers(),
|
containers: e.listContainers(),
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,10 @@ func (e *StorageEngine) Init() error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if e.enableMetrics {
|
||||||
|
registerMetrics()
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,10 @@ func (p *DeletePrm) WithAddresses(addr ...*objectSDK.Address) *DeletePrm {
|
||||||
|
|
||||||
// Delete marks the objects to be removed.
|
// Delete marks the objects to be removed.
|
||||||
func (e *StorageEngine) Delete(prm *DeletePrm) (*DeleteRes, error) {
|
func (e *StorageEngine) Delete(prm *DeletePrm) (*DeleteRes, error) {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(deleteDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
shPrm := new(shard.InhumePrm)
|
shPrm := new(shard.InhumePrm)
|
||||||
existsPrm := new(shard.ExistsPrm)
|
existsPrm := new(shard.ExistsPrm)
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,8 @@ type Option func(*cfg)
|
||||||
|
|
||||||
type cfg struct {
|
type cfg struct {
|
||||||
log *logger.Logger
|
log *logger.Logger
|
||||||
|
|
||||||
|
enableMetrics bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func defaultCfg() *cfg {
|
func defaultCfg() *cfg {
|
||||||
|
@ -51,3 +53,9 @@ func WithLogger(l *logger.Logger) Option {
|
||||||
c.log = l
|
c.log = l
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func WithMetrics(v bool) Option {
|
||||||
|
return func(c *cfg) {
|
||||||
|
c.enableMetrics = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -38,6 +38,10 @@ func (p *ExistsRes) Exists() bool {
|
||||||
// Returns any error encountered that does not allow to
|
// Returns any error encountered that does not allow to
|
||||||
// unambiguously determine the presence of an object.
|
// unambiguously determine the presence of an object.
|
||||||
func (e *StorageEngine) Exists(prm *ExistsPrm) (*ExistsRes, error) {
|
func (e *StorageEngine) Exists(prm *ExistsPrm) (*ExistsRes, error) {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(existsDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
exists, err := e.exists(prm.addr)
|
exists, err := e.exists(prm.addr)
|
||||||
|
|
||||||
return &ExistsRes{
|
return &ExistsRes{
|
||||||
|
|
|
@ -42,6 +42,10 @@ func (r *GetRes) Object() *object.Object {
|
||||||
//
|
//
|
||||||
// Returns ErrNotFound if requested object is missing in local storage.
|
// Returns ErrNotFound if requested object is missing in local storage.
|
||||||
func (e *StorageEngine) Get(prm *GetPrm) (*GetRes, error) {
|
func (e *StorageEngine) Get(prm *GetPrm) (*GetRes, error) {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(getDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
obj *object.Object
|
obj *object.Object
|
||||||
siErr *objectSDK.SplitInfoError
|
siErr *objectSDK.SplitInfoError
|
||||||
|
|
|
@ -56,6 +56,10 @@ func (r *HeadRes) Header() *object.Object {
|
||||||
// Returns object.ErrNotFound if requested object is missing in local storage.
|
// Returns object.ErrNotFound if requested object is missing in local storage.
|
||||||
// Returns object.ErrAlreadyRemoved if requested object was inhumed.
|
// Returns object.ErrAlreadyRemoved if requested object was inhumed.
|
||||||
func (e *StorageEngine) Head(prm *HeadPrm) (*HeadRes, error) {
|
func (e *StorageEngine) Head(prm *HeadPrm) (*HeadRes, error) {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(headDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
head *object.Object
|
head *object.Object
|
||||||
siErr *objectSDK.SplitInfoError
|
siErr *objectSDK.SplitInfoError
|
||||||
|
|
|
@ -49,6 +49,10 @@ var errInhumeFailure = errors.New("inhume operation failed")
|
||||||
// Inhume calls metabase. Inhume method to mark object as removed. It won't be
|
// Inhume calls metabase. Inhume method to mark object as removed. It won't be
|
||||||
// removed physically from shard until `Delete` operation.
|
// removed physically from shard until `Delete` operation.
|
||||||
func (e *StorageEngine) Inhume(prm *InhumePrm) (*InhumeRes, error) {
|
func (e *StorageEngine) Inhume(prm *InhumePrm) (*InhumeRes, error) {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(inhumeDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
shPrm := new(shard.InhumePrm)
|
shPrm := new(shard.InhumePrm)
|
||||||
|
|
||||||
for i := range prm.addrs {
|
for i := range prm.addrs {
|
||||||
|
|
113
pkg/local_object_storage/engine/metrics.go
Normal file
113
pkg/local_object_storage/engine/metrics.go
Normal file
|
@ -0,0 +1,113 @@
|
||||||
|
package engine
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
namespace = "neofs_node"
|
||||||
|
subsystem = "engine"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
listContainersDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "list_containers_duration",
|
||||||
|
Help: "Accumulated duration of engine list containers operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
estimateContainerSizeDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "estimate_container_size_duration",
|
||||||
|
Help: "Accumulated duration of engine container size estimate operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
deleteDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "delete_duration",
|
||||||
|
Help: "Accumulated duration of engine delete operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
existsDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "exists_duration",
|
||||||
|
Help: "Accumulated duration of engine exists operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
getDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "get_duration",
|
||||||
|
Help: "Accumulated duration of engine get operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
headDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "head_duration",
|
||||||
|
Help: "Accumulated duration of engine head operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
inhumeDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "inhume_duration",
|
||||||
|
Help: "Accumulated duration of engine inhume operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
putDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "put_duration",
|
||||||
|
Help: "Accumulated duration of engine put operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
rangeDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "range_duration",
|
||||||
|
Help: "Accumulated duration of engine range operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
searchDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "search_duration",
|
||||||
|
Help: "Accumulated duration of engine search operations",
|
||||||
|
})
|
||||||
|
|
||||||
|
listObjectsDuration = prometheus.NewCounter(prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: subsystem,
|
||||||
|
Name: "list_objects_duration",
|
||||||
|
Help: "Accumulated duration of engine list objects operations",
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
func registerMetrics() {
|
||||||
|
prometheus.MustRegister(listContainersDuration)
|
||||||
|
prometheus.MustRegister(estimateContainerSizeDuration)
|
||||||
|
prometheus.MustRegister(deleteDuration)
|
||||||
|
prometheus.MustRegister(existsDuration)
|
||||||
|
prometheus.MustRegister(getDuration)
|
||||||
|
prometheus.MustRegister(headDuration)
|
||||||
|
prometheus.MustRegister(inhumeDuration)
|
||||||
|
prometheus.MustRegister(putDuration)
|
||||||
|
prometheus.MustRegister(rangeDuration)
|
||||||
|
prometheus.MustRegister(searchDuration)
|
||||||
|
prometheus.MustRegister(listObjectsDuration)
|
||||||
|
}
|
||||||
|
|
||||||
|
func elapsed(c prometheus.Counter) func() {
|
||||||
|
t := time.Now()
|
||||||
|
|
||||||
|
return func() {
|
||||||
|
c.Add(float64(time.Since(t)))
|
||||||
|
}
|
||||||
|
}
|
|
@ -34,6 +34,10 @@ func (p *PutPrm) WithObject(obj *object.Object) *PutPrm {
|
||||||
// Returns any error encountered that
|
// Returns any error encountered that
|
||||||
// did not allow to completely save the object.
|
// did not allow to completely save the object.
|
||||||
func (e *StorageEngine) Put(prm *PutPrm) (*PutRes, error) {
|
func (e *StorageEngine) Put(prm *PutPrm) (*PutRes, error) {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(putDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
_, err := e.exists(prm.obj.Address()) // todo: make this check parallel
|
_, err := e.exists(prm.obj.Address()) // todo: make this check parallel
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -60,6 +60,10 @@ func (r *RngRes) Object() *object.Object {
|
||||||
// Returns ErrAlreadyRemoved if requested object is inhumed.
|
// Returns ErrAlreadyRemoved if requested object is inhumed.
|
||||||
// Returns ErrRangeOutOfBounds if requested object range is out of bounds.
|
// Returns ErrRangeOutOfBounds if requested object range is out of bounds.
|
||||||
func (e *StorageEngine) GetRange(prm *RngPrm) (*RngRes, error) {
|
func (e *StorageEngine) GetRange(prm *RngPrm) (*RngRes, error) {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(rangeDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
obj *object.Object
|
obj *object.Object
|
||||||
siErr *objectSDK.SplitInfoError
|
siErr *objectSDK.SplitInfoError
|
||||||
|
|
|
@ -48,6 +48,10 @@ func (r *SelectRes) AddressList() []*object.Address {
|
||||||
//
|
//
|
||||||
// Returns any error encountered that did not allow to completely select the objects.
|
// Returns any error encountered that did not allow to completely select the objects.
|
||||||
func (e *StorageEngine) Select(prm *SelectPrm) (*SelectRes, error) {
|
func (e *StorageEngine) Select(prm *SelectPrm) (*SelectRes, error) {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(searchDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
addrList := make([]*object.Address, 0)
|
addrList := make([]*object.Address, 0)
|
||||||
uniqueMap := make(map[string]struct{})
|
uniqueMap := make(map[string]struct{})
|
||||||
|
|
||||||
|
@ -94,6 +98,10 @@ func (e *StorageEngine) Select(prm *SelectPrm) (*SelectRes, error) {
|
||||||
// List returns `limit` available physically storage object addresses in engine.
|
// List returns `limit` available physically storage object addresses in engine.
|
||||||
// If limit is zero, then returns all available object addresses.
|
// If limit is zero, then returns all available object addresses.
|
||||||
func (e *StorageEngine) List(limit uint64) (*SelectRes, error) {
|
func (e *StorageEngine) List(limit uint64) (*SelectRes, error) {
|
||||||
|
if e.enableMetrics {
|
||||||
|
defer elapsed(listObjectsDuration)()
|
||||||
|
}
|
||||||
|
|
||||||
addrList := make([]*object.Address, limit)
|
addrList := make([]*object.Address, limit)
|
||||||
uniqueMap := make(map[string]struct{})
|
uniqueMap := make(map[string]struct{})
|
||||||
ln := uint64(0)
|
ln := uint64(0)
|
||||||
|
|
Loading…
Reference in a new issue