2015-01-21 11:07:45 -08:00
|
|
|
// Copyright 2014 The Prometheus Authors
|
2014-09-19 09:18:44 -07:00
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
2014-09-16 06:47:24 -07:00
|
|
|
package local
|
2014-06-06 02:55:53 -07:00
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
2015-06-22 03:02:03 -07:00
|
|
|
"hash/fnv"
|
2014-08-14 09:23:49 -07:00
|
|
|
"math/rand"
|
2015-09-11 06:47:23 -07:00
|
|
|
"os"
|
2015-07-13 12:12:27 -07:00
|
|
|
"reflect"
|
2014-06-06 02:55:53 -07:00
|
|
|
"testing"
|
2014-08-14 09:23:49 -07:00
|
|
|
"testing/quick"
|
2014-06-06 02:55:53 -07:00
|
|
|
"time"
|
|
|
|
|
2015-10-03 01:21:43 -07:00
|
|
|
"github.com/prometheus/common/log"
|
2015-08-20 08:18:46 -07:00
|
|
|
"github.com/prometheus/common/model"
|
Improve persisting chunks to disk.
This is done by bucketing chunks by fingerprint. If the persisting to
disk falls behind, more and more chunks are in the queue. As soon as
there are "double hits", we will now persist both chunks in one go,
doubling the disk throughput (assuming it is limited by disk
seeks). Should even more pile up so that we end wit "triple hits", we
will persist those first, and so on.
Even if we have millions of time series, this will still help,
assuming not all of them are growing with the same speed. Series that
get many samples and/or are not very compressable will accumulate
chunks faster, and they will soon get double- or triple-writes.
To improve the chance of double writes,
-storage.local.persistence-queue-capacity could be set to a higher
value. However, that will slow down shutdown a lot (as the queue has
to be worked through). So we leave it to the user to set it to a
really high value. A more fundamental solution would be to checkpoint
not only head chunks, but also chunks still in the persist queue. That
would be quite complicated for a rather limited use-case (running many
time series with high ingestion rate on slow spinning disks).
2015-02-13 11:08:52 -08:00
|
|
|
|
2014-08-14 09:23:49 -07:00
|
|
|
"github.com/prometheus/prometheus/storage/metric"
|
2015-05-29 04:30:30 -07:00
|
|
|
"github.com/prometheus/prometheus/util/testutil"
|
2014-06-06 02:55:53 -07:00
|
|
|
)
|
|
|
|
|
2015-06-15 09:25:31 -07:00
|
|
|
func TestMatches(t *testing.T) {
|
2015-03-04 04:40:18 -08:00
|
|
|
storage, closer := NewTestStorage(t, 1)
|
2015-02-27 05:41:43 -08:00
|
|
|
defer closer.Close()
|
2014-10-28 11:01:41 -07:00
|
|
|
|
2016-03-09 11:27:50 -08:00
|
|
|
storage.archiveHighWatermark = 90
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make([]*model.Sample, 100)
|
|
|
|
fingerprints := make(model.Fingerprints, 100)
|
2015-02-27 05:41:43 -08:00
|
|
|
|
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
metric := model.Metric{
|
|
|
|
model.MetricNameLabel: model.LabelValue(fmt.Sprintf("test_metric_%d", i)),
|
|
|
|
"label1": model.LabelValue(fmt.Sprintf("test_%d", i/10)),
|
|
|
|
"label2": model.LabelValue(fmt.Sprintf("test_%d", (i+5)/10)),
|
|
|
|
"all": "const",
|
2015-02-27 05:41:43 -08:00
|
|
|
}
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
2015-02-27 05:41:43 -08:00
|
|
|
Metric: metric,
|
2015-08-20 08:18:46 -07:00
|
|
|
Timestamp: model.Time(i),
|
|
|
|
Value: model.SampleValue(i),
|
2015-02-27 05:41:43 -08:00
|
|
|
}
|
2015-05-05 09:17:51 -07:00
|
|
|
fingerprints[i] = metric.FastFingerprint()
|
2015-02-27 05:41:43 -08:00
|
|
|
}
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, s := range samples {
|
|
|
|
storage.Append(s)
|
|
|
|
}
|
2015-02-27 05:41:43 -08:00
|
|
|
storage.WaitForIndexing()
|
|
|
|
|
2016-03-09 11:27:50 -08:00
|
|
|
// Archive every tenth metric.
|
|
|
|
for i, fp := range fingerprints {
|
|
|
|
if i%10 != 0 {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
s, ok := storage.fpToSeries.get(fp)
|
|
|
|
if !ok {
|
|
|
|
t.Fatal("could not retrieve series for fp", fp)
|
|
|
|
}
|
|
|
|
storage.fpLocker.Lock(fp)
|
|
|
|
storage.persistence.archiveMetric(fp, s.metric, s.firstTime(), s.lastTime)
|
|
|
|
storage.fpLocker.Unlock(fp)
|
|
|
|
}
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
newMatcher := func(matchType metric.MatchType, name model.LabelName, value model.LabelValue) *metric.LabelMatcher {
|
2015-02-27 05:41:43 -08:00
|
|
|
lm, err := metric.NewLabelMatcher(matchType, name, value)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error creating label matcher: %s", err)
|
|
|
|
}
|
|
|
|
return lm
|
|
|
|
}
|
|
|
|
|
|
|
|
var matcherTests = []struct {
|
|
|
|
matchers metric.LabelMatchers
|
2015-08-20 08:18:46 -07:00
|
|
|
expected model.Fingerprints
|
2015-02-27 05:41:43 -08:00
|
|
|
}{
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{newMatcher(metric.Equal, "label1", "x")},
|
2015-08-20 08:18:46 -07:00
|
|
|
expected: model.Fingerprints{},
|
2015-02-27 05:41:43 -08:00
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{newMatcher(metric.Equal, "label1", "test_0")},
|
|
|
|
expected: fingerprints[:10],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.Equal, "label1", "test_0"),
|
|
|
|
newMatcher(metric.Equal, "label2", "test_1"),
|
|
|
|
},
|
|
|
|
expected: fingerprints[5:10],
|
|
|
|
},
|
|
|
|
{
|
2015-06-15 09:25:31 -07:00
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.Equal, "all", "const"),
|
|
|
|
newMatcher(metric.NotEqual, "label1", "x"),
|
|
|
|
},
|
2015-02-27 05:41:43 -08:00
|
|
|
expected: fingerprints,
|
|
|
|
},
|
|
|
|
{
|
2015-06-15 09:25:31 -07:00
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.Equal, "all", "const"),
|
|
|
|
newMatcher(metric.NotEqual, "label1", "test_0"),
|
|
|
|
},
|
2015-02-27 05:41:43 -08:00
|
|
|
expected: fingerprints[10:],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
2015-06-15 09:25:31 -07:00
|
|
|
newMatcher(metric.Equal, "all", "const"),
|
2015-02-27 05:41:43 -08:00
|
|
|
newMatcher(metric.NotEqual, "label1", "test_0"),
|
|
|
|
newMatcher(metric.NotEqual, "label1", "test_1"),
|
|
|
|
newMatcher(metric.NotEqual, "label1", "test_2"),
|
|
|
|
},
|
|
|
|
expected: fingerprints[30:],
|
|
|
|
},
|
|
|
|
{
|
2015-06-15 09:25:31 -07:00
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.Equal, "label1", ""),
|
|
|
|
},
|
|
|
|
expected: fingerprints[:0],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.NotEqual, "label1", "test_0"),
|
|
|
|
newMatcher(metric.Equal, "label1", ""),
|
|
|
|
},
|
|
|
|
expected: fingerprints[:0],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.NotEqual, "label1", "test_0"),
|
|
|
|
newMatcher(metric.Equal, "label2", ""),
|
|
|
|
},
|
|
|
|
expected: fingerprints[:0],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.Equal, "all", "const"),
|
|
|
|
newMatcher(metric.NotEqual, "label1", "test_0"),
|
|
|
|
newMatcher(metric.Equal, "not_existant", ""),
|
|
|
|
},
|
|
|
|
expected: fingerprints[10:],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.RegexMatch, "label1", `test_[3-5]`),
|
|
|
|
},
|
2015-02-27 05:41:43 -08:00
|
|
|
expected: fingerprints[30:60],
|
|
|
|
},
|
|
|
|
{
|
2015-06-15 09:25:31 -07:00
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.Equal, "all", "const"),
|
|
|
|
newMatcher(metric.RegexNoMatch, "label1", `test_[3-5]`),
|
|
|
|
},
|
2015-08-20 08:18:46 -07:00
|
|
|
expected: append(append(model.Fingerprints{}, fingerprints[:30]...), fingerprints[60:]...),
|
2015-02-27 05:41:43 -08:00
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.RegexMatch, "label1", `test_[3-5]`),
|
|
|
|
newMatcher(metric.RegexMatch, "label2", `test_[4-6]`),
|
|
|
|
},
|
|
|
|
expected: fingerprints[35:60],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.RegexMatch, "label1", `test_[3-5]`),
|
|
|
|
newMatcher(metric.NotEqual, "label2", `test_4`),
|
|
|
|
},
|
2015-08-20 08:18:46 -07:00
|
|
|
expected: append(append(model.Fingerprints{}, fingerprints[30:35]...), fingerprints[45:60]...),
|
2015-02-27 05:41:43 -08:00
|
|
|
},
|
2015-07-23 13:46:13 -07:00
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.Equal, "label1", `nonexistent`),
|
|
|
|
newMatcher(metric.RegexMatch, "label2", `test`),
|
|
|
|
},
|
2015-08-20 08:18:46 -07:00
|
|
|
expected: model.Fingerprints{},
|
2015-07-23 13:46:13 -07:00
|
|
|
},
|
|
|
|
{
|
|
|
|
matchers: metric.LabelMatchers{
|
|
|
|
newMatcher(metric.Equal, "label1", `test_0`),
|
|
|
|
newMatcher(metric.RegexMatch, "label2", `nonexistent`),
|
|
|
|
},
|
2015-08-20 08:18:46 -07:00
|
|
|
expected: model.Fingerprints{},
|
2015-07-23 13:46:13 -07:00
|
|
|
},
|
2015-02-27 05:41:43 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
for _, mt := range matcherTests {
|
2016-03-08 15:09:42 -08:00
|
|
|
res := storage.MetricsForLabelMatchers(
|
|
|
|
model.Earliest, model.Latest,
|
|
|
|
mt.matchers...,
|
|
|
|
)
|
2015-06-15 09:25:31 -07:00
|
|
|
if len(mt.expected) != len(res) {
|
|
|
|
t.Fatalf("expected %d matches for %q, found %d", len(mt.expected), mt.matchers, len(res))
|
2015-02-27 05:41:43 -08:00
|
|
|
}
|
2015-06-15 09:25:31 -07:00
|
|
|
for fp1 := range res {
|
2015-02-27 05:41:43 -08:00
|
|
|
found := false
|
|
|
|
for _, fp2 := range mt.expected {
|
|
|
|
if fp1 == fp2 {
|
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !found {
|
|
|
|
t.Errorf("expected fingerprint %s for %q not in result", fp1, mt.matchers)
|
|
|
|
}
|
|
|
|
}
|
2016-03-09 11:27:50 -08:00
|
|
|
// Smoketest for from/through.
|
|
|
|
if len(storage.MetricsForLabelMatchers(
|
|
|
|
model.Earliest, -10000,
|
|
|
|
mt.matchers...,
|
|
|
|
)) > 0 {
|
|
|
|
t.Error("expected no matches with 'through' older than any sample")
|
|
|
|
}
|
|
|
|
if len(storage.MetricsForLabelMatchers(
|
|
|
|
10000, model.Latest,
|
|
|
|
mt.matchers...,
|
|
|
|
)) > 0 {
|
|
|
|
t.Error("expected no matches with 'from' newer than any sample")
|
|
|
|
}
|
|
|
|
// Now the tricky one, cut out something from the middle.
|
|
|
|
var (
|
|
|
|
from model.Time = 25
|
|
|
|
through model.Time = 75
|
|
|
|
)
|
|
|
|
res = storage.MetricsForLabelMatchers(
|
|
|
|
from, through,
|
|
|
|
mt.matchers...,
|
|
|
|
)
|
|
|
|
expected := model.Fingerprints{}
|
|
|
|
for _, fp := range mt.expected {
|
|
|
|
i := 0
|
|
|
|
for ; fingerprints[i] != fp && i < len(fingerprints); i++ {
|
|
|
|
}
|
|
|
|
if i == len(fingerprints) {
|
|
|
|
t.Fatal("expected fingerprint does not exist")
|
|
|
|
}
|
|
|
|
if !model.Time(i).Before(from) && !model.Time(i).After(through) {
|
|
|
|
expected = append(expected, fp)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(expected) != len(res) {
|
|
|
|
t.Errorf("expected %d range-limited matches for %q, found %d", len(expected), mt.matchers, len(res))
|
|
|
|
}
|
|
|
|
for fp1 := range res {
|
|
|
|
found := false
|
|
|
|
for _, fp2 := range expected {
|
|
|
|
if fp1 == fp2 {
|
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !found {
|
|
|
|
t.Errorf("expected fingerprint %s for %q not in range-limited result", fp1, mt.matchers)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-27 05:41:43 -08:00
|
|
|
}
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
|
|
|
|
2015-06-15 09:25:31 -07:00
|
|
|
func TestFingerprintsForLabels(t *testing.T) {
|
|
|
|
storage, closer := NewTestStorage(t, 1)
|
|
|
|
defer closer.Close()
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make([]*model.Sample, 100)
|
|
|
|
fingerprints := make(model.Fingerprints, 100)
|
2015-06-15 09:25:31 -07:00
|
|
|
|
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
metric := model.Metric{
|
|
|
|
model.MetricNameLabel: model.LabelValue(fmt.Sprintf("test_metric_%d", i)),
|
|
|
|
"label1": model.LabelValue(fmt.Sprintf("test_%d", i/10)),
|
|
|
|
"label2": model.LabelValue(fmt.Sprintf("test_%d", (i+5)/10)),
|
2015-06-15 09:25:31 -07:00
|
|
|
}
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
2015-06-15 09:25:31 -07:00
|
|
|
Metric: metric,
|
2015-08-20 08:18:46 -07:00
|
|
|
Timestamp: model.Time(i),
|
|
|
|
Value: model.SampleValue(i),
|
2015-06-15 09:25:31 -07:00
|
|
|
}
|
|
|
|
fingerprints[i] = metric.FastFingerprint()
|
|
|
|
}
|
|
|
|
for _, s := range samples {
|
|
|
|
storage.Append(s)
|
|
|
|
}
|
|
|
|
storage.WaitForIndexing()
|
|
|
|
|
|
|
|
var matcherTests = []struct {
|
2015-08-22 04:32:13 -07:00
|
|
|
pairs []model.LabelPair
|
2015-08-20 08:18:46 -07:00
|
|
|
expected model.Fingerprints
|
2015-06-15 09:25:31 -07:00
|
|
|
}{
|
|
|
|
{
|
2015-08-22 04:32:13 -07:00
|
|
|
pairs: []model.LabelPair{{"label1", "x"}},
|
2015-06-15 09:25:31 -07:00
|
|
|
expected: fingerprints[:0],
|
|
|
|
},
|
|
|
|
{
|
2015-08-22 04:32:13 -07:00
|
|
|
pairs: []model.LabelPair{{"label1", "test_0"}},
|
2015-06-15 09:25:31 -07:00
|
|
|
expected: fingerprints[:10],
|
|
|
|
},
|
|
|
|
{
|
2015-08-22 04:32:13 -07:00
|
|
|
pairs: []model.LabelPair{
|
2015-06-15 09:25:31 -07:00
|
|
|
{"label1", "test_0"},
|
|
|
|
{"label1", "test_1"},
|
|
|
|
},
|
|
|
|
expected: fingerprints[:0],
|
|
|
|
},
|
|
|
|
{
|
2015-08-22 04:32:13 -07:00
|
|
|
pairs: []model.LabelPair{
|
2015-06-15 09:25:31 -07:00
|
|
|
{"label1", "test_0"},
|
|
|
|
{"label2", "test_1"},
|
|
|
|
},
|
|
|
|
expected: fingerprints[5:10],
|
|
|
|
},
|
|
|
|
{
|
2015-08-22 04:32:13 -07:00
|
|
|
pairs: []model.LabelPair{
|
2015-06-15 09:25:31 -07:00
|
|
|
{"label1", "test_1"},
|
|
|
|
{"label2", "test_2"},
|
|
|
|
},
|
|
|
|
expected: fingerprints[15:20],
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, mt := range matcherTests {
|
|
|
|
resfps := storage.fingerprintsForLabelPairs(mt.pairs...)
|
|
|
|
if len(mt.expected) != len(resfps) {
|
|
|
|
t.Fatalf("expected %d matches for %q, found %d", len(mt.expected), mt.pairs, len(resfps))
|
|
|
|
}
|
|
|
|
for fp1 := range resfps {
|
|
|
|
found := false
|
|
|
|
for _, fp2 := range mt.expected {
|
|
|
|
if fp1 == fp2 {
|
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !found {
|
|
|
|
t.Errorf("expected fingerprint %s for %q not in result", fp1, mt.pairs)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-24 09:04:26 -07:00
|
|
|
var benchLabelMatchingRes map[model.Fingerprint]metric.Metric
|
2015-06-22 03:02:03 -07:00
|
|
|
|
|
|
|
func BenchmarkLabelMatching(b *testing.B) {
|
|
|
|
s, closer := NewTestStorage(b, 1)
|
|
|
|
defer closer.Close()
|
|
|
|
|
|
|
|
h := fnv.New64a()
|
2015-08-20 08:18:46 -07:00
|
|
|
lbl := func(x int) model.LabelValue {
|
2015-06-22 03:02:03 -07:00
|
|
|
h.Reset()
|
|
|
|
h.Write([]byte(fmt.Sprintf("%d", x)))
|
2015-08-20 08:18:46 -07:00
|
|
|
return model.LabelValue(fmt.Sprintf("%d", h.Sum64()))
|
2015-06-22 03:02:03 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
M := 32
|
2015-08-20 08:18:46 -07:00
|
|
|
met := model.Metric{}
|
2015-06-22 03:02:03 -07:00
|
|
|
for i := 0; i < M; i++ {
|
|
|
|
met["label_a"] = lbl(i)
|
|
|
|
for j := 0; j < M; j++ {
|
|
|
|
met["label_b"] = lbl(j)
|
|
|
|
for k := 0; k < M; k++ {
|
|
|
|
met["label_c"] = lbl(k)
|
|
|
|
for l := 0; l < M; l++ {
|
|
|
|
met["label_d"] = lbl(l)
|
2015-08-20 08:18:46 -07:00
|
|
|
s.Append(&model.Sample{
|
2015-06-22 03:02:03 -07:00
|
|
|
Metric: met.Clone(),
|
|
|
|
Timestamp: 0,
|
|
|
|
Value: 1,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s.WaitForIndexing()
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
newMatcher := func(matchType metric.MatchType, name model.LabelName, value model.LabelValue) *metric.LabelMatcher {
|
2015-06-22 03:02:03 -07:00
|
|
|
lm, err := metric.NewLabelMatcher(matchType, name, value)
|
|
|
|
if err != nil {
|
|
|
|
b.Fatalf("error creating label matcher: %s", err)
|
|
|
|
}
|
|
|
|
return lm
|
|
|
|
}
|
|
|
|
|
|
|
|
var matcherTests = []metric.LabelMatchers{
|
|
|
|
{
|
|
|
|
newMatcher(metric.Equal, "label_a", lbl(1)),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
newMatcher(metric.Equal, "label_a", lbl(3)),
|
|
|
|
newMatcher(metric.Equal, "label_c", lbl(3)),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
newMatcher(metric.Equal, "label_a", lbl(3)),
|
|
|
|
newMatcher(metric.Equal, "label_c", lbl(3)),
|
|
|
|
newMatcher(metric.NotEqual, "label_d", lbl(3)),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
newMatcher(metric.Equal, "label_a", lbl(3)),
|
|
|
|
newMatcher(metric.Equal, "label_b", lbl(3)),
|
|
|
|
newMatcher(metric.Equal, "label_c", lbl(3)),
|
|
|
|
newMatcher(metric.NotEqual, "label_d", lbl(3)),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
newMatcher(metric.RegexMatch, "label_a", ".+"),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
newMatcher(metric.Equal, "label_a", lbl(3)),
|
|
|
|
newMatcher(metric.RegexMatch, "label_a", ".+"),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
newMatcher(metric.Equal, "label_a", lbl(1)),
|
|
|
|
newMatcher(metric.RegexMatch, "label_c", "("+lbl(3)+"|"+lbl(10)+")"),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
newMatcher(metric.Equal, "label_a", lbl(3)),
|
|
|
|
newMatcher(metric.Equal, "label_a", lbl(4)),
|
|
|
|
newMatcher(metric.RegexMatch, "label_c", "("+lbl(3)+"|"+lbl(10)+")"),
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
b.ReportAllocs()
|
|
|
|
b.ResetTimer()
|
|
|
|
|
|
|
|
for i := 0; i < b.N; i++ {
|
2015-08-24 09:04:26 -07:00
|
|
|
benchLabelMatchingRes = map[model.Fingerprint]metric.Metric{}
|
2015-06-22 03:02:03 -07:00
|
|
|
for _, mt := range matcherTests {
|
2016-03-08 15:09:42 -08:00
|
|
|
benchLabelMatchingRes = s.MetricsForLabelMatchers(
|
|
|
|
model.Earliest, model.Latest,
|
|
|
|
mt...,
|
|
|
|
)
|
2015-06-22 03:02:03 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Stop timer to not count the storage closing.
|
|
|
|
b.StopTimer()
|
|
|
|
}
|
|
|
|
|
2015-05-27 02:24:56 -07:00
|
|
|
func TestRetentionCutoff(t *testing.T) {
|
2015-08-20 08:18:46 -07:00
|
|
|
now := model.Now()
|
2015-05-27 02:24:56 -07:00
|
|
|
insertStart := now.Add(-2 * time.Hour)
|
|
|
|
|
|
|
|
s, closer := NewTestStorage(t, 1)
|
|
|
|
defer closer.Close()
|
|
|
|
|
|
|
|
// Stop maintenance loop to prevent actual purging.
|
2016-01-25 07:36:14 -08:00
|
|
|
close(s.loopStopping)
|
|
|
|
<-s.loopStopped
|
2016-02-11 16:46:18 -08:00
|
|
|
<-s.logThrottlingStopped
|
2016-01-25 07:36:14 -08:00
|
|
|
// Recreate channel to avoid panic when we really shut down.
|
|
|
|
s.loopStopping = make(chan struct{})
|
2015-05-27 02:24:56 -07:00
|
|
|
|
|
|
|
s.dropAfter = 1 * time.Hour
|
|
|
|
|
2015-05-27 08:41:57 -07:00
|
|
|
for i := 0; i < 120; i++ {
|
2015-08-20 08:18:46 -07:00
|
|
|
smpl := &model.Sample{
|
|
|
|
Metric: model.Metric{"job": "test"},
|
2015-05-27 02:24:56 -07:00
|
|
|
Timestamp: insertStart.Add(time.Duration(i) * time.Minute), // 1 minute intervals.
|
|
|
|
Value: 1,
|
|
|
|
}
|
|
|
|
s.Append(smpl)
|
|
|
|
}
|
|
|
|
s.WaitForIndexing()
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
var fp model.Fingerprint
|
2015-08-22 04:32:13 -07:00
|
|
|
for f := range s.fingerprintsForLabelPairs(model.LabelPair{Name: "job", Value: "test"}) {
|
2015-06-15 09:25:31 -07:00
|
|
|
fp = f
|
|
|
|
break
|
2015-05-27 02:24:56 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
pl := s.NewPreloader()
|
|
|
|
defer pl.Close()
|
|
|
|
|
|
|
|
// Preload everything.
|
Handle errors caused by data corruption more gracefully
This requires all the panic calls upon unexpected data to be converted
into errors returned. This pollute the function signatures quite
lot. Well, this is Go...
The ideas behind this are the following:
- panic only if it's a programming error. Data corruptions happen, and
they are not programming errors.
- If we detect a data corruption, we "quarantine" the series,
essentially removing it from the database and putting its data into
a separate directory for forensics.
- Failure during writing to a series file is not considered corruption
automatically. It will call setDirty, though, so that a
crashrecovery upon the next restart will commence and check for
that.
- Series quarantining and setDirty calls are logged and counted in
metrics, but are hidden from the user of the interfaces in
interface.go, whith the notable exception of Append(). The reasoning
is that we treat corruption by removing the corrupted series, i.e. a
query for it will return no results on its next call anyway, so
return no results right now. In the case of Append(), we want to
tell the user that no data has been appended, though.
Minor side effects:
- Now consistently using filepath.* instead of path.*.
- Introduced structured logging where I touched it. This makes things
less consistent, but a complete change to structured logging would
be out of scope for this PR.
2016-02-25 03:23:42 -08:00
|
|
|
it := pl.PreloadRange(fp, insertStart, now)
|
2015-05-27 02:24:56 -07:00
|
|
|
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
val := it.ValueAtOrBeforeTime(now.Add(-61 * time.Minute))
|
|
|
|
if val.Timestamp != model.Earliest {
|
2015-05-27 02:24:56 -07:00
|
|
|
t.Errorf("unexpected result for timestamp before retention period")
|
|
|
|
}
|
|
|
|
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
vals := it.RangeValues(metric.Interval{OldestInclusive: insertStart, NewestInclusive: now})
|
2015-08-20 08:18:46 -07:00
|
|
|
// We get 59 values here because the model.Now() is slightly later
|
2015-05-27 02:24:56 -07:00
|
|
|
// than our now.
|
|
|
|
if len(vals) != 59 {
|
|
|
|
t.Errorf("expected 59 values but got %d", len(vals))
|
|
|
|
}
|
|
|
|
if expt := now.Add(-1 * time.Hour).Add(time.Minute); vals[0].Timestamp != expt {
|
|
|
|
t.Errorf("unexpected timestamp for first sample: %v, expected %v", vals[0].Timestamp.Time(), expt.Time())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-27 08:41:57 -07:00
|
|
|
func TestDropMetrics(t *testing.T) {
|
2015-08-20 08:18:46 -07:00
|
|
|
now := model.Now()
|
2015-05-27 08:41:57 -07:00
|
|
|
insertStart := now.Add(-2 * time.Hour)
|
|
|
|
|
|
|
|
s, closer := NewTestStorage(t, 1)
|
|
|
|
defer closer.Close()
|
|
|
|
|
2015-09-11 06:47:23 -07:00
|
|
|
chunkFileExists := func(fp model.Fingerprint) (bool, error) {
|
|
|
|
f, err := s.persistence.openChunkFileForReading(fp)
|
|
|
|
if err == nil {
|
|
|
|
f.Close()
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
if os.IsNotExist(err) {
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
m1 := model.Metric{model.MetricNameLabel: "test", "n1": "v1"}
|
|
|
|
m2 := model.Metric{model.MetricNameLabel: "test", "n1": "v2"}
|
2015-09-11 06:47:23 -07:00
|
|
|
m3 := model.Metric{model.MetricNameLabel: "test", "n1": "v3"}
|
2015-05-27 08:41:57 -07:00
|
|
|
|
|
|
|
N := 120000
|
|
|
|
|
2015-09-11 06:47:23 -07:00
|
|
|
for j, m := range []model.Metric{m1, m2, m3} {
|
2015-05-27 08:41:57 -07:00
|
|
|
for i := 0; i < N; i++ {
|
2015-08-20 08:18:46 -07:00
|
|
|
smpl := &model.Sample{
|
2015-05-27 08:41:57 -07:00
|
|
|
Metric: m,
|
2015-09-11 06:47:23 -07:00
|
|
|
Timestamp: insertStart.Add(time.Duration(i) * time.Millisecond), // 1 millisecond intervals.
|
2015-08-20 08:18:46 -07:00
|
|
|
Value: model.SampleValue(j),
|
2015-05-27 08:41:57 -07:00
|
|
|
}
|
|
|
|
s.Append(smpl)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s.WaitForIndexing()
|
|
|
|
|
2015-09-11 06:47:23 -07:00
|
|
|
// Archive m3, but first maintain it so that at least something is written to disk.
|
|
|
|
fpToBeArchived := m3.FastFingerprint()
|
|
|
|
s.maintainMemorySeries(fpToBeArchived, 0)
|
|
|
|
s.fpLocker.Lock(fpToBeArchived)
|
|
|
|
s.fpToSeries.del(fpToBeArchived)
|
2016-03-09 09:56:30 -08:00
|
|
|
s.persistence.archiveMetric(fpToBeArchived, m3, 0, insertStart.Add(time.Duration(N-1)*time.Millisecond))
|
2015-09-11 06:47:23 -07:00
|
|
|
s.fpLocker.Unlock(fpToBeArchived)
|
2015-05-27 08:41:57 -07:00
|
|
|
|
2015-09-11 06:47:23 -07:00
|
|
|
fps := s.fingerprintsForLabelPairs(model.LabelPair{Name: model.MetricNameLabel, Value: "test"})
|
|
|
|
if len(fps) != 3 {
|
|
|
|
t.Errorf("unexpected number of fingerprints: %d", len(fps))
|
2015-05-27 08:41:57 -07:00
|
|
|
}
|
|
|
|
|
2015-09-11 06:47:23 -07:00
|
|
|
fpList := model.Fingerprints{m1.FastFingerprint(), m2.FastFingerprint(), fpToBeArchived}
|
|
|
|
|
2015-06-15 09:25:31 -07:00
|
|
|
s.DropMetricsForFingerprints(fpList[0])
|
2015-05-27 08:41:57 -07:00
|
|
|
s.WaitForIndexing()
|
|
|
|
|
2015-08-22 04:32:13 -07:00
|
|
|
fps2 := s.fingerprintsForLabelPairs(model.LabelPair{
|
2015-08-20 08:18:46 -07:00
|
|
|
Name: model.MetricNameLabel, Value: "test",
|
2015-07-13 12:12:27 -07:00
|
|
|
})
|
2015-09-11 06:47:23 -07:00
|
|
|
if len(fps2) != 2 {
|
|
|
|
t.Errorf("unexpected number of fingerprints: %d", len(fps2))
|
2015-05-27 08:41:57 -07:00
|
|
|
}
|
|
|
|
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it := s.preloadChunksForRange(fpList[0], model.Earliest, model.Latest)
|
2015-07-13 12:12:27 -07:00
|
|
|
if vals := it.RangeValues(metric.Interval{OldestInclusive: insertStart, NewestInclusive: now}); len(vals) != 0 {
|
2015-09-11 06:47:23 -07:00
|
|
|
t.Errorf("unexpected number of samples: %d", len(vals))
|
2015-05-27 08:41:57 -07:00
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it = s.preloadChunksForRange(fpList[1], model.Earliest, model.Latest)
|
2015-07-13 12:12:27 -07:00
|
|
|
if vals := it.RangeValues(metric.Interval{OldestInclusive: insertStart, NewestInclusive: now}); len(vals) != N {
|
2015-09-11 06:47:23 -07:00
|
|
|
t.Errorf("unexpected number of samples: %d", len(vals))
|
|
|
|
}
|
|
|
|
exists, err := chunkFileExists(fpList[2])
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if !exists {
|
|
|
|
t.Errorf("chunk file does not exist for fp=%v", fpList[2])
|
2015-05-27 08:41:57 -07:00
|
|
|
}
|
|
|
|
|
2015-06-15 09:25:31 -07:00
|
|
|
s.DropMetricsForFingerprints(fpList...)
|
2015-05-27 08:41:57 -07:00
|
|
|
s.WaitForIndexing()
|
|
|
|
|
2015-08-22 04:32:13 -07:00
|
|
|
fps3 := s.fingerprintsForLabelPairs(model.LabelPair{
|
2015-08-20 08:18:46 -07:00
|
|
|
Name: model.MetricNameLabel, Value: "test",
|
2015-07-13 12:12:27 -07:00
|
|
|
})
|
2015-05-27 08:41:57 -07:00
|
|
|
if len(fps3) != 0 {
|
2015-09-11 06:47:23 -07:00
|
|
|
t.Errorf("unexpected number of fingerprints: %d", len(fps3))
|
2015-05-27 08:41:57 -07:00
|
|
|
}
|
|
|
|
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it = s.preloadChunksForRange(fpList[0], model.Earliest, model.Latest)
|
2015-07-13 12:12:27 -07:00
|
|
|
if vals := it.RangeValues(metric.Interval{OldestInclusive: insertStart, NewestInclusive: now}); len(vals) != 0 {
|
2015-09-11 06:47:23 -07:00
|
|
|
t.Errorf("unexpected number of samples: %d", len(vals))
|
2015-05-27 08:41:57 -07:00
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it = s.preloadChunksForRange(fpList[1], model.Earliest, model.Latest)
|
2015-07-13 12:12:27 -07:00
|
|
|
if vals := it.RangeValues(metric.Interval{OldestInclusive: insertStart, NewestInclusive: now}); len(vals) != 0 {
|
2015-09-11 06:47:23 -07:00
|
|
|
t.Errorf("unexpected number of samples: %d", len(vals))
|
|
|
|
}
|
|
|
|
exists, err = chunkFileExists(fpList[2])
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if exists {
|
|
|
|
t.Errorf("chunk file still exists for fp=%v", fpList[2])
|
2015-05-27 08:41:57 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Handle errors caused by data corruption more gracefully
This requires all the panic calls upon unexpected data to be converted
into errors returned. This pollute the function signatures quite
lot. Well, this is Go...
The ideas behind this are the following:
- panic only if it's a programming error. Data corruptions happen, and
they are not programming errors.
- If we detect a data corruption, we "quarantine" the series,
essentially removing it from the database and putting its data into
a separate directory for forensics.
- Failure during writing to a series file is not considered corruption
automatically. It will call setDirty, though, so that a
crashrecovery upon the next restart will commence and check for
that.
- Series quarantining and setDirty calls are logged and counted in
metrics, but are hidden from the user of the interfaces in
interface.go, whith the notable exception of Append(). The reasoning
is that we treat corruption by removing the corrupted series, i.e. a
query for it will return no results on its next call anyway, so
return no results right now. In the case of Append(), we want to
tell the user that no data has been appended, though.
Minor side effects:
- Now consistently using filepath.* instead of path.*.
- Introduced structured logging where I touched it. This makes things
less consistent, but a complete change to structured logging would
be out of scope for this PR.
2016-02-25 03:23:42 -08:00
|
|
|
func TestQuarantineMetric(t *testing.T) {
|
|
|
|
now := model.Now()
|
|
|
|
insertStart := now.Add(-2 * time.Hour)
|
|
|
|
|
|
|
|
s, closer := NewTestStorage(t, 1)
|
|
|
|
defer closer.Close()
|
|
|
|
|
|
|
|
chunkFileExists := func(fp model.Fingerprint) (bool, error) {
|
|
|
|
f, err := s.persistence.openChunkFileForReading(fp)
|
|
|
|
if err == nil {
|
|
|
|
f.Close()
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
if os.IsNotExist(err) {
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
|
|
|
|
m1 := model.Metric{model.MetricNameLabel: "test", "n1": "v1"}
|
|
|
|
m2 := model.Metric{model.MetricNameLabel: "test", "n1": "v2"}
|
|
|
|
m3 := model.Metric{model.MetricNameLabel: "test", "n1": "v3"}
|
|
|
|
|
|
|
|
N := 120000
|
|
|
|
|
|
|
|
for j, m := range []model.Metric{m1, m2, m3} {
|
|
|
|
for i := 0; i < N; i++ {
|
|
|
|
smpl := &model.Sample{
|
|
|
|
Metric: m,
|
|
|
|
Timestamp: insertStart.Add(time.Duration(i) * time.Millisecond), // 1 millisecond intervals.
|
|
|
|
Value: model.SampleValue(j),
|
|
|
|
}
|
|
|
|
s.Append(smpl)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s.WaitForIndexing()
|
|
|
|
|
|
|
|
// Archive m3, but first maintain it so that at least something is written to disk.
|
|
|
|
fpToBeArchived := m3.FastFingerprint()
|
|
|
|
s.maintainMemorySeries(fpToBeArchived, 0)
|
|
|
|
s.fpLocker.Lock(fpToBeArchived)
|
|
|
|
s.fpToSeries.del(fpToBeArchived)
|
2016-03-09 09:56:30 -08:00
|
|
|
s.persistence.archiveMetric(fpToBeArchived, m3, 0, insertStart.Add(time.Duration(N-1)*time.Millisecond))
|
Handle errors caused by data corruption more gracefully
This requires all the panic calls upon unexpected data to be converted
into errors returned. This pollute the function signatures quite
lot. Well, this is Go...
The ideas behind this are the following:
- panic only if it's a programming error. Data corruptions happen, and
they are not programming errors.
- If we detect a data corruption, we "quarantine" the series,
essentially removing it from the database and putting its data into
a separate directory for forensics.
- Failure during writing to a series file is not considered corruption
automatically. It will call setDirty, though, so that a
crashrecovery upon the next restart will commence and check for
that.
- Series quarantining and setDirty calls are logged and counted in
metrics, but are hidden from the user of the interfaces in
interface.go, whith the notable exception of Append(). The reasoning
is that we treat corruption by removing the corrupted series, i.e. a
query for it will return no results on its next call anyway, so
return no results right now. In the case of Append(), we want to
tell the user that no data has been appended, though.
Minor side effects:
- Now consistently using filepath.* instead of path.*.
- Introduced structured logging where I touched it. This makes things
less consistent, but a complete change to structured logging would
be out of scope for this PR.
2016-02-25 03:23:42 -08:00
|
|
|
s.fpLocker.Unlock(fpToBeArchived)
|
|
|
|
|
|
|
|
// Corrupt the series file for m3.
|
|
|
|
f, err := os.Create(s.persistence.fileNameForFingerprint(fpToBeArchived))
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if _, err := f.WriteString("This is clearly not the content of a series file."); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if f.Close(); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
fps := s.fingerprintsForLabelPairs(model.LabelPair{Name: model.MetricNameLabel, Value: "test"})
|
|
|
|
if len(fps) != 3 {
|
|
|
|
t.Errorf("unexpected number of fingerprints: %d", len(fps))
|
|
|
|
}
|
|
|
|
|
|
|
|
pl := s.NewPreloader()
|
|
|
|
// This will access the corrupt file and lead to quarantining.
|
|
|
|
pl.PreloadInstant(fpToBeArchived, now.Add(-2*time.Hour), time.Minute)
|
|
|
|
pl.Close()
|
|
|
|
time.Sleep(time.Second) // Give time to quarantine. TODO(beorn7): Find a better way to wait.
|
|
|
|
s.WaitForIndexing()
|
|
|
|
|
|
|
|
fps2 := s.fingerprintsForLabelPairs(model.LabelPair{
|
|
|
|
Name: model.MetricNameLabel, Value: "test",
|
|
|
|
})
|
|
|
|
if len(fps2) != 2 {
|
|
|
|
t.Errorf("unexpected number of fingerprints: %d", len(fps2))
|
|
|
|
}
|
|
|
|
|
|
|
|
exists, err := chunkFileExists(fpToBeArchived)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if exists {
|
|
|
|
t.Errorf("chunk file exists for fp=%v", fpToBeArchived)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-28 11:01:41 -07:00
|
|
|
// TestLoop is just a smoke test for the loop method, if we can switch it on and
|
|
|
|
// off without disaster.
|
|
|
|
func TestLoop(t *testing.T) {
|
2015-02-26 06:19:44 -08:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("Skipping test in short mode.")
|
|
|
|
}
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make(model.Samples, 1000)
|
2014-10-28 11:01:41 -07:00
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
|
|
|
Timestamp: model.Time(2 * i),
|
|
|
|
Value: model.SampleValue(float64(i) * 0.2),
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
|
|
|
}
|
2015-05-28 11:58:38 -07:00
|
|
|
directory := testutil.NewTemporaryDirectory("test_storage", t)
|
2014-10-28 11:01:41 -07:00
|
|
|
defer directory.Close()
|
|
|
|
o := &MemorySeriesStorageOptions{
|
2014-11-13 11:50:25 -08:00
|
|
|
MemoryChunks: 50,
|
2015-03-18 11:36:41 -07:00
|
|
|
MaxChunksToPersist: 1000000,
|
2014-10-28 11:01:41 -07:00
|
|
|
PersistenceRetentionPeriod: 24 * 7 * time.Hour,
|
|
|
|
PersistenceStoragePath: directory.Path(),
|
|
|
|
CheckpointInterval: 250 * time.Millisecond,
|
2015-03-19 07:41:50 -07:00
|
|
|
SyncStrategy: Adaptive,
|
2016-01-11 07:42:10 -08:00
|
|
|
MinShrinkRatio: 0.1,
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
2015-05-18 10:26:28 -07:00
|
|
|
storage := NewMemorySeriesStorage(o)
|
2015-05-20 07:12:07 -07:00
|
|
|
if err := storage.Start(); err != nil {
|
2015-09-11 06:47:23 -07:00
|
|
|
t.Errorf("Error starting storage: %s", err)
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, s := range samples {
|
|
|
|
storage.Append(s)
|
|
|
|
}
|
2015-02-26 06:19:44 -08:00
|
|
|
storage.WaitForIndexing()
|
2015-08-20 08:18:46 -07:00
|
|
|
series, _ := storage.(*memorySeriesStorage).fpToSeries.get(model.Metric{}.FastFingerprint())
|
2015-02-26 06:19:44 -08:00
|
|
|
cdsBefore := len(series.chunkDescs)
|
|
|
|
time.Sleep(fpMaxWaitDuration + time.Second) // TODO(beorn7): Ugh, need to wait for maintenance to kick in.
|
|
|
|
cdsAfter := len(series.chunkDescs)
|
2014-10-28 11:01:41 -07:00
|
|
|
storage.Stop()
|
2015-02-26 06:19:44 -08:00
|
|
|
if cdsBefore <= cdsAfter {
|
|
|
|
t.Errorf(
|
|
|
|
"Number of chunk descriptors should have gone down by now. Got before %d, after %d.",
|
|
|
|
cdsBefore, cdsAfter,
|
|
|
|
)
|
|
|
|
}
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
|
|
|
|
2015-03-13 07:49:07 -07:00
|
|
|
func testChunk(t *testing.T, encoding chunkEncoding) {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make(model.Samples, 500000)
|
2014-06-06 02:55:53 -07:00
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
|
|
|
Timestamp: model.Time(i),
|
|
|
|
Value: model.SampleValue(float64(i) * 0.2),
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
}
|
2015-03-13 07:49:07 -07:00
|
|
|
s, closer := NewTestStorage(t, encoding)
|
2014-06-06 02:55:53 -07:00
|
|
|
defer closer.Close()
|
|
|
|
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
2015-02-12 08:23:42 -08:00
|
|
|
s.WaitForIndexing()
|
2014-06-06 02:55:53 -07:00
|
|
|
|
2015-05-06 07:53:12 -07:00
|
|
|
for m := range s.fpToSeries.iter() {
|
|
|
|
s.fpLocker.Lock(m.fp)
|
2014-11-13 11:50:25 -08:00
|
|
|
|
2015-08-22 05:52:35 -07:00
|
|
|
var values []model.SamplePair
|
2014-11-13 11:50:25 -08:00
|
|
|
for _, cd := range m.series.chunkDescs {
|
|
|
|
if cd.isEvicted() {
|
|
|
|
continue
|
|
|
|
}
|
2016-03-07 10:50:13 -08:00
|
|
|
it := cd.c.newIterator()
|
|
|
|
for it.scan() {
|
|
|
|
values = append(values, it.value())
|
|
|
|
}
|
|
|
|
if it.err() != nil {
|
|
|
|
t.Error(it.err())
|
2014-11-13 11:50:25 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, v := range values {
|
2014-06-06 02:55:53 -07:00
|
|
|
if samples[i].Timestamp != v.Timestamp {
|
2014-11-13 11:50:25 -08:00
|
|
|
t.Errorf("%d. Got %v; want %v", i, v.Timestamp, samples[i].Timestamp)
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
2015-03-06 07:03:03 -08:00
|
|
|
if samples[i].Value != v.Value {
|
2014-11-13 11:50:25 -08:00
|
|
|
t.Errorf("%d. Got %v; want %v", i, v.Value, samples[i].Value)
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
}
|
2015-05-06 07:53:12 -07:00
|
|
|
s.fpLocker.Unlock(m.fp)
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
2015-05-20 09:10:29 -07:00
|
|
|
log.Info("test done, closing")
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
|
2015-03-04 04:40:18 -08:00
|
|
|
func TestChunkType0(t *testing.T) {
|
|
|
|
testChunk(t, 0)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestChunkType1(t *testing.T) {
|
|
|
|
testChunk(t, 1)
|
|
|
|
}
|
|
|
|
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
func testValueAtOrBeforeTime(t *testing.T, encoding chunkEncoding) {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make(model.Samples, 10000)
|
2014-06-06 02:55:53 -07:00
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
|
|
|
Timestamp: model.Time(2 * i),
|
|
|
|
Value: model.SampleValue(float64(i) * 0.2),
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
}
|
2015-03-13 07:49:07 -07:00
|
|
|
s, closer := NewTestStorage(t, encoding)
|
2014-06-06 02:55:53 -07:00
|
|
|
defer closer.Close()
|
|
|
|
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
2015-02-12 08:23:42 -08:00
|
|
|
s.WaitForIndexing()
|
2014-06-06 02:55:53 -07:00
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
fp := model.Metric{}.FastFingerprint()
|
2014-06-06 02:55:53 -07:00
|
|
|
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it := s.preloadChunksForRange(fp, model.Earliest, model.Latest)
|
2014-06-06 02:55:53 -07:00
|
|
|
|
2014-08-14 09:23:49 -07:00
|
|
|
// #1 Exactly on a sample.
|
2014-06-06 02:55:53 -07:00
|
|
|
for i, expected := range samples {
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
actual := it.ValueAtOrBeforeTime(expected.Timestamp)
|
2014-06-06 02:55:53 -07:00
|
|
|
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Timestamp != actual.Timestamp {
|
|
|
|
t.Errorf("1.%d. Got %v; want %v", i, actual.Timestamp, expected.Timestamp)
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Value != actual.Value {
|
|
|
|
t.Errorf("1.%d. Got %v; want %v", i, actual.Value, expected.Value)
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
}
|
2014-08-14 09:23:49 -07:00
|
|
|
|
|
|
|
// #2 Between samples.
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
for i, expected := range samples {
|
2014-08-14 09:23:49 -07:00
|
|
|
if i == len(samples)-1 {
|
|
|
|
continue
|
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
actual := it.ValueAtOrBeforeTime(expected.Timestamp + 1)
|
2014-08-14 09:23:49 -07:00
|
|
|
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Timestamp != actual.Timestamp {
|
|
|
|
t.Errorf("2.%d. Got %v; want %v", i, actual.Timestamp, expected.Timestamp)
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Value != actual.Value {
|
|
|
|
t.Errorf("2.%d. Got %v; want %v", i, actual.Value, expected.Value)
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// #3 Corner cases: Just before the first sample, just after the last.
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
expected := &model.Sample{Timestamp: model.Earliest}
|
|
|
|
actual := it.ValueAtOrBeforeTime(samples[0].Timestamp - 1)
|
|
|
|
if expected.Timestamp != actual.Timestamp {
|
|
|
|
t.Errorf("3.1. Got %v; want %v", actual.Timestamp, expected.Timestamp)
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Value != actual.Value {
|
|
|
|
t.Errorf("3.1. Got %v; want %v", actual.Value, expected.Value)
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
|
|
|
expected = samples[len(samples)-1]
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
actual = it.ValueAtOrBeforeTime(expected.Timestamp + 1)
|
|
|
|
if expected.Timestamp != actual.Timestamp {
|
|
|
|
t.Errorf("3.2. Got %v; want %v", actual.Timestamp, expected.Timestamp)
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Value != actual.Value {
|
|
|
|
t.Errorf("3.2. Got %v; want %v", actual.Value, expected.Value)
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
|
2015-05-20 10:13:06 -07:00
|
|
|
func TestValueAtTimeChunkType0(t *testing.T) {
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
testValueAtOrBeforeTime(t, 0)
|
2015-03-04 04:40:18 -08:00
|
|
|
}
|
|
|
|
|
2015-05-20 10:13:06 -07:00
|
|
|
func TestValueAtTimeChunkType1(t *testing.T) {
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
testValueAtOrBeforeTime(t, 1)
|
2015-03-04 04:40:18 -08:00
|
|
|
}
|
|
|
|
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
func benchmarkValueAtOrBeforeTime(b *testing.B, encoding chunkEncoding) {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make(model.Samples, 10000)
|
2015-05-19 10:12:01 -07:00
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
|
|
|
Timestamp: model.Time(2 * i),
|
|
|
|
Value: model.SampleValue(float64(i) * 0.2),
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
s, closer := NewTestStorage(b, encoding)
|
|
|
|
defer closer.Close()
|
|
|
|
|
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
|
|
|
s.WaitForIndexing()
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
fp := model.Metric{}.FastFingerprint()
|
2015-05-19 10:12:01 -07:00
|
|
|
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it := s.preloadChunksForRange(fp, model.Earliest, model.Latest)
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
|
2015-05-19 10:12:01 -07:00
|
|
|
b.ResetTimer()
|
|
|
|
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
|
|
// #1 Exactly on a sample.
|
|
|
|
for i, expected := range samples {
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
actual := it.ValueAtOrBeforeTime(expected.Timestamp)
|
2015-05-19 10:12:01 -07:00
|
|
|
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Timestamp != actual.Timestamp {
|
|
|
|
b.Errorf("1.%d. Got %v; want %v", i, actual.Timestamp, expected.Timestamp)
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Value != actual.Value {
|
|
|
|
b.Errorf("1.%d. Got %v; want %v", i, actual.Value, expected.Value)
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// #2 Between samples.
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
for i, expected := range samples {
|
2015-05-19 10:12:01 -07:00
|
|
|
if i == len(samples)-1 {
|
|
|
|
continue
|
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
actual := it.ValueAtOrBeforeTime(expected.Timestamp + 1)
|
2015-05-19 10:12:01 -07:00
|
|
|
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Timestamp != actual.Timestamp {
|
|
|
|
b.Errorf("2.%d. Got %v; want %v", i, actual.Timestamp, expected.Timestamp)
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if expected.Value != actual.Value {
|
|
|
|
b.Errorf("2.%d. Got %v; want %v", i, actual.Value, expected.Value)
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
|
|
|
|
// #3 Corner cases: Just before the first sample, just after the last.
|
|
|
|
expected := &model.Sample{Timestamp: model.Earliest}
|
|
|
|
actual := it.ValueAtOrBeforeTime(samples[0].Timestamp - 1)
|
|
|
|
if expected.Timestamp != actual.Timestamp {
|
|
|
|
b.Errorf("3.1. Got %v; want %v", actual.Timestamp, expected.Timestamp)
|
|
|
|
}
|
|
|
|
if expected.Value != actual.Value {
|
|
|
|
b.Errorf("3.1. Got %v; want %v", actual.Value, expected.Value)
|
|
|
|
}
|
|
|
|
expected = samples[len(samples)-1]
|
|
|
|
actual = it.ValueAtOrBeforeTime(expected.Timestamp + 1)
|
|
|
|
if expected.Timestamp != actual.Timestamp {
|
|
|
|
b.Errorf("3.2. Got %v; want %v", actual.Timestamp, expected.Timestamp)
|
|
|
|
}
|
|
|
|
if expected.Value != actual.Value {
|
|
|
|
b.Errorf("3.2. Got %v; want %v", actual.Value, expected.Value)
|
|
|
|
}
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
func BenchmarkValueAtOrBeforeTimeChunkType0(b *testing.B) {
|
|
|
|
benchmarkValueAtOrBeforeTime(b, 0)
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
|
|
|
|
2015-05-20 10:13:06 -07:00
|
|
|
func BenchmarkValueAtTimeChunkType1(b *testing.B) {
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
benchmarkValueAtOrBeforeTime(b, 1)
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
|
|
|
|
2015-05-20 10:13:06 -07:00
|
|
|
func testRangeValues(t *testing.T, encoding chunkEncoding) {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make(model.Samples, 10000)
|
2014-06-06 02:55:53 -07:00
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
|
|
|
Timestamp: model.Time(2 * i),
|
|
|
|
Value: model.SampleValue(float64(i) * 0.2),
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
}
|
2015-03-13 07:49:07 -07:00
|
|
|
s, closer := NewTestStorage(t, encoding)
|
2014-06-06 02:55:53 -07:00
|
|
|
defer closer.Close()
|
|
|
|
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
2015-02-12 08:23:42 -08:00
|
|
|
s.WaitForIndexing()
|
2014-06-06 02:55:53 -07:00
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
fp := model.Metric{}.FastFingerprint()
|
2014-06-06 02:55:53 -07:00
|
|
|
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it := s.preloadChunksForRange(fp, model.Earliest, model.Latest)
|
2014-06-06 02:55:53 -07:00
|
|
|
|
2014-08-14 09:23:49 -07:00
|
|
|
// #1 Zero length interval at sample.
|
2014-06-06 02:55:53 -07:00
|
|
|
for i, expected := range samples {
|
2015-05-20 10:13:06 -07:00
|
|
|
actual := it.RangeValues(metric.Interval{
|
2014-08-14 09:23:49 -07:00
|
|
|
OldestInclusive: expected.Timestamp,
|
|
|
|
NewestInclusive: expected.Timestamp,
|
|
|
|
})
|
2014-06-06 02:55:53 -07:00
|
|
|
|
2014-08-14 09:23:49 -07:00
|
|
|
if len(actual) != 1 {
|
|
|
|
t.Fatalf("1.%d. Expected exactly one result, got %d.", i, len(actual))
|
|
|
|
}
|
2014-06-06 02:55:53 -07:00
|
|
|
if expected.Timestamp != actual[0].Timestamp {
|
2014-08-14 09:23:49 -07:00
|
|
|
t.Errorf("1.%d. Got %v; want %v.", i, actual[0].Timestamp, expected.Timestamp)
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
if expected.Value != actual[0].Value {
|
2014-08-14 09:23:49 -07:00
|
|
|
t.Errorf("1.%d. Got %v; want %v.", i, actual[0].Value, expected.Value)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// #2 Zero length interval off sample.
|
|
|
|
for i, expected := range samples {
|
2015-05-20 10:13:06 -07:00
|
|
|
actual := it.RangeValues(metric.Interval{
|
2014-08-14 09:23:49 -07:00
|
|
|
OldestInclusive: expected.Timestamp + 1,
|
|
|
|
NewestInclusive: expected.Timestamp + 1,
|
|
|
|
})
|
|
|
|
|
|
|
|
if len(actual) != 0 {
|
|
|
|
t.Fatalf("2.%d. Expected no result, got %d.", i, len(actual))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// #3 2sec interval around sample.
|
|
|
|
for i, expected := range samples {
|
2015-05-20 10:13:06 -07:00
|
|
|
actual := it.RangeValues(metric.Interval{
|
2014-08-14 09:23:49 -07:00
|
|
|
OldestInclusive: expected.Timestamp - 1,
|
|
|
|
NewestInclusive: expected.Timestamp + 1,
|
|
|
|
})
|
|
|
|
|
|
|
|
if len(actual) != 1 {
|
|
|
|
t.Fatalf("3.%d. Expected exactly one result, got %d.", i, len(actual))
|
|
|
|
}
|
|
|
|
if expected.Timestamp != actual[0].Timestamp {
|
|
|
|
t.Errorf("3.%d. Got %v; want %v.", i, actual[0].Timestamp, expected.Timestamp)
|
|
|
|
}
|
|
|
|
if expected.Value != actual[0].Value {
|
|
|
|
t.Errorf("3.%d. Got %v; want %v.", i, actual[0].Value, expected.Value)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// #4 2sec interval sample to sample.
|
|
|
|
for i, expected1 := range samples {
|
|
|
|
if i == len(samples)-1 {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
expected2 := samples[i+1]
|
2015-05-20 10:13:06 -07:00
|
|
|
actual := it.RangeValues(metric.Interval{
|
2014-08-14 09:23:49 -07:00
|
|
|
OldestInclusive: expected1.Timestamp,
|
|
|
|
NewestInclusive: expected1.Timestamp + 2,
|
|
|
|
})
|
|
|
|
|
|
|
|
if len(actual) != 2 {
|
|
|
|
t.Fatalf("4.%d. Expected exactly 2 results, got %d.", i, len(actual))
|
|
|
|
}
|
|
|
|
if expected1.Timestamp != actual[0].Timestamp {
|
|
|
|
t.Errorf("4.%d. Got %v for 1st result; want %v.", i, actual[0].Timestamp, expected1.Timestamp)
|
|
|
|
}
|
|
|
|
if expected1.Value != actual[0].Value {
|
|
|
|
t.Errorf("4.%d. Got %v for 1st result; want %v.", i, actual[0].Value, expected1.Value)
|
|
|
|
}
|
|
|
|
if expected2.Timestamp != actual[1].Timestamp {
|
|
|
|
t.Errorf("4.%d. Got %v for 2nd result; want %v.", i, actual[1].Timestamp, expected2.Timestamp)
|
|
|
|
}
|
|
|
|
if expected2.Value != actual[1].Value {
|
|
|
|
t.Errorf("4.%d. Got %v for 2nd result; want %v.", i, actual[1].Value, expected2.Value)
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
}
|
2014-08-14 09:23:49 -07:00
|
|
|
|
|
|
|
// #5 corner cases: Interval ends at first sample, interval starts
|
|
|
|
// at last sample, interval entirely before/after samples.
|
|
|
|
expected := samples[0]
|
2015-05-20 10:13:06 -07:00
|
|
|
actual := it.RangeValues(metric.Interval{
|
2014-08-14 09:23:49 -07:00
|
|
|
OldestInclusive: expected.Timestamp - 2,
|
|
|
|
NewestInclusive: expected.Timestamp,
|
|
|
|
})
|
|
|
|
if len(actual) != 1 {
|
|
|
|
t.Fatalf("5.1. Expected exactly one result, got %d.", len(actual))
|
|
|
|
}
|
|
|
|
if expected.Timestamp != actual[0].Timestamp {
|
|
|
|
t.Errorf("5.1. Got %v; want %v.", actual[0].Timestamp, expected.Timestamp)
|
|
|
|
}
|
|
|
|
if expected.Value != actual[0].Value {
|
|
|
|
t.Errorf("5.1. Got %v; want %v.", actual[0].Value, expected.Value)
|
|
|
|
}
|
|
|
|
expected = samples[len(samples)-1]
|
2015-05-20 10:13:06 -07:00
|
|
|
actual = it.RangeValues(metric.Interval{
|
2014-08-14 09:23:49 -07:00
|
|
|
OldestInclusive: expected.Timestamp,
|
|
|
|
NewestInclusive: expected.Timestamp + 2,
|
|
|
|
})
|
|
|
|
if len(actual) != 1 {
|
|
|
|
t.Fatalf("5.2. Expected exactly one result, got %d.", len(actual))
|
|
|
|
}
|
|
|
|
if expected.Timestamp != actual[0].Timestamp {
|
|
|
|
t.Errorf("5.2. Got %v; want %v.", actual[0].Timestamp, expected.Timestamp)
|
|
|
|
}
|
|
|
|
if expected.Value != actual[0].Value {
|
|
|
|
t.Errorf("5.2. Got %v; want %v.", actual[0].Value, expected.Value)
|
|
|
|
}
|
|
|
|
firstSample := samples[0]
|
2015-05-20 10:13:06 -07:00
|
|
|
actual = it.RangeValues(metric.Interval{
|
2014-08-14 09:23:49 -07:00
|
|
|
OldestInclusive: firstSample.Timestamp - 4,
|
|
|
|
NewestInclusive: firstSample.Timestamp - 2,
|
|
|
|
})
|
|
|
|
if len(actual) != 0 {
|
|
|
|
t.Fatalf("5.3. Expected no results, got %d.", len(actual))
|
|
|
|
}
|
|
|
|
lastSample := samples[len(samples)-1]
|
2015-05-20 10:13:06 -07:00
|
|
|
actual = it.RangeValues(metric.Interval{
|
2014-08-14 09:23:49 -07:00
|
|
|
OldestInclusive: lastSample.Timestamp + 2,
|
|
|
|
NewestInclusive: lastSample.Timestamp + 4,
|
|
|
|
})
|
|
|
|
if len(actual) != 0 {
|
|
|
|
t.Fatalf("5.3. Expected no results, got %d.", len(actual))
|
|
|
|
}
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
|
2015-05-20 10:13:06 -07:00
|
|
|
func TestRangeValuesChunkType0(t *testing.T) {
|
|
|
|
testRangeValues(t, 0)
|
2015-03-04 04:40:18 -08:00
|
|
|
}
|
|
|
|
|
2015-05-20 10:13:06 -07:00
|
|
|
func TestRangeValuesChunkType1(t *testing.T) {
|
|
|
|
testRangeValues(t, 1)
|
2015-03-04 04:40:18 -08:00
|
|
|
}
|
|
|
|
|
2015-05-20 10:13:06 -07:00
|
|
|
func benchmarkRangeValues(b *testing.B, encoding chunkEncoding) {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make(model.Samples, 10000)
|
2015-05-19 10:12:01 -07:00
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
|
|
|
Timestamp: model.Time(2 * i),
|
|
|
|
Value: model.SampleValue(float64(i) * 0.2),
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
s, closer := NewTestStorage(b, encoding)
|
|
|
|
defer closer.Close()
|
|
|
|
|
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
|
|
|
s.WaitForIndexing()
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
fp := model.Metric{}.FastFingerprint()
|
2015-05-19 10:12:01 -07:00
|
|
|
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it := s.preloadChunksForRange(fp, model.Earliest, model.Latest)
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
|
2015-05-19 10:12:01 -07:00
|
|
|
b.ResetTimer()
|
|
|
|
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
|
|
for _, sample := range samples {
|
2015-05-20 10:13:06 -07:00
|
|
|
actual := it.RangeValues(metric.Interval{
|
2015-05-19 10:12:01 -07:00
|
|
|
OldestInclusive: sample.Timestamp - 20,
|
|
|
|
NewestInclusive: sample.Timestamp + 20,
|
|
|
|
})
|
|
|
|
|
|
|
|
if len(actual) < 10 {
|
|
|
|
b.Fatalf("not enough samples found")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-20 10:13:06 -07:00
|
|
|
func BenchmarkRangeValuesChunkType0(b *testing.B) {
|
|
|
|
benchmarkRangeValues(b, 0)
|
2015-05-19 10:12:01 -07:00
|
|
|
}
|
|
|
|
|
2015-05-20 10:13:06 -07:00
|
|
|
func BenchmarkRangeValuesChunkType1(b *testing.B) {
|
|
|
|
benchmarkRangeValues(b, 1)
|
2015-03-04 04:40:18 -08:00
|
|
|
}
|
|
|
|
|
2015-03-13 07:49:07 -07:00
|
|
|
func testEvictAndPurgeSeries(t *testing.T, encoding chunkEncoding) {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make(model.Samples, 10000)
|
2014-10-28 11:01:41 -07:00
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
|
|
|
Timestamp: model.Time(2 * i),
|
|
|
|
Value: model.SampleValue(float64(i * i)),
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
|
|
|
}
|
2015-03-13 07:49:07 -07:00
|
|
|
s, closer := NewTestStorage(t, encoding)
|
2014-10-28 11:01:41 -07:00
|
|
|
defer closer.Close()
|
|
|
|
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
2015-02-12 08:23:42 -08:00
|
|
|
s.WaitForIndexing()
|
2014-10-28 11:01:41 -07:00
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
fp := model.Metric{}.FastFingerprint()
|
2014-10-28 11:01:41 -07:00
|
|
|
|
2015-02-26 06:19:44 -08:00
|
|
|
// Drop ~half of the chunks.
|
2015-05-19 10:12:01 -07:00
|
|
|
s.maintainMemorySeries(fp, 10000)
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it := s.preloadChunksForRange(fp, model.Earliest, model.Latest)
|
2016-02-24 08:16:24 -08:00
|
|
|
actual := it.RangeValues(metric.Interval{
|
2014-10-28 11:01:41 -07:00
|
|
|
OldestInclusive: 0,
|
2015-05-19 10:12:01 -07:00
|
|
|
NewestInclusive: 100000,
|
2014-10-28 11:01:41 -07:00
|
|
|
})
|
2016-02-24 08:16:24 -08:00
|
|
|
if len(actual) < 4000 {
|
|
|
|
t.Fatalf("expected more than %d results after purging half of series, got %d", 4000, len(actual))
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
2015-05-19 10:12:01 -07:00
|
|
|
if actual[0].Timestamp < 6000 || actual[0].Timestamp > 10000 {
|
2014-10-28 11:01:41 -07:00
|
|
|
t.Errorf("1st timestamp out of expected range: %v", actual[0].Timestamp)
|
|
|
|
}
|
2015-08-20 08:18:46 -07:00
|
|
|
want := model.Time(19998)
|
2016-02-24 08:16:24 -08:00
|
|
|
if actual[len(actual)-1].Timestamp != want {
|
2014-10-28 11:01:41 -07:00
|
|
|
t.Errorf("2nd timestamp: want %v, got %v", want, actual[1].Timestamp)
|
|
|
|
}
|
|
|
|
|
2015-02-26 06:19:44 -08:00
|
|
|
// Drop everything.
|
2015-05-19 10:12:01 -07:00
|
|
|
s.maintainMemorySeries(fp, 100000)
|
2016-03-09 08:13:16 -08:00
|
|
|
_, it = s.preloadChunksForRange(fp, model.Earliest, model.Latest)
|
2016-02-24 08:16:24 -08:00
|
|
|
actual = it.RangeValues(metric.Interval{
|
2014-10-28 11:01:41 -07:00
|
|
|
OldestInclusive: 0,
|
2015-05-19 10:12:01 -07:00
|
|
|
NewestInclusive: 100000,
|
2014-10-28 11:01:41 -07:00
|
|
|
})
|
|
|
|
if len(actual) != 0 {
|
|
|
|
t.Fatal("expected zero results after purging the whole series")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Recreate series.
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
2015-02-12 08:23:42 -08:00
|
|
|
s.WaitForIndexing()
|
2014-10-28 11:01:41 -07:00
|
|
|
|
2015-05-06 07:53:12 -07:00
|
|
|
series, ok := s.fpToSeries.get(fp)
|
2014-10-28 11:01:41 -07:00
|
|
|
if !ok {
|
|
|
|
t.Fatal("could not find series")
|
|
|
|
}
|
|
|
|
|
2014-11-13 11:50:25 -08:00
|
|
|
// Persist head chunk so we can safely archive.
|
2015-03-08 18:33:10 -07:00
|
|
|
series.headChunkClosed = true
|
2015-08-20 08:18:46 -07:00
|
|
|
s.maintainMemorySeries(fp, model.Earliest)
|
2014-10-28 11:01:41 -07:00
|
|
|
|
2014-11-13 11:50:25 -08:00
|
|
|
// Archive metrics.
|
2015-05-06 07:53:12 -07:00
|
|
|
s.fpToSeries.del(fp)
|
Handle errors caused by data corruption more gracefully
This requires all the panic calls upon unexpected data to be converted
into errors returned. This pollute the function signatures quite
lot. Well, this is Go...
The ideas behind this are the following:
- panic only if it's a programming error. Data corruptions happen, and
they are not programming errors.
- If we detect a data corruption, we "quarantine" the series,
essentially removing it from the database and putting its data into
a separate directory for forensics.
- Failure during writing to a series file is not considered corruption
automatically. It will call setDirty, though, so that a
crashrecovery upon the next restart will commence and check for
that.
- Series quarantining and setDirty calls are logged and counted in
metrics, but are hidden from the user of the interfaces in
interface.go, whith the notable exception of Append(). The reasoning
is that we treat corruption by removing the corrupted series, i.e. a
query for it will return no results on its next call anyway, so
return no results right now. In the case of Append(), we want to
tell the user that no data has been appended, though.
Minor side effects:
- Now consistently using filepath.* instead of path.*.
- Introduced structured logging where I touched it. This makes things
less consistent, but a complete change to structured logging would
be out of scope for this PR.
2016-02-25 03:23:42 -08:00
|
|
|
lastTime, err := series.head().lastTime()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2016-03-09 09:56:30 -08:00
|
|
|
s.persistence.archiveMetric(fp, series.metric, series.firstTime(), lastTime)
|
|
|
|
archived, _, _ := s.persistence.hasArchivedMetric(fp)
|
2014-10-28 11:01:41 -07:00
|
|
|
if !archived {
|
|
|
|
t.Fatal("not archived")
|
|
|
|
}
|
|
|
|
|
2015-02-26 06:19:44 -08:00
|
|
|
// Drop ~half of the chunks of an archived series.
|
2015-05-19 10:12:01 -07:00
|
|
|
s.maintainArchivedSeries(fp, 10000)
|
2016-03-09 09:56:30 -08:00
|
|
|
archived, _, _ = s.persistence.hasArchivedMetric(fp)
|
2014-10-28 11:01:41 -07:00
|
|
|
if !archived {
|
2015-02-26 06:19:44 -08:00
|
|
|
t.Fatal("archived series purged although only half of the chunks dropped")
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
|
|
|
|
2015-02-26 06:19:44 -08:00
|
|
|
// Drop everything.
|
2015-05-19 10:12:01 -07:00
|
|
|
s.maintainArchivedSeries(fp, 100000)
|
2016-03-09 09:56:30 -08:00
|
|
|
archived, _, _ = s.persistence.hasArchivedMetric(fp)
|
2014-10-28 11:01:41 -07:00
|
|
|
if archived {
|
|
|
|
t.Fatal("archived series not dropped")
|
|
|
|
}
|
2015-04-09 06:57:11 -07:00
|
|
|
|
|
|
|
// Recreate series.
|
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
|
|
|
s.WaitForIndexing()
|
|
|
|
|
2015-05-06 07:53:12 -07:00
|
|
|
series, ok = s.fpToSeries.get(fp)
|
2015-04-09 06:57:11 -07:00
|
|
|
if !ok {
|
|
|
|
t.Fatal("could not find series")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Persist head chunk so we can safely archive.
|
|
|
|
series.headChunkClosed = true
|
2015-08-20 08:18:46 -07:00
|
|
|
s.maintainMemorySeries(fp, model.Earliest)
|
2015-04-09 06:57:11 -07:00
|
|
|
|
|
|
|
// Archive metrics.
|
2015-05-06 07:53:12 -07:00
|
|
|
s.fpToSeries.del(fp)
|
Handle errors caused by data corruption more gracefully
This requires all the panic calls upon unexpected data to be converted
into errors returned. This pollute the function signatures quite
lot. Well, this is Go...
The ideas behind this are the following:
- panic only if it's a programming error. Data corruptions happen, and
they are not programming errors.
- If we detect a data corruption, we "quarantine" the series,
essentially removing it from the database and putting its data into
a separate directory for forensics.
- Failure during writing to a series file is not considered corruption
automatically. It will call setDirty, though, so that a
crashrecovery upon the next restart will commence and check for
that.
- Series quarantining and setDirty calls are logged and counted in
metrics, but are hidden from the user of the interfaces in
interface.go, whith the notable exception of Append(). The reasoning
is that we treat corruption by removing the corrupted series, i.e. a
query for it will return no results on its next call anyway, so
return no results right now. In the case of Append(), we want to
tell the user that no data has been appended, though.
Minor side effects:
- Now consistently using filepath.* instead of path.*.
- Introduced structured logging where I touched it. This makes things
less consistent, but a complete change to structured logging would
be out of scope for this PR.
2016-02-25 03:23:42 -08:00
|
|
|
lastTime, err = series.head().lastTime()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2016-03-09 09:56:30 -08:00
|
|
|
s.persistence.archiveMetric(fp, series.metric, series.firstTime(), lastTime)
|
|
|
|
archived, _, _ = s.persistence.hasArchivedMetric(fp)
|
2015-04-09 06:57:11 -07:00
|
|
|
if !archived {
|
|
|
|
t.Fatal("not archived")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Unarchive metrics.
|
2015-08-20 08:18:46 -07:00
|
|
|
s.getOrCreateSeries(fp, model.Metric{})
|
2015-04-09 06:57:11 -07:00
|
|
|
|
2015-05-06 07:53:12 -07:00
|
|
|
series, ok = s.fpToSeries.get(fp)
|
2015-04-09 06:57:11 -07:00
|
|
|
if !ok {
|
|
|
|
t.Fatal("could not find series")
|
|
|
|
}
|
2016-03-09 09:56:30 -08:00
|
|
|
archived, _, _ = s.persistence.hasArchivedMetric(fp)
|
2015-04-09 06:57:11 -07:00
|
|
|
if archived {
|
|
|
|
t.Fatal("archived")
|
|
|
|
}
|
|
|
|
|
2016-03-09 11:27:50 -08:00
|
|
|
// Set archiveHighWatermark to a low value so that we can see it increase.
|
|
|
|
s.archiveHighWatermark = 42
|
|
|
|
|
2015-04-09 06:57:11 -07:00
|
|
|
// This will archive again, but must not drop it completely, despite the
|
|
|
|
// memorySeries being empty.
|
2015-05-19 10:12:01 -07:00
|
|
|
s.maintainMemorySeries(fp, 10000)
|
2016-03-09 09:56:30 -08:00
|
|
|
archived, _, _ = s.persistence.hasArchivedMetric(fp)
|
2015-04-09 06:57:11 -07:00
|
|
|
if !archived {
|
|
|
|
t.Fatal("series purged completely")
|
|
|
|
}
|
2016-03-09 11:27:50 -08:00
|
|
|
// archiveHighWatermark must have been set by maintainMemorySeries.
|
|
|
|
if want, got := model.Time(19998), s.archiveHighWatermark; want != got {
|
|
|
|
t.Errorf("want archiveHighWatermark %v, got %v", want, got)
|
|
|
|
}
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
|
|
|
|
2015-03-04 04:40:18 -08:00
|
|
|
func TestEvictAndPurgeSeriesChunkType0(t *testing.T) {
|
|
|
|
testEvictAndPurgeSeries(t, 0)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestEvictAndPurgeSeriesChunkType1(t *testing.T) {
|
|
|
|
testEvictAndPurgeSeries(t, 1)
|
|
|
|
}
|
|
|
|
|
2015-07-15 10:53:15 -07:00
|
|
|
func testEvictAndLoadChunkDescs(t *testing.T, encoding chunkEncoding) {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make(model.Samples, 10000)
|
2015-07-15 10:53:15 -07:00
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
|
|
|
Timestamp: model.Time(2 * i),
|
|
|
|
Value: model.SampleValue(float64(i * i)),
|
2015-07-15 10:53:15 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Give last sample a timestamp of now so that the head chunk will not
|
|
|
|
// be closed (which would then archive the time series later as
|
|
|
|
// everything will get evicted).
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[len(samples)-1] = &model.Sample{
|
|
|
|
Timestamp: model.Now(),
|
|
|
|
Value: model.SampleValue(3.14),
|
2015-07-15 10:53:15 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
s, closer := NewTestStorage(t, encoding)
|
|
|
|
defer closer.Close()
|
|
|
|
|
|
|
|
// Adjust memory chunks to lower value to see evictions.
|
|
|
|
s.maxMemoryChunks = 1
|
|
|
|
|
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
|
|
|
s.WaitForIndexing()
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
fp := model.Metric{}.FastFingerprint()
|
2015-07-15 10:53:15 -07:00
|
|
|
|
|
|
|
series, ok := s.fpToSeries.get(fp)
|
|
|
|
if !ok {
|
|
|
|
t.Fatal("could not find series")
|
|
|
|
}
|
|
|
|
|
|
|
|
oldLen := len(series.chunkDescs)
|
|
|
|
// Maintain series without any dropped chunks.
|
|
|
|
s.maintainMemorySeries(fp, 0)
|
|
|
|
// Give the evict goroutine an opportunity to run.
|
2015-09-14 12:09:46 -07:00
|
|
|
time.Sleep(50 * time.Millisecond)
|
2015-07-15 10:53:15 -07:00
|
|
|
// Maintain series again to trigger chunkDesc eviction
|
|
|
|
s.maintainMemorySeries(fp, 0)
|
|
|
|
|
|
|
|
if oldLen <= len(series.chunkDescs) {
|
|
|
|
t.Errorf("Expected number of chunkDescs to decrease, old number %d, current number %d.", oldLen, len(series.chunkDescs))
|
|
|
|
}
|
|
|
|
|
|
|
|
// Load everything back.
|
|
|
|
p := s.NewPreloader()
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
p.PreloadRange(fp, 0, 100000)
|
2015-07-15 10:53:15 -07:00
|
|
|
|
|
|
|
if oldLen != len(series.chunkDescs) {
|
|
|
|
t.Errorf("Expected number of chunkDescs to have reached old value again, old number %d, current number %d.", oldLen, len(series.chunkDescs))
|
|
|
|
}
|
|
|
|
|
|
|
|
p.Close()
|
|
|
|
|
|
|
|
// Now maintain series with drops to make sure nothing crazy happens.
|
|
|
|
s.maintainMemorySeries(fp, 100000)
|
|
|
|
|
|
|
|
if len(series.chunkDescs) != 1 {
|
|
|
|
t.Errorf("Expected exactly one chunkDesc left, got %d.", len(series.chunkDescs))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestEvictAndLoadChunkDescsType0(t *testing.T) {
|
|
|
|
testEvictAndLoadChunkDescs(t, 0)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestEvictAndLoadChunkDescsType1(t *testing.T) {
|
|
|
|
testEvictAndLoadChunkDescs(t, 1)
|
|
|
|
}
|
|
|
|
|
2015-03-13 07:49:07 -07:00
|
|
|
func benchmarkAppend(b *testing.B, encoding chunkEncoding) {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples := make(model.Samples, b.N)
|
2014-06-06 02:55:53 -07:00
|
|
|
for i := range samples {
|
2015-08-20 08:18:46 -07:00
|
|
|
samples[i] = &model.Sample{
|
|
|
|
Metric: model.Metric{
|
|
|
|
model.MetricNameLabel: model.LabelValue(fmt.Sprintf("test_metric_%d", i%10)),
|
|
|
|
"label1": model.LabelValue(fmt.Sprintf("test_metric_%d", i%10)),
|
|
|
|
"label2": model.LabelValue(fmt.Sprintf("test_metric_%d", i%10)),
|
2014-06-06 02:55:53 -07:00
|
|
|
},
|
2015-08-20 08:18:46 -07:00
|
|
|
Timestamp: model.Time(i),
|
|
|
|
Value: model.SampleValue(i),
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
b.ResetTimer()
|
2015-03-13 07:49:07 -07:00
|
|
|
s, closer := NewTestStorage(b, encoding)
|
2014-06-06 02:55:53 -07:00
|
|
|
defer closer.Close()
|
|
|
|
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
2014-06-06 02:55:53 -07:00
|
|
|
}
|
2014-08-14 09:23:49 -07:00
|
|
|
|
2015-03-04 04:40:18 -08:00
|
|
|
func BenchmarkAppendType0(b *testing.B) {
|
|
|
|
benchmarkAppend(b, 0)
|
|
|
|
}
|
|
|
|
|
|
|
|
func BenchmarkAppendType1(b *testing.B) {
|
|
|
|
benchmarkAppend(b, 1)
|
|
|
|
}
|
|
|
|
|
2014-10-28 11:01:41 -07:00
|
|
|
// Append a large number of random samples and then check if we can get them out
|
|
|
|
// of the storage alright.
|
2015-03-13 07:49:07 -07:00
|
|
|
func testFuzz(t *testing.T, encoding chunkEncoding) {
|
2014-10-28 11:01:41 -07:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("Skipping test in short mode.")
|
|
|
|
}
|
2014-08-14 09:23:49 -07:00
|
|
|
|
2014-10-28 11:01:41 -07:00
|
|
|
check := func(seed int64) bool {
|
|
|
|
rand.Seed(seed)
|
2015-03-13 07:49:07 -07:00
|
|
|
s, c := NewTestStorage(t, encoding)
|
2014-08-14 09:23:49 -07:00
|
|
|
defer c.Close()
|
|
|
|
|
2015-05-19 10:12:01 -07:00
|
|
|
samples := createRandomSamples("test_fuzz", 10000)
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, sample := range samples {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
2014-10-28 11:01:41 -07:00
|
|
|
return verifyStorage(t, s, samples, 24*7*time.Hour)
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
if err := quick.Check(check, nil); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-04 04:40:18 -08:00
|
|
|
func TestFuzzChunkType0(t *testing.T) {
|
|
|
|
testFuzz(t, 0)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFuzzChunkType1(t *testing.T) {
|
|
|
|
testFuzz(t, 1)
|
|
|
|
}
|
|
|
|
|
|
|
|
// benchmarkFuzz is the benchmark version of testFuzz. The storage options are
|
|
|
|
// set such that evictions, checkpoints, and purging will happen concurrently,
|
|
|
|
// too. This benchmark will have a very long runtime (up to minutes). You can
|
|
|
|
// use it as an actual benchmark. Run it like this:
|
2014-10-28 11:01:41 -07:00
|
|
|
//
|
2015-03-08 18:33:10 -07:00
|
|
|
// go test -cpu 1,2,4,8 -run=NONE -bench BenchmarkFuzzChunkType -benchmem
|
2014-10-28 11:01:41 -07:00
|
|
|
//
|
|
|
|
// You can also use it as a test for races. In that case, run it like this (will
|
|
|
|
// make things even slower):
|
|
|
|
//
|
2015-03-08 18:33:10 -07:00
|
|
|
// go test -race -cpu 8 -short -bench BenchmarkFuzzChunkType
|
2015-03-13 07:49:07 -07:00
|
|
|
func benchmarkFuzz(b *testing.B, encoding chunkEncoding) {
|
2015-06-15 03:49:28 -07:00
|
|
|
DefaultChunkEncoding = encoding
|
2015-03-06 07:03:03 -08:00
|
|
|
const samplesPerRun = 100000
|
2014-10-28 11:01:41 -07:00
|
|
|
rand.Seed(42)
|
2015-05-28 11:58:38 -07:00
|
|
|
directory := testutil.NewTemporaryDirectory("test_storage", b)
|
2014-10-28 11:01:41 -07:00
|
|
|
defer directory.Close()
|
|
|
|
o := &MemorySeriesStorageOptions{
|
2014-11-13 11:50:25 -08:00
|
|
|
MemoryChunks: 100,
|
2015-03-18 11:36:41 -07:00
|
|
|
MaxChunksToPersist: 1000000,
|
2014-10-28 11:01:41 -07:00
|
|
|
PersistenceRetentionPeriod: time.Hour,
|
|
|
|
PersistenceStoragePath: directory.Path(),
|
2015-03-04 04:40:18 -08:00
|
|
|
CheckpointInterval: time.Second,
|
2015-03-19 07:41:50 -07:00
|
|
|
SyncStrategy: Adaptive,
|
2016-01-11 07:42:10 -08:00
|
|
|
MinShrinkRatio: 0.1,
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
2015-05-18 10:26:28 -07:00
|
|
|
s := NewMemorySeriesStorage(o)
|
|
|
|
if err := s.Start(); err != nil {
|
|
|
|
b.Fatalf("Error starting storage: %s", err)
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
|
|
|
s.Start()
|
|
|
|
defer s.Stop()
|
2015-03-04 04:40:18 -08:00
|
|
|
|
|
|
|
samples := createRandomSamples("benchmark_fuzz", samplesPerRun*b.N)
|
|
|
|
|
|
|
|
b.ResetTimer()
|
|
|
|
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
|
|
start := samplesPerRun * i
|
|
|
|
end := samplesPerRun * (i + 1)
|
|
|
|
middle := (start + end) / 2
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, sample := range samples[start:middle] {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
2015-05-06 07:53:12 -07:00
|
|
|
verifyStorage(b, s.(*memorySeriesStorage), samples[:middle], o.PersistenceRetentionPeriod)
|
2015-03-14 19:36:15 -07:00
|
|
|
for _, sample := range samples[middle:end] {
|
|
|
|
s.Append(sample)
|
|
|
|
}
|
2015-05-06 07:53:12 -07:00
|
|
|
verifyStorage(b, s.(*memorySeriesStorage), samples[:end], o.PersistenceRetentionPeriod)
|
2015-03-04 04:40:18 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func BenchmarkFuzzChunkType0(b *testing.B) {
|
|
|
|
benchmarkFuzz(b, 0)
|
|
|
|
}
|
|
|
|
|
|
|
|
func BenchmarkFuzzChunkType1(b *testing.B) {
|
|
|
|
benchmarkFuzz(b, 1)
|
2014-10-28 11:01:41 -07:00
|
|
|
}
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
func createRandomSamples(metricName string, minLen int) model.Samples {
|
|
|
|
type valueCreator func() model.SampleValue
|
|
|
|
type deltaApplier func(model.SampleValue) model.SampleValue
|
2014-08-14 09:23:49 -07:00
|
|
|
|
|
|
|
var (
|
|
|
|
maxMetrics = 5
|
|
|
|
maxStreakLength = 500
|
2015-03-04 04:40:18 -08:00
|
|
|
maxTimeDelta = 10000
|
2014-08-14 09:23:49 -07:00
|
|
|
maxTimeDeltaFactor = 10
|
2015-08-20 08:18:46 -07:00
|
|
|
timestamp = model.Now() - model.Time(maxTimeDelta*maxTimeDeltaFactor*minLen/4) // So that some timestamps are in the future.
|
2014-08-14 09:23:49 -07:00
|
|
|
generators = []struct {
|
|
|
|
createValue valueCreator
|
|
|
|
applyDelta []deltaApplier
|
|
|
|
}{
|
|
|
|
{ // "Boolean".
|
2015-08-20 08:18:46 -07:00
|
|
|
createValue: func() model.SampleValue {
|
|
|
|
return model.SampleValue(rand.Intn(2))
|
2014-08-14 09:23:49 -07:00
|
|
|
},
|
|
|
|
applyDelta: []deltaApplier{
|
2015-08-20 08:18:46 -07:00
|
|
|
func(_ model.SampleValue) model.SampleValue {
|
|
|
|
return model.SampleValue(rand.Intn(2))
|
2014-08-14 09:23:49 -07:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{ // Integer with int deltas of various byte length.
|
2015-08-20 08:18:46 -07:00
|
|
|
createValue: func() model.SampleValue {
|
|
|
|
return model.SampleValue(rand.Int63() - 1<<62)
|
2014-08-14 09:23:49 -07:00
|
|
|
},
|
|
|
|
applyDelta: []deltaApplier{
|
2015-08-20 08:18:46 -07:00
|
|
|
func(v model.SampleValue) model.SampleValue {
|
|
|
|
return model.SampleValue(rand.Intn(1<<8) - 1<<7 + int(v))
|
2014-08-14 09:23:49 -07:00
|
|
|
},
|
2015-08-20 08:18:46 -07:00
|
|
|
func(v model.SampleValue) model.SampleValue {
|
|
|
|
return model.SampleValue(rand.Intn(1<<16) - 1<<15 + int(v))
|
2014-08-14 09:23:49 -07:00
|
|
|
},
|
2015-08-20 08:18:46 -07:00
|
|
|
func(v model.SampleValue) model.SampleValue {
|
|
|
|
return model.SampleValue(rand.Int63n(1<<32) - 1<<31 + int64(v))
|
2014-08-14 09:23:49 -07:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{ // Float with float32 and float64 deltas.
|
2015-08-20 08:18:46 -07:00
|
|
|
createValue: func() model.SampleValue {
|
|
|
|
return model.SampleValue(rand.NormFloat64())
|
2014-08-14 09:23:49 -07:00
|
|
|
},
|
|
|
|
applyDelta: []deltaApplier{
|
2015-08-20 08:18:46 -07:00
|
|
|
func(v model.SampleValue) model.SampleValue {
|
|
|
|
return v + model.SampleValue(float32(rand.NormFloat64()))
|
2014-08-14 09:23:49 -07:00
|
|
|
},
|
2015-08-20 08:18:46 -07:00
|
|
|
func(v model.SampleValue) model.SampleValue {
|
|
|
|
return v + model.SampleValue(rand.NormFloat64())
|
2014-08-14 09:23:49 -07:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
)
|
|
|
|
|
2015-05-11 08:15:30 -07:00
|
|
|
// Prefill result with two samples with colliding metrics (to test fingerprint mapping).
|
2015-08-20 08:18:46 -07:00
|
|
|
result := model.Samples{
|
|
|
|
&model.Sample{
|
|
|
|
Metric: model.Metric{
|
2015-05-06 07:53:12 -07:00
|
|
|
"instance": "ip-10-33-84-73.l05.ams5.s-cloud.net:24483",
|
|
|
|
"status": "503",
|
|
|
|
},
|
|
|
|
Value: 42,
|
|
|
|
Timestamp: timestamp,
|
|
|
|
},
|
2015-08-20 08:18:46 -07:00
|
|
|
&model.Sample{
|
|
|
|
Metric: model.Metric{
|
2015-05-06 07:53:12 -07:00
|
|
|
"instance": "ip-10-33-84-73.l05.ams5.s-cloud.net:24480",
|
|
|
|
"status": "500",
|
|
|
|
},
|
|
|
|
Value: 2010,
|
|
|
|
Timestamp: timestamp + 1,
|
|
|
|
},
|
|
|
|
}
|
2014-08-14 09:23:49 -07:00
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
metrics := []model.Metric{}
|
2014-10-28 11:01:41 -07:00
|
|
|
for n := rand.Intn(maxMetrics); n >= 0; n-- {
|
2015-08-20 08:18:46 -07:00
|
|
|
metrics = append(metrics, model.Metric{
|
|
|
|
model.MetricNameLabel: model.LabelValue(metricName),
|
|
|
|
model.LabelName(fmt.Sprintf("labelname_%d", n+1)): model.LabelValue(fmt.Sprintf("labelvalue_%d", rand.Int())),
|
2014-08-14 09:23:49 -07:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2015-03-04 04:40:18 -08:00
|
|
|
for len(result) < minLen {
|
2014-08-14 09:23:49 -07:00
|
|
|
// Pick a metric for this cycle.
|
2014-10-28 11:01:41 -07:00
|
|
|
metric := metrics[rand.Intn(len(metrics))]
|
|
|
|
timeDelta := rand.Intn(maxTimeDelta) + 1
|
|
|
|
generator := generators[rand.Intn(len(generators))]
|
2014-08-14 09:23:49 -07:00
|
|
|
createValue := generator.createValue
|
2014-10-28 11:01:41 -07:00
|
|
|
applyDelta := generator.applyDelta[rand.Intn(len(generator.applyDelta))]
|
2015-08-20 08:18:46 -07:00
|
|
|
incTimestamp := func() { timestamp += model.Time(timeDelta * (rand.Intn(maxTimeDeltaFactor) + 1)) }
|
2014-10-28 11:01:41 -07:00
|
|
|
switch rand.Intn(4) {
|
2014-08-14 09:23:49 -07:00
|
|
|
case 0: // A single sample.
|
2015-08-20 08:18:46 -07:00
|
|
|
result = append(result, &model.Sample{
|
2014-08-14 09:23:49 -07:00
|
|
|
Metric: metric,
|
|
|
|
Value: createValue(),
|
2014-10-28 11:01:41 -07:00
|
|
|
Timestamp: timestamp,
|
2014-08-14 09:23:49 -07:00
|
|
|
})
|
|
|
|
incTimestamp()
|
|
|
|
case 1: // A streak of random sample values.
|
2014-10-28 11:01:41 -07:00
|
|
|
for n := rand.Intn(maxStreakLength); n >= 0; n-- {
|
2015-08-20 08:18:46 -07:00
|
|
|
result = append(result, &model.Sample{
|
2014-08-14 09:23:49 -07:00
|
|
|
Metric: metric,
|
|
|
|
Value: createValue(),
|
2014-10-28 11:01:41 -07:00
|
|
|
Timestamp: timestamp,
|
2014-08-14 09:23:49 -07:00
|
|
|
})
|
|
|
|
incTimestamp()
|
|
|
|
}
|
|
|
|
case 2: // A streak of sample values with incremental changes.
|
|
|
|
value := createValue()
|
2014-10-28 11:01:41 -07:00
|
|
|
for n := rand.Intn(maxStreakLength); n >= 0; n-- {
|
2015-08-20 08:18:46 -07:00
|
|
|
result = append(result, &model.Sample{
|
2014-08-14 09:23:49 -07:00
|
|
|
Metric: metric,
|
|
|
|
Value: value,
|
2014-10-28 11:01:41 -07:00
|
|
|
Timestamp: timestamp,
|
2014-08-14 09:23:49 -07:00
|
|
|
})
|
|
|
|
incTimestamp()
|
|
|
|
value = applyDelta(value)
|
|
|
|
}
|
|
|
|
case 3: // A streak of constant sample values.
|
|
|
|
value := createValue()
|
2014-10-28 11:01:41 -07:00
|
|
|
for n := rand.Intn(maxStreakLength); n >= 0; n-- {
|
2015-08-20 08:18:46 -07:00
|
|
|
result = append(result, &model.Sample{
|
2014-08-14 09:23:49 -07:00
|
|
|
Metric: metric,
|
|
|
|
Value: value,
|
2014-10-28 11:01:41 -07:00
|
|
|
Timestamp: timestamp,
|
2014-08-14 09:23:49 -07:00
|
|
|
})
|
|
|
|
incTimestamp()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
func verifyStorage(t testing.TB, s *memorySeriesStorage, samples model.Samples, maxAge time.Duration) bool {
|
2015-03-04 04:40:18 -08:00
|
|
|
s.WaitForIndexing()
|
2014-08-14 09:23:49 -07:00
|
|
|
result := true
|
2014-10-28 11:01:41 -07:00
|
|
|
for _, i := range rand.Perm(len(samples)) {
|
2014-08-14 09:23:49 -07:00
|
|
|
sample := samples[i]
|
2015-08-20 08:18:46 -07:00
|
|
|
if sample.Timestamp.Before(model.TimeFromUnixNano(time.Now().Add(-maxAge).UnixNano())) {
|
2014-10-28 11:01:41 -07:00
|
|
|
continue
|
|
|
|
// TODO: Once we have a guaranteed cutoff at the
|
|
|
|
// retention period, we can verify here that no results
|
|
|
|
// are returned.
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
2015-05-06 07:53:12 -07:00
|
|
|
fp, err := s.mapper.mapFP(sample.Metric.FastFingerprint(), sample.Metric)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2014-10-28 11:01:41 -07:00
|
|
|
p := s.NewPreloader()
|
Handle errors caused by data corruption more gracefully
This requires all the panic calls upon unexpected data to be converted
into errors returned. This pollute the function signatures quite
lot. Well, this is Go...
The ideas behind this are the following:
- panic only if it's a programming error. Data corruptions happen, and
they are not programming errors.
- If we detect a data corruption, we "quarantine" the series,
essentially removing it from the database and putting its data into
a separate directory for forensics.
- Failure during writing to a series file is not considered corruption
automatically. It will call setDirty, though, so that a
crashrecovery upon the next restart will commence and check for
that.
- Series quarantining and setDirty calls are logged and counted in
metrics, but are hidden from the user of the interfaces in
interface.go, whith the notable exception of Append(). The reasoning
is that we treat corruption by removing the corrupted series, i.e. a
query for it will return no results on its next call anyway, so
return no results right now. In the case of Append(), we want to
tell the user that no data has been appended, though.
Minor side effects:
- Now consistently using filepath.* instead of path.*.
- Introduced structured logging where I touched it. This makes things
less consistent, but a complete change to structured logging would
be out of scope for this PR.
2016-02-25 03:23:42 -08:00
|
|
|
it := p.PreloadRange(fp, sample.Timestamp, sample.Timestamp)
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
found := it.ValueAtOrBeforeTime(sample.Timestamp)
|
|
|
|
if found.Timestamp == model.Earliest {
|
|
|
|
t.Errorf("Sample %#v: Expected sample not found.", sample)
|
2014-10-28 11:01:41 -07:00
|
|
|
result = false
|
|
|
|
p.Close()
|
|
|
|
continue
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
if sample.Value != found.Value || sample.Timestamp != found.Timestamp {
|
2014-10-28 11:01:41 -07:00
|
|
|
t.Errorf(
|
|
|
|
"Value (or timestamp) mismatch, want %f (at time %v), got %f (at time %v).",
|
Streamline series iterator creation
This will fix issue #1035 and will also help to make issue #1264 less
bad.
The fundamental problem in the current code:
In the preload phase, we quite accurately determine which chunks will
be used for the query being executed. However, in the subsequent step
of creating series iterators, the created iterators are referencing
_all_ in-memory chunks in their series, even the un-pinned ones. In
iterator creation, we copy a pointer to each in-memory chunk of a
series into the iterator. While this creates a certain amount of
allocation churn, the worst thing about it is that copying the chunk
pointer out of the chunkDesc requires a mutex acquisition. (Remember
that the iterator will also reference un-pinned chunks, so we need to
acquire the mutex to protect against concurrent eviction.) The worst
case happens if a series doesn't even contain any relevant samples for
the query time range. We notice that during preloading but then we
will still create a series iterator for it. But even for series that
do contain relevant samples, the overhead is quite bad for instant
queries that retrieve a single sample from each series, but still go
through all the effort of series iterator creation. All of that is
particularly bad if a series has many in-memory chunks.
This commit addresses the problem from two sides:
First, it merges preloading and iterator creation into one step,
i.e. the preload call returns an iterator for exactly the preloaded
chunks.
Second, the required mutex acquisition in chunkDesc has been greatly
reduced. That was enabled by a side effect of the first step, which is
that the iterator is only referencing pinned chunks, so there is no
risk of concurrent eviction anymore, and chunks can be accessed
without mutex acquisition.
To simplify the code changes for the above, the long-planned change of
ValueAtTime to ValueAtOrBefore time was performed at the same
time. (It should have been done first, but it kind of accidentally
happened while I was in the middle of writing the series iterator
changes. Sorry for that.) So far, we actively filtered the up to two
values that were returned by ValueAtTime, i.e. we invested work to
retrieve up to two values, and then we invested more work to throw one
of them away.
The SeriesIterator.BoundaryValues method can be removed once #1401 is
fixed. But I really didn't want to load even more changes into this
PR.
Benchmarks:
The BenchmarkFuzz.* benchmarks run 83% faster (i.e. about six times
faster) and allocate 95% fewer bytes. The reason for that is that the
benchmark reads one sample after another from the time series and
creates a new series iterator for each sample read.
To find out how much these improvements matter in practice, I have
mirrored a beefy Prometheus server at SoundCloud that suffers from
both issues #1035 and #1264. To reach steady state that would be
comparable, the server needs to run for 15d. So far, it has run for
1d. The test server currently has only half as many memory time series
and 60% of the memory chunks the main server has. The 90th percentile
rule evaluation cycle time is ~11s on the main server and only ~3s on
the test server. However, these numbers might get much closer over
time.
In addition to performance improvements, this commit removes about 150
LOC.
2016-02-16 09:47:50 -08:00
|
|
|
sample.Value, sample.Timestamp, found.Value, found.Timestamp,
|
2014-10-28 11:01:41 -07:00
|
|
|
)
|
2014-08-14 09:23:49 -07:00
|
|
|
result = false
|
|
|
|
}
|
2014-10-28 11:01:41 -07:00
|
|
|
p.Close()
|
2014-08-14 09:23:49 -07:00
|
|
|
}
|
|
|
|
return result
|
|
|
|
}
|
2015-07-13 12:12:27 -07:00
|
|
|
|
|
|
|
func TestAppendOutOfOrder(t *testing.T) {
|
|
|
|
s, closer := NewTestStorage(t, 1)
|
|
|
|
defer closer.Close()
|
|
|
|
|
2015-08-20 08:18:46 -07:00
|
|
|
m := model.Metric{
|
|
|
|
model.MetricNameLabel: "out_of_order",
|
2015-07-13 12:12:27 -07:00
|
|
|
}
|
|
|
|
|
2015-07-16 03:48:33 -07:00
|
|
|
for i, t := range []int{0, 2, 2, 1} {
|
2015-08-20 08:18:46 -07:00
|
|
|
s.Append(&model.Sample{
|
2015-07-13 12:12:27 -07:00
|
|
|
Metric: m,
|
2015-08-20 08:18:46 -07:00
|
|
|
Timestamp: model.Time(t),
|
|
|
|
Value: model.SampleValue(i),
|
2015-07-13 12:12:27 -07:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
fp, err := s.mapper.mapFP(m.FastFingerprint(), m)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
pl := s.NewPreloader()
|
|
|
|
defer pl.Close()
|
|
|
|
|
Handle errors caused by data corruption more gracefully
This requires all the panic calls upon unexpected data to be converted
into errors returned. This pollute the function signatures quite
lot. Well, this is Go...
The ideas behind this are the following:
- panic only if it's a programming error. Data corruptions happen, and
they are not programming errors.
- If we detect a data corruption, we "quarantine" the series,
essentially removing it from the database and putting its data into
a separate directory for forensics.
- Failure during writing to a series file is not considered corruption
automatically. It will call setDirty, though, so that a
crashrecovery upon the next restart will commence and check for
that.
- Series quarantining and setDirty calls are logged and counted in
metrics, but are hidden from the user of the interfaces in
interface.go, whith the notable exception of Append(). The reasoning
is that we treat corruption by removing the corrupted series, i.e. a
query for it will return no results on its next call anyway, so
return no results right now. In the case of Append(), we want to
tell the user that no data has been appended, though.
Minor side effects:
- Now consistently using filepath.* instead of path.*.
- Introduced structured logging where I touched it. This makes things
less consistent, but a complete change to structured logging would
be out of scope for this PR.
2016-02-25 03:23:42 -08:00
|
|
|
it := pl.PreloadRange(fp, 0, 2)
|
2015-07-13 12:12:27 -07:00
|
|
|
|
2015-08-22 05:52:35 -07:00
|
|
|
want := []model.SamplePair{
|
2015-07-13 12:12:27 -07:00
|
|
|
{
|
|
|
|
Timestamp: 0,
|
|
|
|
Value: 0,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Timestamp: 2,
|
2015-07-16 03:48:33 -07:00
|
|
|
Value: 1,
|
2015-07-13 12:12:27 -07:00
|
|
|
},
|
|
|
|
}
|
|
|
|
got := it.RangeValues(metric.Interval{OldestInclusive: 0, NewestInclusive: 2})
|
|
|
|
if !reflect.DeepEqual(want, got) {
|
|
|
|
t.Fatalf("want %v, got %v", want, got)
|
|
|
|
}
|
|
|
|
}
|