TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 106 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#9999] metabase: Add IO tag label to metrics

Browse source 
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2025-02-18 11:37:46 +03:00
parent b445395990
commit 66181327c7
Signed by: dstepanov-yadro
GPG key ID: 237AF1A763293BC0
20 changed files with 60 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/metrics/metabase.go
View file

@ -12,7 +12,7 @@ type MetabaseMetrics interface {
SetMode(shardID, path string, mode string) SetMode(shardID, path string, mode string)
Close(shardID, path string) Close(shardID, path string)
MethodDuration(shardID, path string, method string, d time.Duration, success bool) MethodDuration(shardID, path string, method string, d time.Duration, success bool, ioTag string)
} }
func newMetabaseMetrics() *metabaseMetrics { func newMetabaseMetrics() *metabaseMetrics {
@ -23,7 +23,7 @@ func newMetabaseMetrics() *metabaseMetrics {
Subsystem: metabaseSubSystem, Subsystem: metabaseSubSystem,
Name: "request_duration_seconds", Name: "request_duration_seconds",
Help: "Accumulated Metabase request process duration", Help: "Accumulated Metabase request process duration",
}, []string{shardIDLabel, successLabel, pathLabel, methodLabel}), }, []string{shardIDLabel, successLabel, pathLabel, methodLabel, ioTagLabel}),
} }
} }
@ -44,11 +44,12 @@ func (m *metabaseMetrics) Close(shardID, path string) {
}) })
} }
func (m *metabaseMetrics) MethodDuration(shardID, path string, method string, d time.Duration, success bool) { func (m *metabaseMetrics) MethodDuration(shardID, path string, method string, d time.Duration, success bool, ioTag string) {
m.reqDuration.With(prometheus.Labels{ m.reqDuration.With(prometheus.Labels{
shardIDLabel: shardID, shardIDLabel: shardID,
pathLabel: path, pathLabel: path,
successLabel: strconv.FormatBool(success), successLabel: strconv.FormatBool(success),
methodLabel: method, methodLabel: method,
ioTagLabel: ioTag,
}).Observe(d.Seconds()) }).Observe(d.Seconds())
} }

3
pkg/local_object_storage/metabase/children.go
View file

@ -4,6 +4,7 @@ import (
"context" "context"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
@ -20,7 +21,7 @@ func (db *DB) GetChildren(ctx context.Context, addresses []oid.Address) (map[oid
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("GetChildren", time.Since(startedAt), success) db.metrics.AddMethodDuration("GetChildren", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.GetChildren", _, span := tracing.StartSpanFromContext(ctx, "metabase.GetChildren",

3
pkg/local_object_storage/metabase/containers.go
View file

@ -5,6 +5,7 @@ import (
"encoding/binary" "encoding/binary"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
@ -17,7 +18,7 @@ func (db *DB) Containers(ctx context.Context) (list []cid.ID, err error) {
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("Containers", time.Since(startedAt), success) db.metrics.AddMethodDuration("Containers", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.Containers") _, span := tracing.StartSpanFromContext(ctx, "metabase.Containers")

13
pkg/local_object_storage/metabase/counter.go
View file

@ -8,6 +8,7 @@ import (
"fmt" "fmt"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
@ -105,7 +106,7 @@ func (db *DB) ContainerCounters(ctx context.Context) (ContainerCounters, error)
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("ContainerCounters", time.Since(startedAt), success) db.metrics.AddMethodDuration("ContainerCounters", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
ctx, span := tracing.StartSpanFromContext(ctx, "metabase.ContainerCounters") ctx, span := tracing.StartSpanFromContext(ctx, "metabase.ContainerCounters")
@ -200,7 +201,7 @@ func (db *DB) ContainerCount(ctx context.Context, id cid.ID) (ObjectCounters, er
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("ContainerCount", time.Since(startedAt), success) db.metrics.AddMethodDuration("ContainerCount", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.ContainerCount") _, span := tracing.StartSpanFromContext(ctx, "metabase.ContainerCount")
@ -544,7 +545,7 @@ func (db *DB) ZeroSizeContainers(ctx context.Context) ([]cid.ID, error) {
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("ZeroSizeContainers", time.Since(startedAt), success) db.metrics.AddMethodDuration("ZeroSizeContainers", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
ctx, span := tracing.StartSpanFromContext(ctx, "metabase.ZeroSizeContainers") ctx, span := tracing.StartSpanFromContext(ctx, "metabase.ZeroSizeContainers")
@ -634,7 +635,7 @@ func (db *DB) DeleteContainerSize(ctx context.Context, id cid.ID) error {
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("DeleteContainerSize", time.Since(startedAt), success) db.metrics.AddMethodDuration("DeleteContainerSize", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.DeleteContainerSize", _, span := tracing.StartSpanFromContext(ctx, "metabase.DeleteContainerSize",
@ -672,7 +673,7 @@ func (db *DB) ZeroCountContainers(ctx context.Context) ([]cid.ID, error) {
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("ZeroCountContainers", time.Since(startedAt), success) db.metrics.AddMethodDuration("ZeroCountContainers", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
ctx, span := tracing.StartSpanFromContext(ctx, "metabase.ZeroCountContainers") ctx, span := tracing.StartSpanFromContext(ctx, "metabase.ZeroCountContainers")
@ -717,7 +718,7 @@ func (db *DB) DeleteContainerCount(ctx context.Context, id cid.ID) error {
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("DeleteContainerCount", time.Since(startedAt), success) db.metrics.AddMethodDuration("DeleteContainerCount", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.DeleteContainerCount", _, span := tracing.StartSpanFromContext(ctx, "metabase.DeleteContainerCount",

3
pkg/local_object_storage/metabase/delete.go
View file

@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
@ -89,7 +90,7 @@ func (db *DB) Delete(ctx context.Context, prm DeletePrm) (DeleteRes, error) {
deleted = false deleted = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("Delete", time.Since(startedAt), deleted) db.metrics.AddMethodDuration("Delete", time.Since(startedAt), deleted, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.Delete", _, span := tracing.StartSpanFromContext(ctx, "metabase.Delete",

3
pkg/local_object_storage/metabase/exists.go
View file

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
@ -62,7 +63,7 @@ func (db *DB) Exists(ctx context.Context, prm ExistsPrm) (res ExistsRes, err err
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("Exists", time.Since(startedAt), success) db.metrics.AddMethodDuration("Exists", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.Exists", _, span := tracing.StartSpanFromContext(ctx, "metabase.Exists",

3
pkg/local_object_storage/metabase/expired.go
View file

@ -7,6 +7,7 @@ import (
"strconv" "strconv"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
@ -27,7 +28,7 @@ func (db *DB) FilterExpired(ctx context.Context, epoch uint64, addresses []oid.A
success = true success = true
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("FilterExpired", time.Since(startedAt), success) db.metrics.AddMethodDuration("FilterExpired", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.FilterExpired", _, span := tracing.StartSpanFromContext(ctx, "metabase.FilterExpired",

3
pkg/local_object_storage/metabase/get.go
View file

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
@ -58,7 +59,7 @@ func (db *DB) Get(ctx context.Context, prm GetPrm) (res GetRes, err error) {
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("Get", time.Since(startedAt), success) db.metrics.AddMethodDuration("Get", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.Get", _, span := tracing.StartSpanFromContext(ctx, "metabase.Get",

7
pkg/local_object_storage/metabase/graveyard.go
View file

@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
@ -68,7 +69,7 @@ func (db *DB) IterateOverGarbage(ctx context.Context, p GarbageIterationPrm) err
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("IterateOverGarbage", time.Since(startedAt), success) db.metrics.AddMethodDuration("IterateOverGarbage", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.IterateOverGarbage") _, span := tracing.StartSpanFromContext(ctx, "metabase.IterateOverGarbage")
@ -148,7 +149,7 @@ func (db *DB) IterateOverGraveyard(ctx context.Context, p GraveyardIterationPrm)
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("IterateOverGraveyard", time.Since(startedAt), success) db.metrics.AddMethodDuration("IterateOverGraveyard", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.IterateOverGraveyard") _, span := tracing.StartSpanFromContext(ctx, "metabase.IterateOverGraveyard")
@ -266,7 +267,7 @@ func (db *DB) InhumeTombstones(ctx context.Context, tss []TombstonedObject) (Inh
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("InhumeTombstones", time.Since(startedAt), success) db.metrics.AddMethodDuration("InhumeTombstones", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.InhumeTombstones") _, span := tracing.StartSpanFromContext(ctx, "metabase.InhumeTombstones")

3
pkg/local_object_storage/metabase/inhume.go
View file

@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
@ -177,7 +178,7 @@ func (db *DB) Inhume(ctx context.Context, prm InhumePrm) (InhumeRes, error) {
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("Inhume", time.Since(startedAt), success) db.metrics.AddMethodDuration("Inhume", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.Inhume") _, span := tracing.StartSpanFromContext(ctx, "metabase.Inhume")
defer span.End() defer span.End()

3
pkg/local_object_storage/metabase/iterators.go
View file

@ -6,6 +6,7 @@ import (
"strconv" "strconv"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
@ -53,7 +54,7 @@ func (db *DB) IterateExpired(ctx context.Context, epoch uint64, h ExpiredObjectH
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("IterateExpired", time.Since(startedAt), success) db.metrics.AddMethodDuration("IterateExpired", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.IterateExpired", _, span := tracing.StartSpanFromContext(ctx, "metabase.IterateExpired",
trace.WithAttributes( trace.WithAttributes(

9
pkg/local_object_storage/metabase/list.go
View file

@ -5,6 +5,7 @@ import (
"context" "context"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
@ -99,7 +100,7 @@ func (db *DB) ListWithCursor(ctx context.Context, prm ListPrm) (res ListRes, err
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("ListWithCursor", time.Since(startedAt), success) db.metrics.AddMethodDuration("ListWithCursor", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.ListWithCursor", _, span := tracing.StartSpanFromContext(ctx, "metabase.ListWithCursor",
trace.WithAttributes( trace.WithAttributes(
@ -300,7 +301,7 @@ func (db *DB) IterateOverContainers(ctx context.Context, prm IterateOverContaine
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("IterateOverContainers", time.Since(startedAt), success) db.metrics.AddMethodDuration("IterateOverContainers", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.IterateOverContainers", _, span := tracing.StartSpanFromContext(ctx, "metabase.IterateOverContainers",
trace.WithAttributes( trace.WithAttributes(
@ -361,7 +362,7 @@ func (db *DB) IterateOverObjectsInContainer(ctx context.Context, prm IterateOver
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("IterateOverObjectsInContainer", time.Since(startedAt), success) db.metrics.AddMethodDuration("IterateOverObjectsInContainer", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.IterateOverObjectsInContainer", _, span := tracing.StartSpanFromContext(ctx, "metabase.IterateOverObjectsInContainer",
trace.WithAttributes( trace.WithAttributes(
@ -454,7 +455,7 @@ func (db *DB) CountAliveObjectsInContainer(ctx context.Context, prm CountAliveOb
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("CountAliveObjectsInBucket", time.Since(startedAt), success) db.metrics.AddMethodDuration("CountAliveObjectsInBucket", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.CountAliveObjectsInBucket") _, span := tracing.StartSpanFromContext(ctx, "metabase.CountAliveObjectsInBucket")
defer span.End() defer span.End()

11
pkg/local_object_storage/metabase/lock.go
View file

@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
@ -42,7 +43,7 @@ func (db *DB) Lock(ctx context.Context, cnr cid.ID, locker oid.ID, locked []oid.
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("Lock", time.Since(startedAt), success) db.metrics.AddMethodDuration("Lock", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.Lock", _, span := tracing.StartSpanFromContext(ctx, "metabase.Lock",
@ -125,13 +126,13 @@ func (db *DB) lockInternal(locked []oid.ID, cnr cid.ID, locker oid.ID) error {
// FreeLockedBy unlocks all objects in DB which are locked by lockers. // FreeLockedBy unlocks all objects in DB which are locked by lockers.
// Returns slice of unlocked object ID's or an error. // Returns slice of unlocked object ID's or an error.
func (db *DB) FreeLockedBy(lockers []oid.Address) ([]oid.Address, error) { func (db *DB) FreeLockedBy(ctx context.Context, lockers []oid.Address) ([]oid.Address, error) {
var ( var (
startedAt = time.Now() startedAt = time.Now()
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("FreeLockedBy", time.Since(startedAt), success) db.metrics.AddMethodDuration("FreeLockedBy", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
db.modeMtx.RLock() db.modeMtx.RLock()
@ -328,7 +329,7 @@ func (db *DB) IsLocked(ctx context.Context, prm IsLockedPrm) (res IsLockedRes, e
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("IsLocked", time.Since(startedAt), success) db.metrics.AddMethodDuration("IsLocked", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.IsLocked", _, span := tracing.StartSpanFromContext(ctx, "metabase.IsLocked",
@ -361,7 +362,7 @@ func (db *DB) GetLocks(ctx context.Context, addr oid.Address) (res []oid.ID, err
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("GetLocks", time.Since(startedAt), success) db.metrics.AddMethodDuration("GetLocks", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.GetLocks", _, span := tracing.StartSpanFromContext(ctx, "metabase.GetLocks",

4
pkg/local_object_storage/metabase/lock_test.go
View file

@ -121,7 +121,7 @@ func TestDB_Lock(t *testing.T) {
require.Len(t, res.DeletedLockObjects(), 1) require.Len(t, res.DeletedLockObjects(), 1)
require.Equal(t, objectcore.AddressOf(lockObj), res.DeletedLockObjects()[0]) require.Equal(t, objectcore.AddressOf(lockObj), res.DeletedLockObjects()[0])
_, err = db.FreeLockedBy([]oid.Address{lockAddr}) _, err = db.FreeLockedBy(context.Background(), []oid.Address{lockAddr})
require.NoError(t, err) require.NoError(t, err)
inhumePrm.SetAddresses(objAddr) inhumePrm.SetAddresses(objAddr)
@ -152,7 +152,7 @@ func TestDB_Lock(t *testing.T) {
// unlock just objects that were locked by // unlock just objects that were locked by
// just removed locker // just removed locker
_, err = db.FreeLockedBy([]oid.Address{res.DeletedLockObjects()[0]}) _, err = db.FreeLockedBy(context.Background(), []oid.Address{res.DeletedLockObjects()[0]})
require.NoError(t, err) require.NoError(t, err)
// removing objects after unlock // removing objects after unlock

10
pkg/local_object_storage/metabase/metrics.go
View file

@ -12,12 +12,12 @@ type Metrics interface {
SetMode(m mode.ComponentMode) SetMode(m mode.ComponentMode)
Close() Close()
AddMethodDuration(method string, d time.Duration, success bool) AddMethodDuration(method string, d time.Duration, success bool, ioTag string)
} }
type noopMetrics struct{} type noopMetrics struct{}
func (m *noopMetrics) SetParentID(string) {} func (m *noopMetrics) SetParentID(string) {}
func (m *noopMetrics) SetMode(mode.ComponentMode) {} func (m *noopMetrics) SetMode(mode.ComponentMode) {}
func (m *noopMetrics) Close() {} func (m *noopMetrics) Close() {}
func (m *noopMetrics) AddMethodDuration(string, time.Duration, bool) {} func (m *noopMetrics) AddMethodDuration(string, time.Duration, bool, string) {}

3
pkg/local_object_storage/metabase/put.go
View file

@ -9,6 +9,7 @@ import (
"strconv" "strconv"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
@ -73,7 +74,7 @@ func (db *DB) Put(ctx context.Context, prm PutPrm) (res PutRes, err error) {
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("Put", time.Since(startedAt), success) db.metrics.AddMethodDuration("Put", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.Put", _, span := tracing.StartSpanFromContext(ctx, "metabase.Put",

3
pkg/local_object_storage/metabase/select.go
View file

@ -8,6 +8,7 @@ import (
"strings" "strings"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
v2object "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/object" v2object "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/object"
@ -71,7 +72,7 @@ func (db *DB) Select(ctx context.Context, prm SelectPrm) (res SelectRes, err err
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("Select", time.Since(startedAt), success) db.metrics.AddMethodDuration("Select", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.Select", _, span := tracing.StartSpanFromContext(ctx, "metabase.Select",

5
pkg/local_object_storage/metabase/storage_id.go
View file

@ -5,6 +5,7 @@ import (
"context" "context"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing" "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
@ -41,7 +42,7 @@ func (db *DB) StorageID(ctx context.Context, prm StorageIDPrm) (StorageIDRes, er
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("StorageID", time.Since(startedAt), success) db.metrics.AddMethodDuration("StorageID", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.StorageID", _, span := tracing.StartSpanFromContext(ctx, "metabase.StorageID",
@ -107,7 +108,7 @@ func (db *DB) UpdateStorageID(ctx context.Context, prm UpdateStorageIDPrm) (res
success = false success = false
) )
defer func() { defer func() {
db.metrics.AddMethodDuration("UpdateStorageID", time.Since(startedAt), success) db.metrics.AddMethodDuration("UpdateStorageID", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "metabase.UpdateStorageID", _, span := tracing.StartSpanFromContext(ctx, "metabase.UpdateStorageID",

4
pkg/local_object_storage/metrics/metabase.go
View file

@ -34,6 +34,6 @@ func (m *metabaseMetrics) Close() {
m.m.Close(m.shardID, m.path) m.m.Close(m.shardID, m.path)
} }
func (m *metabaseMetrics) AddMethodDuration(method string, d time.Duration, success bool) { func (m *metabaseMetrics) AddMethodDuration(method string, d time.Duration, success bool, ioTag string) {
m.m.MethodDuration(m.shardID, m.path, method, d, success) m.m.MethodDuration(m.shardID, m.path, method, d, success, ioTag)
} }

4
pkg/local_object_storage/shard/gc.go
View file

@ -664,7 +664,7 @@ func (s *Shard) HandleExpiredLocks(ctx context.Context, epoch uint64, lockers []
if s.GetMode().NoMetabase() { if s.GetMode().NoMetabase() {
return return
} }
unlocked, err := s.metaBase.FreeLockedBy(lockers) unlocked, err := s.metaBase.FreeLockedBy(ctx, lockers)
if err != nil { if err != nil {
s.log.Warn(ctx, logs.ShardFailureToUnlockObjects, s.log.Warn(ctx, logs.ShardFailureToUnlockObjects,
zap.Error(err), zap.Error(err),
@ -721,7 +721,7 @@ func (s *Shard) HandleDeletedLocks(ctx context.Context, lockers []oid.Address) {
return return
} }
_, err := s.metaBase.FreeLockedBy(lockers) _, err := s.metaBase.FreeLockedBy(ctx, lockers)
if err != nil { if err != nil {
s.log.Warn(ctx, logs.ShardFailureToUnlockObjects, s.log.Warn(ctx, logs.ShardFailureToUnlockObjects,
zap.Error(err), zap.Error(err),