Skip to content

Commit

Permalink
remove unused parametr
Browse files Browse the repository at this point in the history
  • Loading branch information
@almostinf
almostinf committed Apr 27, 2024
1 parent 25406f9 commit a5e13ea
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 83 deletions.
12 changes: 6 additions & 6 deletions database/redis/metric.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ func (connector *DbConnector) RemoveMetricRetention(metric string) error {
}

// RemoveMetricValues remove metric timestamps values from 0 to given time.
func (connector *DbConnector) RemoveMetricValues(metric string, from, to string, needCheckMetricInCache bool) (int64, error) {
if needCheckMetricInCache && !connector.needRemoveMetrics(metric) {
func (connector *DbConnector) RemoveMetricValues(metric string, from, to string) (int64, error) {
if !connector.needRemoveMetrics(metric) {
return 0, nil
}

Expand Down Expand Up @@ -350,15 +350,15 @@ func (connector *DbConnector) needRemoveMetrics(metric string) bool {
return err == nil
}

func cleanUpMetricsOnRedisNode(connector *DbConnector, client redis.UniversalClient, from, to string, checkMetricInCache bool) error {
func cleanUpMetricsOnRedisNode(connector *DbConnector, client redis.UniversalClient, from, to string) error {
metricsIterator := client.ScanType(connector.context, 0, metricDataKey("*"), 0, "zset").Iterator()
var count int64

for metricsIterator.Next(connector.context) {
key := metricsIterator.Val()
metric := strings.TrimPrefix(key, metricDataKey(""))

deletedCount, err := connector.RemoveMetricValues(metric, from, to, checkMetricInCache)
deletedCount, err := connector.RemoveMetricValues(metric, from, to)
if err != nil {
return err
}
Expand Down Expand Up @@ -404,7 +404,7 @@ func (connector *DbConnector) CleanUpOutdatedMetrics(duration time.Duration) err
to := strconv.FormatInt(toTs, 10)

return connector.callFunc(func(connector *DbConnector, client redis.UniversalClient) error {
return cleanUpMetricsOnRedisNode(connector, client, from, to, true)
return cleanUpMetricsOnRedisNode(connector, client, from, to)
})
}

Expand All @@ -418,7 +418,7 @@ func (connector *DbConnector) CleanUpFutureMetrics(duration time.Duration) error
to := "+inf"

return connector.callFunc(func(connector *DbConnector, client redis.UniversalClient) error {
return cleanUpMetricsOnRedisNode(connector, client, from, to, false)
return cleanUpMetricsOnRedisNode(connector, client, from, to)
})
}

Expand Down
111 changes: 39 additions & 72 deletions database/redis/metric_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ func TestRemoveMetricValues(t *testing.T) {
defer dataBase.Flush()

Convey("Test that old metrics will be deleted", t, func() {
needCheckMetricInCache := true
metric1 := "my.test.super.metric"
pattern := "my.test.*.metric*"
met1 := &moira.MatchedMetric{
Expand Down Expand Up @@ -306,7 +305,7 @@ func TestRemoveMetricValues(t *testing.T) {

var toTs int64 = 11
to := strconv.FormatInt(toTs, 10)
deletedCount, err := dataBase.RemoveMetricValues(metric1, from, to, needCheckMetricInCache)
deletedCount, err := dataBase.RemoveMetricValues(metric1, from, to)
So(err, ShouldBeNil)
So(deletedCount, ShouldResemble, int64(1))

Expand All @@ -322,7 +321,7 @@ func TestRemoveMetricValues(t *testing.T) {

toTs = 22
to = strconv.FormatInt(toTs, 10)
deletedCount, err = dataBase.RemoveMetricValues(metric1, from, to, needCheckMetricInCache)
deletedCount, err = dataBase.RemoveMetricValues(metric1, from, to)
So(err, ShouldBeNil)
So(deletedCount, ShouldResemble, int64(0))

Expand Down Expand Up @@ -367,7 +366,7 @@ func TestRemoveMetricValues(t *testing.T) {

toTs = 30
to = strconv.FormatInt(toTs, 10)
deletedCount, err = dataBase.RemoveMetricValues(metric1, from, to, needCheckMetricInCache)
deletedCount, err = dataBase.RemoveMetricValues(metric1, from, to)
So(err, ShouldBeNil)
So(deletedCount, ShouldResemble, int64(1))

Expand All @@ -383,7 +382,7 @@ func TestRemoveMetricValues(t *testing.T) {

toTs = 39
to = strconv.FormatInt(toTs, 10)
deletedCount, err = dataBase.RemoveMetricValues(metric1, from, to, needCheckMetricInCache)
deletedCount, err = dataBase.RemoveMetricValues(metric1, from, to)
So(err, ShouldBeNil)
So(deletedCount, ShouldResemble, int64(0))

Expand All @@ -399,7 +398,7 @@ func TestRemoveMetricValues(t *testing.T) {

toTs = 49
to = strconv.FormatInt(toTs, 10)
deletedCount, err = dataBase.RemoveMetricValues(metric1, from, to, needCheckMetricInCache)
deletedCount, err = dataBase.RemoveMetricValues(metric1, from, to)
So(err, ShouldBeNil)
So(deletedCount, ShouldResemble, int64(1))

Expand Down Expand Up @@ -452,7 +451,10 @@ func TestRemoveMetricValues(t *testing.T) {
}

Convey("Deleting metrics over the entire interval (from -inf to +inf)", func() {
needCheckMetricInCache := false
defer func() {
dataBase.metricsCache.Flush()
}()

from := fromInf
to := toInf

Expand All @@ -467,6 +469,8 @@ func TestRemoveMetricValues(t *testing.T) {
err = dataBase.SaveMetrics(map[string]*moira.MatchedMetric{metric: metric5})
So(err, ShouldBeNil)

dataBase.metricsCache.Flush()

actualValues, err := dataBase.GetMetricsValues([]string{metric}, 1, 99)
So(err, ShouldBeNil)
So(actualValues, ShouldResemble, map[string][]*moira.MetricValue{
Expand All @@ -479,7 +483,7 @@ func TestRemoveMetricValues(t *testing.T) {
},
})

deletedMetrics, err := dataBase.RemoveMetricValues(metric, from, to, needCheckMetricInCache)
deletedMetrics, err := dataBase.RemoveMetricValues(metric, from, to)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 5)

Expand All @@ -490,12 +494,13 @@ func TestRemoveMetricValues(t *testing.T) {

Convey("Deletion of metrics on the interval up to the first metric (from -inf to 5)", func() {
defer func() {
deletedMetrics, err := dataBase.RemoveMetricValues(metric, fromInf, toInf, false)
dataBase.metricsCache.Flush()

deletedMetrics, err := dataBase.RemoveMetricValues(metric, fromInf, toInf)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 5)
}()

needCheckMetricInCache := false
from := fromInf
to := "5"

Expand All @@ -510,7 +515,9 @@ func TestRemoveMetricValues(t *testing.T) {
err = dataBase.SaveMetrics(map[string]*moira.MatchedMetric{metric: metric5})
So(err, ShouldBeNil)

deletedMetrics, err := dataBase.RemoveMetricValues(metric, from, to, needCheckMetricInCache)
dataBase.metricsCache.Flush()

deletedMetrics, err := dataBase.RemoveMetricValues(metric, from, to)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 0)

Expand All @@ -529,12 +536,13 @@ func TestRemoveMetricValues(t *testing.T) {

Convey("Deleting metrics on the interval after the last metric (from 60 to +inf)", func() {
defer func() {
deletedMetrics, err := dataBase.RemoveMetricValues(metric, fromInf, toInf, false)
dataBase.metricsCache.Flush()

deletedMetrics, err := dataBase.RemoveMetricValues(metric, fromInf, toInf)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 5)
}()

needCheckMetricInCache := false
from := "60"
to := toInf

Expand All @@ -549,7 +557,9 @@ func TestRemoveMetricValues(t *testing.T) {
err = dataBase.SaveMetrics(map[string]*moira.MatchedMetric{metric: metric5})
So(err, ShouldBeNil)

deletedMetrics, err := dataBase.RemoveMetricValues(metric, from, to, needCheckMetricInCache)
dataBase.metricsCache.Flush()

deletedMetrics, err := dataBase.RemoveMetricValues(metric, from, to)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 0)

Expand All @@ -568,12 +578,13 @@ func TestRemoveMetricValues(t *testing.T) {

Convey("Deleting metrics inside the metric interval (from 20 to 40)", func() {
defer func() {
deletedMetrics, err := dataBase.RemoveMetricValues(metric, fromInf, toInf, false)
dataBase.metricsCache.Flush()

deletedMetrics, err := dataBase.RemoveMetricValues(metric, fromInf, toInf)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 2)
}()

needCheckMetricInCache := false
from := "20"
to := "40"

Expand All @@ -588,7 +599,9 @@ func TestRemoveMetricValues(t *testing.T) {
err = dataBase.SaveMetrics(map[string]*moira.MatchedMetric{metric: metric5})
So(err, ShouldBeNil)

deletedMetrics, err := dataBase.RemoveMetricValues(metric, from, to, needCheckMetricInCache)
dataBase.metricsCache.Flush()

deletedMetrics, err := dataBase.RemoveMetricValues(metric, from, to)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 3)

Expand All @@ -601,60 +614,6 @@ func TestRemoveMetricValues(t *testing.T) {
},
})
})

Convey("Check operation needCheckMetricInCheck", func() {
defer func() {
deletedMetrics, err := dataBase.RemoveMetricValues(metric, fromInf, toInf, false)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 3)
}()

needCheckMetricInCache := true
from := "10"
to := "20"

err := dataBase.SaveMetrics(map[string]*moira.MatchedMetric{metric: metric1})
So(err, ShouldBeNil)
err = dataBase.SaveMetrics(map[string]*moira.MatchedMetric{metric: metric2})
So(err, ShouldBeNil)
err = dataBase.SaveMetrics(map[string]*moira.MatchedMetric{metric: metric3})
So(err, ShouldBeNil)
err = dataBase.SaveMetrics(map[string]*moira.MatchedMetric{metric: metric4})
So(err, ShouldBeNil)
err = dataBase.SaveMetrics(map[string]*moira.MatchedMetric{metric: metric5})
So(err, ShouldBeNil)

deletedMetrics, err := dataBase.RemoveMetricValues(metric, from, to, needCheckMetricInCache)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 2)

actualValues, err := dataBase.GetMetricsValues([]string{metric}, 1, 99)
So(err, ShouldBeNil)
So(actualValues, ShouldResemble, map[string][]*moira.MetricValue{
metric: {
&moira.MetricValue{Timestamp: 30, RetentionTimestamp: 30, Value: 3},
&moira.MetricValue{Timestamp: 40, RetentionTimestamp: 40, Value: 4},
&moira.MetricValue{Timestamp: 50, RetentionTimestamp: 50, Value: 5},
},
})

from = "30"
to = "50"

deletedMetrics, err = dataBase.RemoveMetricValues(metric, from, to, needCheckMetricInCache)
So(err, ShouldBeNil)
So(deletedMetrics, ShouldEqual, 0)

actualValues, err = dataBase.GetMetricsValues([]string{metric}, 1, 99)
So(err, ShouldBeNil)
So(actualValues, ShouldResemble, map[string][]*moira.MetricValue{
metric: {
&moira.MetricValue{Timestamp: 30, RetentionTimestamp: 30, Value: 3},
&moira.MetricValue{Timestamp: 40, RetentionTimestamp: 40, Value: 4},
&moira.MetricValue{Timestamp: 50, RetentionTimestamp: 50, Value: 5},
},
})
})
})
}

Expand Down Expand Up @@ -769,7 +728,7 @@ func TestMetricsStoringErrorConnection(t *testing.T) {
from := fromInf
var toTs int64 = 1
to := strconv.FormatInt(toTs, 10)
deletedCount, err := dataBase.RemoveMetricValues("123", from, to, true)
deletedCount, err := dataBase.RemoveMetricValues("123", from, to)
So(err, ShouldNotBeNil)
So(deletedCount, ShouldResemble, int64(0))

Expand Down Expand Up @@ -996,6 +955,10 @@ func TestCleanupFutureMetrics(t *testing.T) {
}

Convey("Without future metrics", func() {
defer func() {
dataBase.metricsCache.Flush()
}()

err := dataBase.SaveMetrics(map[string]*moira.MatchedMetric{
metric1: matchedMetric1,
metric2: matchedMetric3,
Expand Down Expand Up @@ -1052,6 +1015,10 @@ func TestCleanupFutureMetrics(t *testing.T) {
})

Convey("With future metrics", func() {
defer func() {
dataBase.metricsCache.Flush()
}()

err := dataBase.SaveMetrics(map[string]*moira.MatchedMetric{
metric1: matchedMetric1,
metric2: matchedMetric3,
Expand Down
2 changes: 1 addition & 1 deletion interfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ type Database interface {
GetMetricRetention(metric string) (int64, error)
GetMetricsValues(metrics []string, from int64, until int64) (map[string][]*MetricValue, error)
RemoveMetricRetention(metric string) error
RemoveMetricValues(metric string, from, to string, needCheckMetricInCache bool) (int64, error)
RemoveMetricValues(metric string, from, to string) (int64, error)
RemoveMetricsValues(metrics []string, toTime int64) error
GetMetricsTTLSeconds() int64

Expand Down
8 changes: 4 additions & 4 deletions mock/moira-alert/database.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a5e13ea

Please sign in to comment.