Updated TSDB with fixes.

bwplotka · bwplotka · commit 048935f548c7 · 2020-07-27T20:50:15.000+01:00
Signed-off-by: Bartlomiej Plotka &lt;bwplotka@gmail.com&gt;
diff --git a/go.mod b/go.mod
@@ -74,7 +74,7 @@ require (
 replace (
 	// Make sure Cortex is not forcing us to some other Prometheus version.
 	// TODO: This points to https://github.com/prometheus/prometheus/pull/7069. Remove and point to master once merged.
-	github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20200724113653-2605f60545cb
+	github.com/prometheus/prometheus => github.com/prometheus/prometheus eee497165080d4fa693cea7c00e6886e88f3f745
 	k8s.io/klog => k8s.io/klog v0.3.1
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
 )
diff --git a/pkg/store/storepb/testutil/series.go b/pkg/store/storepb/testutil/series.go
@@ -69,7 +69,7 @@ func CreateHeadWithSeries(t testing.TB, j int, opts HeadGenOptions) (*tsdb.Head,
 		testutil.Ok(t, err)
 	}
 
-	h, err := tsdb.NewHead(nil, nil, w, 10000000, tsdbDir, nil, tsdb.DefaultStripeSize, nil)
+	h, err := tsdb.NewHead(nil, nil, w, tsdb.DefaultBlockDuration, tsdbDir, nil, tsdb.DefaultStripeSize, nil)
 	testutil.Ok(t, err)
 
 	app := h.Appender()

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ require (`
`74`	`74`	`replace (`
`75`	`75`	`// Make sure Cortex is not forcing us to some other Prometheus version.`
`76`	`76`	`// TODO: This points to https://github.com/prometheus/prometheus/pull/7069. Remove and point to master once merged.`
`77`		`- github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20200724113653-2605f60545cb`
	`77`	`+ github.com/prometheus/prometheus => github.com/prometheus/prometheus eee497165080d4fa693cea7c00e6886e88f3f745`
`78`	`78`	`k8s.io/klog => k8s.io/klog v0.3.1`
`79`	`79`	`k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30`
`80`	`80`	`)`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func CreateHeadWithSeries(t testing.TB, j int, opts HeadGenOptions) (*tsdb.Head,`
`69`	`69`	`testutil.Ok(t, err)`
`70`	`70`	`}`
`71`	`71`
`72`		`- h, err := tsdb.NewHead(nil, nil, w, 10000000, tsdbDir, nil, tsdb.DefaultStripeSize, nil)`
	`72`	`+ h, err := tsdb.NewHead(nil, nil, w, tsdb.DefaultBlockDuration, tsdbDir, nil, tsdb.DefaultStripeSize, nil)`
`73`	`73`	`testutil.Ok(t, err)`
`74`	`74`
`75`	`75`	`app := h.Appender()`